commit: b9eb662968ec77f73441c3f4fbc2e4da26ab265b
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat May 24 22:47:21 2014 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat May 24 22:48:21 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=b9eb6629
[kde-base/plasma-workspace] Drop obsolete patch, add missing RDEPEND
Package-Manager: portage-2.2.10
---
.../plasma-workspace-9999-missing-qttools.patch | 58 ----------------------
.../plasma-workspace-4.96.0.ebuild | 6 +--
.../plasma-workspace/plasma-workspace-9999.ebuild | 4 +-
3 files changed, 3 insertions(+), 65 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
deleted file mode 100644
index 3c80f21..0000000
---
a/kde-base/plasma-workspace/files/plasma-workspace-9999-missing-qttools.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake
-index 14ce47a..58c3a7a 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
-@@ -17,17 +17,17 @@ trap 'echo GOT SIGHUP' HUP
- 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`
-- qdbus=$qbindir/qdbus
-- case $PATH in
-- $bindir|$bindir:*|*:$bindir|*:$bindir:*) ;;
-- *) PATH=$bindir:$PATH; export PATH;;
-- esac
--else
-+#bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'`
-+#if [ -n "$bindir" ]; then
-+# qbindir=`qtpaths --binaries-dir`
-+# qdbus=$qbindir/qdbus
-+# case $PATH in
-+# $bindir|$bindir:*|*:$bindir|*:$bindir:*) ;;
-+# *) PATH=$bindir:$PATH; export PATH;;
-+# esac
-+#else
- qdbus=qdbus
--fi
-+#fi
-
- # Check if a KDE session already is running and whether it's possible to
connect to X
- kcheckrunning
-@@ -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
-@@ -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-4.96.0.ebuild
b/kde-base/plasma-workspace/plasma-workspace-4.96.0.ebuild
index 66ab734..f5b10a7 100644
--- a/kde-base/plasma-workspace/plasma-workspace-4.96.0.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-4.96.0.ebuild
@@ -72,7 +72,8 @@ COMMON_DEPEND="
"
RDEPEND="${COMMON_DEPEND}
$(add_kdebase_dep milou)
- dev-qt/qtquickcontrols:5
+ dev-qt/qdbus:5
+ dev-qt/qtquickcontrols:5[widgets]
!kde-base/freespacenotifier:4
!kde-base/libkworkspace:4
!kde-base/libtaskmanager:4
@@ -90,9 +91,6 @@ DEPEND="${COMMON_DEPEND}
X? ( x11-proto/xproto )
"
-# Needed until bug 457024 is resolved
-PATCHES=( "${FILESDIR}/${PN}-9999-missing-qttools.patch" )
-
src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package dbus dbusmenu-qt5)
diff --git a/kde-base/plasma-workspace/plasma-workspace-9999.ebuild
b/kde-base/plasma-workspace/plasma-workspace-9999.ebuild
index 0ed1cfa..b90ecee 100644
--- a/kde-base/plasma-workspace/plasma-workspace-9999.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-9999.ebuild
@@ -72,6 +72,7 @@ COMMON_DEPEND="
"
RDEPEND="${COMMON_DEPEND}
$(add_kdebase_dep milou)
+ dev-qt/qdbus:5
dev-qt/qtquickcontrols:5[widgets]
!kde-base/freespacenotifier:4
!kde-base/libkworkspace:4
@@ -90,9 +91,6 @@ 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)
