diff options
| -rw-r--r-- | kde-base/plasma-workspace/files/plasma-workspace-9999-missing-qttools.patch | 57 | ||||
| -rw-r--r-- | kde-base/plasma-workspace/plasma-workspace-9999.ebuild | 3 |
2 files changed, 60 insertions, 0 deletions
diff --git a/kde-base/plasma-workspace/files/plasma-workspace-9999-missing-qttools.patch b/kde-base/plasma-workspace/files/plasma-workspace-9999-missing-qttools.patch new file mode 100644 index 00000000000..12886cdaa4c --- /dev/null +++ b/kde-base/plasma-workspace/files/plasma-workspace-9999-missing-qttools.patch @@ -0,0 +1,57 @@ +diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake +index e845603..e49dd5f 100644 +--- a/startkde/startkde.cmake ++++ b/startkde/startkde.cmake +@@ -1,6 +1,6 @@ + #!/bin/sh + # +-# DEFAULT KDE STARTUP SCRIPT ( @KDE4WORKSPACE_VERSION@ ) ++# DEFAULT KDE STARTUP SCRIPT ( @PLASMAWORKSPACE_VERSION@ ) + # + + if test "x$1" = x--failsafe; then +@@ -19,7 +19,7 @@ unset DYLD_FORCE_FLAT_NAMESPACE + # in case we have been started with full pathname spec without being in PATH + bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'` + if [ -n "$bindir" ]; then +- qbindir=`qtpaths --binaries-dir` ++ qbindir=`kf5-config --qt-binaries` + qdbus=$qbindir/qdbus + case $PATH in + $bindir|$bindir:*|*:$bindir|*:$bindir:*) ;; +@@ -64,7 +64,7 @@ fi + + mkdir -p $configDir + +-#This is basically setting defaults so we can use them with kstartupconfig4 ++#This is basically setting defaults so we can use them with kstartupconfig5 + cat >$configDir/startupconfigkeys <<EOF + kcminputrc Mouse cursorTheme 'Oxygen_White' + kcminputrc Mouse cursorSize '' +@@ -162,7 +162,7 @@ unset DESKTOP_LOCKED # Don't want it in the environment + ksplash_pid= + if test -z "$dl"; then + # languages as resolved by KLocale, for the splash screens use +- # klocale_languages is assembled by kdostartupconfig4 calling KLocale ++ # klocale_languages is assembled by kdostartupconfig5 calling KLocale + KLOCALE_LANGUAGES="$klocale_languages" + export KLOCALE_LANGUAGES + # the splashscreen and progress indicator +@@ -191,7 +191,7 @@ fi + # For anything else (that doesn't set env vars, or that needs a window manager), + # better use the Autostart folder. + +-libpath=`kde4-config --path lib | tr : '\n'` ++libpath=`kf5-config --path lib | tr : '\n'` + + for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/env/,p'`; do + for file in "$prefix"*.sh; do +@@ -200,7 +200,7 @@ for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/env/,p'`; do + done + + # Set the path for Qt plugins provided by KDE +-QT_PLUGIN_PATH=${QT_PLUGIN_PATH+$QT_PLUGIN_PATH:}`qtpaths --plugin-dir` ++QT_PLUGIN_PATH=${QT_PLUGIN_PATH+$QT_PLUGIN_PATH:}`kf5-config --qt-plugins` + # TODO: Do we really need this? + QT_PLUGIN_PATH=$QT_PLUGIN_PATH:$kdehome/lib/kde5/plugins/ + export QT_PLUGIN_PATH diff --git a/kde-base/plasma-workspace/plasma-workspace-9999.ebuild b/kde-base/plasma-workspace/plasma-workspace-9999.ebuild index d5e40265831..ec14a372018 100644 --- a/kde-base/plasma-workspace/plasma-workspace-9999.ebuild +++ b/kde-base/plasma-workspace/plasma-workspace-9999.ebuild @@ -87,6 +87,9 @@ DEPEND="${COMMON_DEPEND} X? ( x11-proto/xproto ) " +# Needed until bug 457024 is resolved +PATCHES=( "${FILESDIR}/${P}-missing-qttools.patch" ) + src_configure() { local mycmakeargs=( $(cmake-utils_use_find_package dbus dbusmenu-qt5) |