commit: 2e45a010d69af7cd6d7d686f60db7c1cedc1bb41 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sat May 29 20:49:11 2021 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sat May 29 20:49:11 2021 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=2e45a010
kde-plasma/plasma-workspace: Rebase split-libkworkspace.patch Package-Manager: Portage-3.0.19, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> ...h => plasma-workspace-5.21.5-split-libkworkspace.patch} | 14 ++++++-------- .../plasma-workspace/plasma-workspace-5.21.90.ebuild | 2 +- .../plasma-workspace/plasma-workspace-5.22.49.9999.ebuild | 2 +- kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild | 2 +- 4 files changed, 9 insertions(+), 11 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.21.5-split-libkworkspace.patch similarity index 71% rename from kde-plasma/plasma-workspace/files/plasma-workspace-5.14.2-split-libkworkspace.patch rename to kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-split-libkworkspace.patch index f12d9f4daf..c96c0ba623 100644 --- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.14.2-split-libkworkspace.patch +++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-split-libkworkspace.patch @@ -8,19 +8,19 @@ Subject: [PATCH] libkworkspace: Allow standalone build 1 file changed, 5 insertions(+), 1 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index e587a386..d1a63527 100644 +index 67f82cfb7..88a8c09b4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -46,6 +46,7 @@ set_package_properties(KF5Baloo PROPERTIES DESCRIPTION "File Searching" +@@ -73,6 +73,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(LibKWorkspace 5.21.5) + find_package(KF5Screen CONFIG REQUIRED) 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) +@@ -214,7 +215,10 @@ query_qmake(QtBinariesDir QT_INSTALL_BINS) + option(PLASMA_WAYLAND_DEFAULT_SESSION "Use Wayland session by default for Plasma" FALSE) add_subdirectory(doc) -add_subdirectory(libkworkspace) @@ -31,5 +31,3 @@ index e587a386..d1a63527 100644 add_subdirectory(libdbusmenuqt) add_subdirectory(appmenu) --- -2.19.1 diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.21.90.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.21.90.ebuild index 56a8a45e5f..f3b2afd529 100644 --- a/kde-plasma/plasma-workspace/plasma-workspace-5.21.90.ebuild +++ b/kde-plasma/plasma-workspace/plasma-workspace-5.21.90.ebuild @@ -148,7 +148,7 @@ PDEPEND=" >=kde-plasma/kde-cli-tools-${PVCUT}:5 " -PATCHES=( "${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch" ) +PATCHES=( "${FILESDIR}/${PN}-5.21.5-split-libkworkspace.patch" ) # downstream src_prepare() { ecm_src_prepare diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.22.49.9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.22.49.9999.ebuild index 8f18aa1c0b..470072dbc5 100644 --- a/kde-plasma/plasma-workspace/plasma-workspace-5.22.49.9999.ebuild +++ b/kde-plasma/plasma-workspace/plasma-workspace-5.22.49.9999.ebuild @@ -148,7 +148,7 @@ PDEPEND=" >=kde-plasma/kde-cli-tools-${PVCUT}:5 " -PATCHES=( "${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch" ) +PATCHES=( "${FILESDIR}/${PN}-5.21.5-split-libkworkspace.patch" ) # downstream src_prepare() { ecm_src_prepare diff --git a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild index 7114aa97f8..d7e27260c8 100644 --- a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild +++ b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild @@ -148,7 +148,7 @@ PDEPEND=" >=kde-plasma/kde-cli-tools-${PVCUT}:5 " -PATCHES=( "${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch" ) +PATCHES=( "${FILESDIR}/${PN}-5.21.5-split-libkworkspace.patch" ) # downstream src_prepare() { ecm_src_prepare