diff options
| author | Andreas Sturmlechner <asturm@gentoo.org> | 2018-10-22 11:15:58 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2018-10-22 20:06:12 +0200 |
| commit | 0d96ded4d0064c4562b3a118c97e0fdca07fdf3c (patch) | |
| tree | 44f526b4274cef8da6eb5f7737ddf21394f5bc71 | |
| parent | fb911c3477d846c25f47e37f91deeb2e86e1ef84 (diff) | |
| download | kde-0d96ded4d0064c4562b3a118c97e0fdca07fdf3c.tar.gz kde-0d96ded4d0064c4562b3a118c97e0fdca07fdf3c.tar.bz2 kde-0d96ded4d0064c4562b3a118c97e0fdca07fdf3c.zip | |
kde-plasma/plasma-workspace: DEPEND on standalone libkworkspace
Disabling build of libkworkspace subdirectory.
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
3 files changed, 52 insertions, 1 deletions
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.14.2-split-libkworkspace.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.14.2-split-libkworkspace.patch new file mode 100644 index 00000000000..f12d9f4daf5 --- /dev/null +++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.14.2-split-libkworkspace.patch @@ -0,0 +1,35 @@ +From 4717089b68c386446be240f463f2f13e7024468b Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com> +Date: Mon, 22 Oct 2018 10:35:10 +0200 +Subject: [PATCH] libkworkspace: Allow standalone build + +--- + CMakeLists.txt | 6 +++- + 1 file changed, 5 insertions(+), 1 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e587a386..d1a63527 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -46,6 +46,7 @@ set_package_properties(KF5Baloo PROPERTIES DESCRIPTION "File Searching" + + find_package(KF5TextEditor) + find_package(KWinDBusInterface CONFIG REQUIRED) ++find_package(LibKWorkspace 5.14.1) + + find_package(KScreenLocker 5.13.80 REQUIRED) + find_package(ScreenSaverDBusInterface CONFIG REQUIRED) +@@ -135,7 +136,10 @@ endif() + add_definitions(-DQT_NO_URL_CAST_FROM_STRING) + + add_subdirectory(doc) +-add_subdirectory(libkworkspace) ++if(NOT LibKWorkspace_FOUND) ++ message(STATUS "System LibKWorkspace not found, using bundled.") ++ add_subdirectory(libkworkspace) ++endif() + add_subdirectory(libdbusmenuqt) + add_subdirectory(appmenu) + +-- +2.19.1 diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.14.49.9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.14.49.9999.ebuild index ed436f5d271..4c1e1c34c3c 100644 --- a/kde-plasma/plasma-workspace/plasma-workspace-5.14.49.9999.ebuild +++ b/kde-plasma/plasma-workspace/plasma-workspace-5.14.49.9999.ebuild @@ -55,6 +55,7 @@ COMMON_DEPEND=" $(add_plasma_dep kscreenlocker) $(add_plasma_dep kwin) $(add_plasma_dep libksysguard) + $(add_plasma_dep libkworkspace) $(add_qt_dep qtdbus) $(add_qt_dep qtdeclarative 'widgets') $(add_qt_dep qtgui 'jpeg') @@ -126,6 +127,7 @@ PATCHES=( "${FILESDIR}/${PN}-5.4-startkde-script.patch" "${FILESDIR}/${PN}-5.10-startplasmacompositor-script.patch" "${FILESDIR}/${PN}-5.12.80-tests-optional.patch" + "${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch" ) RESTRICT+=" test" @@ -135,6 +137,12 @@ src_prepare() { sed -e "s|\`qtpaths|\`$(qt5_get_bindir)/qtpaths|" \ -i startkde/startkde.cmake startkde/startplasmacompositor.cmake || die + + cmake_comment_add_subdirectory libkworkspace + # delete colliding libkworkspace translations + if [[ ${KDE_BUILD_TYPE} = release ]]; then + find po -type f -name "*po" -and -name "libkworkspace*" -delete || die + fi } src_configure() { diff --git a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild index a7560f18b45..4c1e1c34c3c 100644 --- a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild +++ b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -55,6 +55,7 @@ COMMON_DEPEND=" $(add_plasma_dep kscreenlocker) $(add_plasma_dep kwin) $(add_plasma_dep libksysguard) + $(add_plasma_dep libkworkspace) $(add_qt_dep qtdbus) $(add_qt_dep qtdeclarative 'widgets') $(add_qt_dep qtgui 'jpeg') @@ -126,6 +127,7 @@ PATCHES=( "${FILESDIR}/${PN}-5.4-startkde-script.patch" "${FILESDIR}/${PN}-5.10-startplasmacompositor-script.patch" "${FILESDIR}/${PN}-5.12.80-tests-optional.patch" + "${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch" ) RESTRICT+=" test" @@ -135,6 +137,12 @@ src_prepare() { sed -e "s|\`qtpaths|\`$(qt5_get_bindir)/qtpaths|" \ -i startkde/startkde.cmake startkde/startplasmacompositor.cmake || die + + cmake_comment_add_subdirectory libkworkspace + # delete colliding libkworkspace translations + if [[ ${KDE_BUILD_TYPE} = release ]]; then + find po -type f -name "*po" -and -name "libkworkspace*" -delete || die + fi } src_configure() { |