commit: a4067bc7d43134009dea39e19811553b282bfd0c
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun Mar 13 15:52:08 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Mar 13 15:52:56 2016 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=a4067bc7
kde-plasma/plasma-sdk: Add missing DEPENDs, fix bug 577004
Package-Manager: portage-2.2.27
.../files/plasma-sdk-5.3.2-remove-qtwebkit.patch | 11 -----
.../files/plasma-sdk-5.5.5-dependencies.patch | 51 ++++++++++++++++++++++
.../files/plasma-sdk-5.5.5-qtwebkit-optional.patch | 32 ++++++++++++++
kde-plasma/plasma-sdk/metadata.xml | 3 ++
...k-5.5.95.ebuild => plasma-sdk-5.5.95-r1.ebuild} | 26 +++++++++--
.../plasma-sdk/plasma-sdk-5.6.49.9999.ebuild | 26 +++++++++--
kde-plasma/plasma-sdk/plasma-sdk-9999.ebuild | 23 ++++++++--
7 files changed, 152 insertions(+), 20 deletions(-)
diff --git a/kde-plasma/plasma-sdk/files/plasma-sdk-5.3.2-remove-qtwebkit.patch
b/kde-plasma/plasma-sdk/files/plasma-sdk-5.3.2-remove-qtwebkit.patch
deleted file mode 100644
index 6a5c8b0..0000000
--- a/kde-plasma/plasma-sdk/files/plasma-sdk-5.3.2-remove-qtwebkit.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/CMakeLists.txt 2015-07-18 18:21:24.686994466 +0200
-+++ b/CMakeLists.txt 2015-07-18 18:21:51.772993658 +0200
-@@ -24,7 +24,7 @@
- # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is
checked
- set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH}
${ECM_KDE_MODULE_DIR})
-
--find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Core DBus Gui Qml Quick Svg
WebKit WebKitWidgets Widgets Xml)
-+find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Core DBus Gui Qml Quick Svg
Widgets Xml)
-
- find_package(Qt5Test ${QT_MIN_VERSION} CONFIG QUIET)
- set_package_properties(Qt5Test PROPERTIES
diff --git a/kde-plasma/plasma-sdk/files/plasma-sdk-5.5.5-dependencies.patch
b/kde-plasma/plasma-sdk/files/plasma-sdk-5.5.5-dependencies.patch
new file mode 100644
index 0000000..e585eef
--- /dev/null
+++ b/kde-plasma/plasma-sdk/files/plasma-sdk-5.5.5-dependencies.patch
@@ -0,0 +1,51 @@
+commit 56676709a8a0ecf51429bc1ac508513f72d0a761
+Author: Andreas Sturmlechner <[email protected]>
+Date: Sun Mar 13 14:43:50 2016 +0100
+
+ Make Qt5Test really optional, fix plasmate dependencies
+
+ KF5NewStuff, KF5Parts are only required for plasmate.
+ Could not push KF5ItemModels down into plasmate without breaking
+ build. Is it a problem within KDevPlatform?
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b556de6..bc982ae 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -74,7 +74,7 @@ endif()
+ # Load CMake, Compiler and InstallDirs settings from KF5 and the following
are already somewhat "done" tier1/tier2 libs from kdelibs:
+ find_package(KF5 REQUIRED COMPONENTS
+ Archive Completion Config ConfigWidgets CoreAddons DBusAddons Declarative
I18n IconThemes ItemModels
+- KIO NewStuff Parts Plasma PlasmaQuick Service TextEditor WidgetsAddons
XmlGui WindowSystem)
++ KIO Plasma PlasmaQuick Service TextEditor WidgetsAddons XmlGui
WindowSystem)
+
+ #########################################################################
+
+diff --git a/cuttlefish/CMakeLists.txt b/cuttlefish/CMakeLists.txt
+index 6eaa78a..5b90fef 100644
+--- a/cuttlefish/CMakeLists.txt
++++ b/cuttlefish/CMakeLists.txt
+@@ -2,7 +2,9 @@ project(cuttlefish)
+ add_definitions(-DTRANSLATION_DOMAIN=\"cuttlefish\")
+
+ add_subdirectory(src)
+-add_subdirectory(autotests)
++if(BUILD_TESTING)
++ add_subdirectory(autotests)
++endif()
+
+
+ plasma_install_package(package org.kde.plasma.cuttlefish packages package)
+diff --git a/plasmate/CMakeLists.txt b/plasmate/CMakeLists.txt
+index 8f28ec4..4586102 100644
+--- a/plasmate/CMakeLists.txt
++++ b/plasmate/CMakeLists.txt
+@@ -13,6 +13,8 @@ add_feature_info(GIT_EXECUTABLE_FOUND "Git" "Distributed
Revision Control System
+
+ find_package(KF5 REQUIRED COMPONENTS
+ KDELibs4Support
++ NewStuff
++ Parts
+ )
+
+ #install( FILES previewer/windowswitcher/thumbnails/konqueror.png
diff --git
a/kde-plasma/plasma-sdk/files/plasma-sdk-5.5.5-qtwebkit-optional.patch
b/kde-plasma/plasma-sdk/files/plasma-sdk-5.5.5-qtwebkit-optional.patch
new file mode 100644
index 0000000..7aa92cc
--- /dev/null
+++ b/kde-plasma/plasma-sdk/files/plasma-sdk-5.5.5-qtwebkit-optional.patch
@@ -0,0 +1,32 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -24,7 +24,18 @@
+ # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is
checked
+ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH}
${ECM_KDE_MODULE_DIR})
+
+-find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Core DBus Gui Qml Quick Svg
WebKit WebKitWidgets Widgets Xml)
++find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Core DBus Gui Qml Quick Svg
Widgets Xml)
++
++find_package(Qt5WebKit ${QT_MIN_VERSION} CONFIG)
++set_package_properties(Qt5WebKit PROPERTIES
++ PURPOSE "Required for plasmate"
++ TYPE OPTIONAL
++ )
++find_package(Qt5WebKitWidgets ${QT_MIN_VERSION} CONFIG)
++set_package_properties(Qt5WebKitWidgets PROPERTIES
++ PURPOSE "Required for plasmate"
++ TYPE OPTIONAL
++ )
+
+ find_package(Qt5Test ${QT_MIN_VERSION} CONFIG QUIET)
+ set_package_properties(Qt5Test PROPERTIES
+@@ -78,7 +89,7 @@
+ add_subdirectory(themeexplorer)
+ #add_subdirectory(remote-widgets-browser)
+ #add_subdirectory(wallpaperviewer)
+-if (KDevPlatform_FOUND)
++if (KDevPlatform_FOUND AND Qt5WebKit_FOUND AND Qt5WebKitWidgets_FOUND)
+ add_subdirectory(plasmate)
+ endif()
+
+
diff --git a/kde-plasma/plasma-sdk/metadata.xml
b/kde-plasma/plasma-sdk/metadata.xml
index 2fdbf33..bbb86a2 100644
--- a/kde-plasma/plasma-sdk/metadata.xml
+++ b/kde-plasma/plasma-sdk/metadata.xml
@@ -5,4 +5,7 @@
<email>[email protected]</email>
<name>Gentoo KDE Project</name>
</maintainer>
+ <use>
+ <flag name="plasmate">IDE for writing Plasma/KWin components
(themes, plasmoids, runners, data engines)</flag>
+ </use>
</pkgmetadata>
diff --git a/kde-plasma/plasma-sdk/plasma-sdk-5.5.95.ebuild
b/kde-plasma/plasma-sdk/plasma-sdk-5.5.95-r1.ebuild
similarity index 60%
rename from kde-plasma/plasma-sdk/plasma-sdk-5.5.95.ebuild
rename to kde-plasma/plasma-sdk/plasma-sdk-5.5.95-r1.ebuild
index 1096627..9c1119e 100644
--- a/kde-plasma/plasma-sdk/plasma-sdk-5.5.95.ebuild
+++ b/kde-plasma/plasma-sdk/plasma-sdk-5.5.95-r1.ebuild
@@ -4,17 +4,18 @@
EAPI=6
-KDE_TEST="true"
+KDE_TEST="optional"
VIRTUALX_REQUIRED="test"
inherit kde5
DESCRIPTION="Useful applications for Plasma development"
KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
+IUSE="plasmate"
DEPEND="
$(add_frameworks_dep karchive)
$(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
$(add_frameworks_dep kconfigwidgets)
$(add_frameworks_dep kcoreaddons)
$(add_frameworks_dep kdbusaddons)
@@ -32,9 +33,28 @@ DEPEND="
$(add_qt_dep qtgui)
$(add_qt_dep qtwidgets)
$(add_qt_dep qtxml)
+ plasmate? (
+ $(add_frameworks_dep kdelibs4support)
+ $(add_frameworks_dep kitemmodels)
+ $(add_frameworks_dep knewstuff)
+ $(add_frameworks_dep kparts)
+ )
"
RDEPEND="${DEPEND}
!dev-util/plasmate
"
-PATCHES=( "${FILESDIR}/${PN}-5.3.2-remove-qtwebkit.patch" )
+PATCHES=(
+ "${FILESDIR}/${PN}-5.5.5-dependencies.patch"
+ "${FILESDIR}/${PN}-5.5.5-qtwebkit-optional.patch"
+)
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package plasmate KDevPlatform)
+ $(cmake-utils_use_find_package plasmate Qt5WebKit)
+ $(cmake-utils_use_find_package plasmate Qt5WebKitWidgets)
+ )
+
+ kde5_src_configure
+}
diff --git a/kde-plasma/plasma-sdk/plasma-sdk-5.6.49.9999.ebuild
b/kde-plasma/plasma-sdk/plasma-sdk-5.6.49.9999.ebuild
index b4d53e3..a1f92a7 100644
--- a/kde-plasma/plasma-sdk/plasma-sdk-5.6.49.9999.ebuild
+++ b/kde-plasma/plasma-sdk/plasma-sdk-5.6.49.9999.ebuild
@@ -4,17 +4,18 @@
EAPI=6
-KDE_TEST="true"
+KDE_TEST="optional"
VIRTUALX_REQUIRED="test"
inherit kde5
DESCRIPTION="Useful applications for Plasma development"
KEYWORDS=""
-IUSE=""
+IUSE="plasmate"
DEPEND="
$(add_frameworks_dep karchive)
$(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
$(add_frameworks_dep kconfigwidgets)
$(add_frameworks_dep kcoreaddons)
$(add_frameworks_dep kdbusaddons)
@@ -32,9 +33,28 @@ DEPEND="
$(add_qt_dep qtgui)
$(add_qt_dep qtwidgets)
$(add_qt_dep qtxml)
+ plasmate? (
+ $(add_frameworks_dep kdelibs4support)
+ $(add_frameworks_dep kitemmodels)
+ $(add_frameworks_dep knewstuff)
+ $(add_frameworks_dep kparts)
+ )
"
RDEPEND="${DEPEND}
!dev-util/plasmate
"
-PATCHES=( "${FILESDIR}/${PN}-5.3.2-remove-qtwebkit.patch" )
+PATCHES=(
+ "${FILESDIR}/${PN}-5.5.5-qtwebkit-optional.patch"
+ "${FILESDIR}/${PN}-5.5.5-dependencies.patch"
+)
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package plasmate KDevPlatform)
+ $(cmake-utils_use_find_package plasmate Qt5WebKit)
+ $(cmake-utils_use_find_package plasmate Qt5WebKitWidgets)
+ )
+
+ kde5_src_configure
+}
diff --git a/kde-plasma/plasma-sdk/plasma-sdk-9999.ebuild
b/kde-plasma/plasma-sdk/plasma-sdk-9999.ebuild
index b4d53e3..6edd41f 100644
--- a/kde-plasma/plasma-sdk/plasma-sdk-9999.ebuild
+++ b/kde-plasma/plasma-sdk/plasma-sdk-9999.ebuild
@@ -4,17 +4,18 @@
EAPI=6
-KDE_TEST="true"
+KDE_TEST="optional"
VIRTUALX_REQUIRED="test"
inherit kde5
DESCRIPTION="Useful applications for Plasma development"
KEYWORDS=""
-IUSE=""
+IUSE="plasmate"
DEPEND="
$(add_frameworks_dep karchive)
$(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
$(add_frameworks_dep kconfigwidgets)
$(add_frameworks_dep kcoreaddons)
$(add_frameworks_dep kdbusaddons)
@@ -32,9 +33,25 @@ DEPEND="
$(add_qt_dep qtgui)
$(add_qt_dep qtwidgets)
$(add_qt_dep qtxml)
+ plasmate? (
+ $(add_frameworks_dep kdelibs4support)
+ $(add_frameworks_dep kitemmodels)
+ $(add_frameworks_dep knewstuff)
+ $(add_frameworks_dep kparts)
+ )
"
RDEPEND="${DEPEND}
!dev-util/plasmate
"
-PATCHES=( "${FILESDIR}/${PN}-5.3.2-remove-qtwebkit.patch" )
+PATCHES=( "${FILESDIR}/${PN}-5.5.5-dependencies.patch" )
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package plasmate KDevPlatform)
+ $(cmake-utils_use_find_package plasmate Qt5WebKit)
+ $(cmake-utils_use_find_package plasmate Qt5WebKitWidgets)
+ )
+
+ kde5_src_configure
+}
