commit: 7c8a67d234b1226a90c295d1ef5c7b0cc31c1684 Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> AuthorDate: Wed Sep 14 22:34:21 2016 +0000 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> CommitDate: Sat Oct 8 15:51:49 2016 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=7c8a67d2
kde-plasma/plasma-workspace: Make kde-frameworks/baloo optional 'baloo is the most dysfunctional part of whole kde frameworks' Package-Manager: portage-2.3.0 .../plasma-workspace-5.7.90-baloo-optional.patch | 41 ++++++++++++++++++++++ .../plasma-workspace-5.8.49.9999.ebuild | 10 ++++-- .../plasma-workspace/plasma-workspace-9999.ebuild | 10 ++++-- 3 files changed, 55 insertions(+), 6 deletions(-) diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.7.90-baloo-optional.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.7.90-baloo-optional.patch new file mode 100644 index 0000000..34f7142 --- /dev/null +++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.7.90-baloo-optional.patch @@ -0,0 +1,41 @@ +commit 7ea5034dda3d7a497be8c8d1adea08897c165916 +Author: Andreas Sturmlechner <[email protected]> +Date: Thu Sep 15 00:22:38 2016 +0200 + + Make KF5Baloo optional + + https://mail.kde.org/pipermail/kde-frameworks-devel/2016-September/037734.html + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e57cb73..49584d9 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -26,8 +26,13 @@ find_package(KF5XmlRpcClient REQUIRED) + find_package(KF5 REQUIRED COMPONENTS PlasmaQuick) + find_package(KF5 REQUIRED COMPONENTS SysGuard) + find_package(KF5 REQUIRED COMPONENTS Package) +-# Baloo has a different version scheme than KF5 for now +-find_package(KF5 5.1 REQUIRED COMPONENTS Baloo) ++ ++find_package(KF5Baloo) ++set_package_properties(KF5Baloo PROPERTIES DESCRIPTION "File Searching" ++ TYPE OPTIONAL ++ PURPOSE "Needed for the File Search runner." ++ ) ++ + find_package(KF5TextEditor) + find_package(KWinDBusInterface CONFIG REQUIRED) + +diff --git a/runners/CMakeLists.txt b/runners/CMakeLists.txt +index 48cc379..d7656c8 100644 +--- a/runners/CMakeLists.txt ++++ b/runners/CMakeLists.txt +@@ -1,5 +1,7 @@ + add_subdirectory(activities) +-add_subdirectory(baloo) ++if(KF5Baloo_FOUND) ++ add_subdirectory(baloo) ++endif() + add_subdirectory(bookmarks) + add_subdirectory(calculator) + add_subdirectory(locations) diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.8.49.9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.8.49.9999.ebuild index 7f856fa..b7ad9ce 100644 --- a/kde-plasma/plasma-workspace/plasma-workspace-5.8.49.9999.ebuild +++ b/kde-plasma/plasma-workspace/plasma-workspace-5.8.49.9999.ebuild @@ -11,11 +11,10 @@ inherit kde5 multilib qmake-utils DESCRIPTION="KDE Plasma workspace" KEYWORDS="" -IUSE="+calendar geolocation gps prison qalculate" +IUSE="+calendar geolocation gps prison qalculate +semantic-desktop" # drop kde-frameworks/plasma subslot operator when FRAMEWORKS_MINIMAL >= 5.24.0 COMMON_DEPEND=" - $(add_frameworks_dep baloo) $(add_frameworks_dep kactivities) $(add_frameworks_dep kauth) $(add_frameworks_dep kbookmarks) @@ -86,6 +85,7 @@ COMMON_DEPEND=" gps? ( sci-geosciences/gpsd ) prison? ( media-libs/prison:5 ) qalculate? ( sci-libs/libqalculate ) + semantic-desktop? ( $(add_frameworks_dep baloo) ) " RDEPEND="${COMMON_DEPEND} $(add_frameworks_dep kded) @@ -120,7 +120,10 @@ DEPEND="${COMMON_DEPEND} x11-proto/xproto " -PATCHES=( "${FILESDIR}/${PN}-5.4-startkde-script.patch" ) +PATCHES=( + "${FILESDIR}/${PN}-5.4-startkde-script.patch" + "${FILESDIR}/${PN}-5.7.90-baloo-optional.patch" +) RESTRICT+=" test" @@ -138,6 +141,7 @@ src_configure() { $(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) ) kde5_src_configure diff --git a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild index 7f856fa..b7ad9ce 100644 --- a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild +++ b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild @@ -11,11 +11,10 @@ inherit kde5 multilib qmake-utils DESCRIPTION="KDE Plasma workspace" KEYWORDS="" -IUSE="+calendar geolocation gps prison qalculate" +IUSE="+calendar geolocation gps prison qalculate +semantic-desktop" # drop kde-frameworks/plasma subslot operator when FRAMEWORKS_MINIMAL >= 5.24.0 COMMON_DEPEND=" - $(add_frameworks_dep baloo) $(add_frameworks_dep kactivities) $(add_frameworks_dep kauth) $(add_frameworks_dep kbookmarks) @@ -86,6 +85,7 @@ COMMON_DEPEND=" gps? ( sci-geosciences/gpsd ) prison? ( media-libs/prison:5 ) qalculate? ( sci-libs/libqalculate ) + semantic-desktop? ( $(add_frameworks_dep baloo) ) " RDEPEND="${COMMON_DEPEND} $(add_frameworks_dep kded) @@ -120,7 +120,10 @@ DEPEND="${COMMON_DEPEND} x11-proto/xproto " -PATCHES=( "${FILESDIR}/${PN}-5.4-startkde-script.patch" ) +PATCHES=( + "${FILESDIR}/${PN}-5.4-startkde-script.patch" + "${FILESDIR}/${PN}-5.7.90-baloo-optional.patch" +) RESTRICT+=" test" @@ -138,6 +141,7 @@ src_configure() { $(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) ) kde5_src_configure
