commit: 42269aed00323e50a4ea09a434b1f1cfddeab0c3
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 27 18:19:00 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jul 27 18:19:00 2017 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=42269aed
kde-plasma/plasma-workspace: Fix DEPENDs, fix cmake warning
Upstream commits
7df184afa19f148c1cd09ae9588645bb2b4556fc
a2202472aa4d488da7562fe8b150c42dddc2d7f2
Reported-by: Michael Mair-Keimberger (iamnr3) <bu9zilla <AT> gmail.com>
Gentoo-bug: 626040
Package-Manager: Portage-2.3.6, Repoman-2.3.1
.../files/plasma-workspace-5.10.4-unused-dep.patch | 19 +++++++++++++++++++
.../plasma-workspace-5.10.49.9999.ebuild | 16 +++++++++++-----
.../plasma-workspace/plasma-workspace-9999.ebuild | 16 +++++++++++-----
3 files changed, 41 insertions(+), 10 deletions(-)
diff --git
a/kde-plasma/plasma-workspace/files/plasma-workspace-5.10.4-unused-dep.patch
b/kde-plasma/plasma-workspace/files/plasma-workspace-5.10.4-unused-dep.patch
new file mode 100644
index 0000000000..fa0f385096
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.10.4-unused-dep.patch
@@ -0,0 +1,19 @@
+commit 5a7d251cfbed417a2617945a94427a93cdd2e82d
+Author: Andreas Sturmlechner <andreas.sturmlech...@gmail.com>
+Date: Thu Jul 27 17:50:17 2017 +0200
+
+ Drop unused dependency
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ba61d1cc..ab5536ff 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -25,7 +25,7 @@ include(ECMQtDeclareLoggingCategory)
+ include(KDEPackageAppTemplates)
+
+ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
+- Plasma DocTools Runner JsEmbed NotifyConfig Su NewStuff
Wallet KCMUtils
++ Plasma DocTools Runner JsEmbed NotifyConfig Su NewStuff
Wallet
+ IdleTime Declarative TextWidgets KDELibs4Support Crash
GlobalAccel
+ DBusAddons Wayland)
+ find_package(KF5NetworkManagerQt ${KF5_MIN_VERSION})
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.10.49.9999.ebuild
b/kde-plasma/plasma-workspace/plasma-workspace-5.10.49.9999.ebuild
index 239067e983..cbd22c5842 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.10.49.9999.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.10.49.9999.ebuild
@@ -12,11 +12,12 @@ DESCRIPTION="KDE Plasma workspace"
KEYWORDS=""
IUSE="+calendar geolocation gps prison qalculate +semantic-desktop"
+REQUIRED_USE="gps? ( geolocation )"
+
COMMON_DEPEND="
$(add_frameworks_dep kactivities)
$(add_frameworks_dep kauth)
$(add_frameworks_dep kbookmarks)
- $(add_frameworks_dep kcmutils)
$(add_frameworks_dep kcompletion)
$(add_frameworks_dep kconfig)
$(add_frameworks_dep kconfigwidgets)
@@ -25,7 +26,6 @@ COMMON_DEPEND="
$(add_frameworks_dep kdbusaddons)
$(add_frameworks_dep kdeclarative)
$(add_frameworks_dep kdelibs4support)
- $(add_frameworks_dep kdesu)
$(add_frameworks_dep kglobalaccel)
$(add_frameworks_dep kguiaddons)
$(add_frameworks_dep ki18n)
@@ -56,7 +56,6 @@ COMMON_DEPEND="
$(add_plasma_dep kscreenlocker)
$(add_plasma_dep kwin)
$(add_plasma_dep libksysguard)
- $(add_qt_dep qtconcurrent)
$(add_qt_dep qtdbus)
$(add_qt_dep qtdeclarative 'widgets')
$(add_qt_dep qtgui 'jpeg')
@@ -75,6 +74,7 @@ COMMON_DEPEND="
x11-libs/libxcb
x11-libs/libXfixes
x11-libs/libXrender
+ x11-libs/libXtst
x11-libs/xcb-util
x11-libs/xcb-util-image
calendar? ( $(add_kdeapps_dep kholidays) )
@@ -86,6 +86,7 @@ COMMON_DEPEND="
"
RDEPEND="${COMMON_DEPEND}
$(add_frameworks_dep kded)
+ $(add_frameworks_dep kdesu)
$(add_kdeapps_dep kio-extras)
$(add_plasma_dep kde-cli-tools)
$(add_plasma_dep ksysguard)
@@ -114,10 +115,14 @@ RDEPEND="${COMMON_DEPEND}
!kde-plasma/plasma-workspace:4
"
DEPEND="${COMMON_DEPEND}
+ $(add_qt_dep qtconcurrent)
x11-proto/xproto
"
-PATCHES=( "${FILESDIR}/${PN}-5.4-startkde-script.patch" )
+PATCHES=(
+ "${FILESDIR}/${PN}-5.4-startkde-script.patch"
+ "${FILESDIR}/${PN}-5.10.4-unused-dep.patch"
+)
RESTRICT+=" test"
@@ -132,12 +137,13 @@ src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package calendar KF5Holidays)
$(cmake-utils_use_find_package geolocation KF5NetworkManagerQt)
- $(cmake-utils_use_find_package gps libgps)
$(cmake-utils_use_find_package prison KF5Prison)
$(cmake-utils_use_find_package qalculate Qalculate)
$(cmake-utils_use_find_package semantic-desktop KF5Baloo)
)
+ use gps && mycmakeargs+=( $(cmake-utils_use_find_package gps libgps) )
+
kde5_src_configure
}
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
index 239067e983..cbd22c5842 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
@@ -12,11 +12,12 @@ DESCRIPTION="KDE Plasma workspace"
KEYWORDS=""
IUSE="+calendar geolocation gps prison qalculate +semantic-desktop"
+REQUIRED_USE="gps? ( geolocation )"
+
COMMON_DEPEND="
$(add_frameworks_dep kactivities)
$(add_frameworks_dep kauth)
$(add_frameworks_dep kbookmarks)
- $(add_frameworks_dep kcmutils)
$(add_frameworks_dep kcompletion)
$(add_frameworks_dep kconfig)
$(add_frameworks_dep kconfigwidgets)
@@ -25,7 +26,6 @@ COMMON_DEPEND="
$(add_frameworks_dep kdbusaddons)
$(add_frameworks_dep kdeclarative)
$(add_frameworks_dep kdelibs4support)
- $(add_frameworks_dep kdesu)
$(add_frameworks_dep kglobalaccel)
$(add_frameworks_dep kguiaddons)
$(add_frameworks_dep ki18n)
@@ -56,7 +56,6 @@ COMMON_DEPEND="
$(add_plasma_dep kscreenlocker)
$(add_plasma_dep kwin)
$(add_plasma_dep libksysguard)
- $(add_qt_dep qtconcurrent)
$(add_qt_dep qtdbus)
$(add_qt_dep qtdeclarative 'widgets')
$(add_qt_dep qtgui 'jpeg')
@@ -75,6 +74,7 @@ COMMON_DEPEND="
x11-libs/libxcb
x11-libs/libXfixes
x11-libs/libXrender
+ x11-libs/libXtst
x11-libs/xcb-util
x11-libs/xcb-util-image
calendar? ( $(add_kdeapps_dep kholidays) )
@@ -86,6 +86,7 @@ COMMON_DEPEND="
"
RDEPEND="${COMMON_DEPEND}
$(add_frameworks_dep kded)
+ $(add_frameworks_dep kdesu)
$(add_kdeapps_dep kio-extras)
$(add_plasma_dep kde-cli-tools)
$(add_plasma_dep ksysguard)
@@ -114,10 +115,14 @@ RDEPEND="${COMMON_DEPEND}
!kde-plasma/plasma-workspace:4
"
DEPEND="${COMMON_DEPEND}
+ $(add_qt_dep qtconcurrent)
x11-proto/xproto
"
-PATCHES=( "${FILESDIR}/${PN}-5.4-startkde-script.patch" )
+PATCHES=(
+ "${FILESDIR}/${PN}-5.4-startkde-script.patch"
+ "${FILESDIR}/${PN}-5.10.4-unused-dep.patch"
+)
RESTRICT+=" test"
@@ -132,12 +137,13 @@ src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package calendar KF5Holidays)
$(cmake-utils_use_find_package geolocation KF5NetworkManagerQt)
- $(cmake-utils_use_find_package gps libgps)
$(cmake-utils_use_find_package prison KF5Prison)
$(cmake-utils_use_find_package qalculate Qalculate)
$(cmake-utils_use_find_package semantic-desktop KF5Baloo)
)
+ use gps && mycmakeargs+=( $(cmake-utils_use_find_package gps libgps) )
+
kde5_src_configure
}
