commit: db40acb48537157b96f7426a6c2ff4d9633748ca Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Fri Nov 24 10:45:26 2023 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Fri Nov 24 11:18:40 2023 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=db40acb4
kde-plasma/libkworkspace: Drop unused dep from buildsys Follow-up to commit e1c57a19fd76acdbb4f479c7a674f1d0ffc4ae91 Closes: https://bugs.gentoo.org/918114 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> ....22.80-standalone.patch => libkworkspace-5.27.9-standalone.patch} | 4 ++-- kde-plasma/libkworkspace/libkworkspace-5.27.49.9999.ebuild | 5 ++--- kde-plasma/libkworkspace/libkworkspace-9999.ebuild | 5 ++--- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/kde-plasma/libkworkspace/files/libkworkspace-5.22.80-standalone.patch b/kde-plasma/libkworkspace/files/libkworkspace-5.27.9-standalone.patch similarity index 96% rename from kde-plasma/libkworkspace/files/libkworkspace-5.22.80-standalone.patch rename to kde-plasma/libkworkspace/files/libkworkspace-5.27.9-standalone.patch index 971dc941d0..85eddb74b5 100644 --- a/kde-plasma/libkworkspace/files/libkworkspace-5.22.80-standalone.patch +++ b/kde-plasma/libkworkspace/files/libkworkspace-5.27.9-standalone.patch @@ -39,7 +39,7 @@ index 015c5181f..0aa635e11 100644 + include(ECMMarkAsTest) + include(GenerateExportHeader) + -+ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Config CoreAddons I18n Init WindowSystem) ++ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Config CoreAddons I18n WindowSystem) + + find_package(KWinDBusInterface CONFIG REQUIRED) + find_package(KScreenLocker 5.13.80 REQUIRED) @@ -69,7 +69,7 @@ index 015c5181f..0aa635e11 100644 set(kworkspace_LIB_SRCS kdisplaymanager.cpp kworkspace.cpp @@ -12,9 +65,17 @@ add_definitions(-DTRANSLATION_DOMAIN=\"libkworkspace\") - qt_add_dbus_interface(kworkspace_LIB_SRCS ${KINIT_DBUS_INTERFACES_DIR}/kf5_org.kde.KLauncher.xml klauncher_interface) + qt_add_dbus_interface(kworkspace_LIB_SRCS kf5_org.kde.KLauncher.xml klauncher_interface) qt_add_dbus_interface(kworkspace_LIB_SRCS ${KSCREENLOCKER_DBUS_INTERFACES_DIR}/kf5_org.freedesktop.ScreenSaver.xml screenlocker_interface ) qt_add_dbus_interface(kworkspace_LIB_SRCS ${KSCREENLOCKER_DBUS_INTERFACES_DIR}/org.kde.screensaver.xml kscreenlocker_interface ) +if(${CMAKE_SOURCE_DIR} STREQUAL ${libkworkspace_SOURCE_DIR}) diff --git a/kde-plasma/libkworkspace/libkworkspace-5.27.49.9999.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.27.49.9999.ebuild index 050451a862..0fdde3aac2 100644 --- a/kde-plasma/libkworkspace/libkworkspace-5.27.49.9999.ebuild +++ b/kde-plasma/libkworkspace/libkworkspace-5.27.49.9999.ebuild @@ -11,6 +11,7 @@ QTMIN=5.15.9 inherit ecm plasma.kde.org DESCRIPTION="Workspace library to interact with the Plasma session manager" +S="${S}/${PN}" LICENSE="GPL-2" # TODO: CHECK SLOT="5" @@ -34,15 +35,13 @@ DEPEND="${RDEPEND} >=kde-plasma/kwin-${PVCUT}:5 " -S="${S}/${PN}" - src_prepare() { # delete colliding libkworkspace translations, let ecm_src_prepare do its magic find ../po -type f -name "*po" -and -not -name "libkworkspace*" -delete || die rm -rf po/*/docs || die cp -a ../po ./ || die - eapply "${FILESDIR}/${PN}-5.22.80-standalone.patch" + eapply "${FILESDIR}/${PN}-5.27.9-standalone.patch" sed -e "/set/s/GENTOO_PV/$(ver_cut 1-3)/" -i CMakeLists.txt || die cat >> CMakeLists.txt <<- _EOF_ || die ki18n_install(po) diff --git a/kde-plasma/libkworkspace/libkworkspace-9999.ebuild b/kde-plasma/libkworkspace/libkworkspace-9999.ebuild index 050451a862..0fdde3aac2 100644 --- a/kde-plasma/libkworkspace/libkworkspace-9999.ebuild +++ b/kde-plasma/libkworkspace/libkworkspace-9999.ebuild @@ -11,6 +11,7 @@ QTMIN=5.15.9 inherit ecm plasma.kde.org DESCRIPTION="Workspace library to interact with the Plasma session manager" +S="${S}/${PN}" LICENSE="GPL-2" # TODO: CHECK SLOT="5" @@ -34,15 +35,13 @@ DEPEND="${RDEPEND} >=kde-plasma/kwin-${PVCUT}:5 " -S="${S}/${PN}" - src_prepare() { # delete colliding libkworkspace translations, let ecm_src_prepare do its magic find ../po -type f -name "*po" -and -not -name "libkworkspace*" -delete || die rm -rf po/*/docs || die cp -a ../po ./ || die - eapply "${FILESDIR}/${PN}-5.22.80-standalone.patch" + eapply "${FILESDIR}/${PN}-5.27.9-standalone.patch" sed -e "/set/s/GENTOO_PV/$(ver_cut 1-3)/" -i CMakeLists.txt || die cat >> CMakeLists.txt <<- _EOF_ || die ki18n_install(po)
