commit: cb76b81eec363e10c89819d34f5c3edd557d65ca
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 9 15:25:53 2014 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Apr 9 15:25:53 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=cb76b81e
[kde-base/plasma-workspace] Add patch to fix missing binary
The binary is provided by dev-qt/qttools:5, which is not packaged yet. When
bug #457024 is RESOLVED we can drop this patch.
Package-Manager: portage-2.2.10
---
.../plasma-workspace-9999-missing-qttools.patch | 57 ++++++++++++++++++++++
.../plasma-workspace/plasma-workspace-9999.ebuild | 3 ++
2 files changed, 60 insertions(+)
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 0000000..12886cd
--- /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 d5e4026..ec14a37 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)
