[gentoo-commits] proj/kde:master commit in: kde-plasma/libkworkspace/files/, kde-plasma/libkworkspace/
commit: 483f34aa737a73985e1889086d5861f4ae83bc4b Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Jan 16 14:31:59 2024 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Jan 16 15:26:51 2024 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=483f34aa kde-plasma/libkworkspace: treeclean Signed-off-by: Andreas Sturmlechner gentoo.org> .../files/libkworkspace-5.27.9-standalone.patch| 108 - .../libkworkspace-5.27.49..ebuild | 51 -- kde-plasma/libkworkspace/metadata.xml | 11 --- 3 files changed, 170 deletions(-) diff --git a/kde-plasma/libkworkspace/files/libkworkspace-5.27.9-standalone.patch b/kde-plasma/libkworkspace/files/libkworkspace-5.27.9-standalone.patch deleted file mode 100644 index 85eddb74b5..00 --- a/kde-plasma/libkworkspace/files/libkworkspace-5.27.9-standalone.patch +++ /dev/null @@ -1,108 +0,0 @@ -From 2360505a8f6475b6988efa60c3ba746bfbe4c4d0 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Sun, 2 Feb 2020 18:29:57 +0100 -Subject: [PATCH] libkworkspace: Allow standalone build - - libkworkspace/CMakeLists.txt | 67 +++- - 1 file changed, 66 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 015c5181f..0aa635e11 100644 a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,3 +1,56 @@ -+project(libkworkspace) -+ -+if(${CMAKE_SOURCE_DIR} STREQUAL ${libkworkspace_SOURCE_DIR}) -+set(PROJECT_VERSION "GENTOO_PV") -+set(PROJECT_VERSION_MAJOR 5) -+ -+cmake_minimum_required(VERSION 3.16) -+ -+set(QT_MIN_VERSION "5.15.0") -+set(KF5_MIN_VERSION "5.82.0") -+find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core DBus) -+find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE) -+set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) -+ -+include(KDEInstallDirs) -+include(KDECMakeSettings) -+include(KDECompilerSettings NO_POLICY_SCOPE) -+include(ECMMarkNonGuiExecutable) -+include(CMakePackageConfigHelpers) -+include(WriteBasicConfigVersionFile) -+include(CheckIncludeFiles) -+include(FeatureSummary) -+include(ECMQtDeclareLoggingCategory) -+include(KDEPackageAppTemplates) -+include(ECMMarkAsTest) -+include(GenerateExportHeader) -+ -+find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Config CoreAddons I18n WindowSystem) -+ -+find_package(KWinDBusInterface CONFIG REQUIRED) -+find_package(KScreenLocker 5.13.80 REQUIRED) -+find_package(ScreenSaverDBusInterface CONFIG REQUIRED) -+ -+find_package(X11) -+set_package_properties(X11 PROPERTIES DESCRIPTION "X11 libraries" -+URL "http://www.x.org"; -+TYPE OPTIONAL -+PURPOSE "Required for X11 support") -+ -+if(X11_FOUND) -+find_package(Qt5X11Extras ${QT_MIN_VERSION} CONFIG REQUIRED) -+set(HAVE_X11 1) -+endif() -+ -+if(BUILD_TESTING) -+find_package(Qt5Test ${QT_MIN_VERSION} CONFIG REQUIRED) -+endif() -+ -+check_include_files(unistd.h HAVE_UNISTD_H) -+ -+configure_file(../config-workspace.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-workspace.h) -+configure_file(../config-X11.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-X11.h) -+endif() - - set(kworkspace_LIB_SRCS kdisplaymanager.cpp - kworkspace.cpp -@@ -12,9 +65,17 @@ add_definitions(-DTRANSLATION_DOMAIN=\"libkworkspace\") - 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}) -+qt_add_dbus_interface(kworkspace_LIB_SRCS ../ksmserver/org.kde.LogoutPrompt.xml logoutprompt_interface) -+qt_add_dbus_interface(kworkspace_LIB_SRCS ../startkde/plasma-session/org.kde.Startup.xml startup_interface) -+qt_add_dbus_interface(kworkspace_LIB_SRCS ../startkde/plasma-shutdown/org.kde.Shutdown.xml shutdown_interface) -+set(ksmserver_xml ../ksmserver/org.kde.KSMServerInterface.xml) -+else() - qt_add_dbus_interface(kworkspace_LIB_SRCS ${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.LogoutPrompt.xml logoutprompt_interface) - qt_add_dbus_interface(kworkspace_LIB_SRCS ${plasma-workspace_SOURCE_DIR}/startkde/plasma-session/org.kde.Startup.xml startup_interface) - qt_add_dbus_interface(kworkspace_LIB_SRCS ${plasma-workspace_SOURCE_DIR}/startkde/plasma-shutdown/org.kde.Shutdown.xml shutdown_interface) -+set(ksmserver_xml ${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.KSMServerInterface.xml) -+endif() - - set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/org.freedesktop.login1.Manager.xml" -
[gentoo-commits] proj/kde:master commit in: kde-plasma/libkworkspace/files/, kde-plasma/libkworkspace/
commit: b8621bbfe3fa8ba703fdfcc66a32008f5ab47a68 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Dec 9 14:39:48 2023 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Dec 9 14:57:25 2023 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=b8621bbf kde-plasma/libkworkspace: drop , the split is history Signed-off-by: Andreas Sturmlechner gentoo.org> .../files/libkworkspace-5.90.0-standalone.patch| 104 - kde-plasma/libkworkspace/libkworkspace-.ebuild | 53 --- 2 files changed, 157 deletions(-) diff --git a/kde-plasma/libkworkspace/files/libkworkspace-5.90.0-standalone.patch b/kde-plasma/libkworkspace/files/libkworkspace-5.90.0-standalone.patch deleted file mode 100644 index 5ce29c118a..00 --- a/kde-plasma/libkworkspace/files/libkworkspace-5.90.0-standalone.patch +++ /dev/null @@ -1,104 +0,0 @@ -From a3c528c0d5c4305c44076141150ded3e89db6bc2 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Mon, 21 Feb 2022 12:24:56 +0100 -Subject: [PATCH] libkworkspace: Allow standalone build - -Signed-off-by: Andreas Sturmlechner - CMakeLists.txt | 67 - 2 files changed, 72 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f1b66b8709..62f48ef99a 100644 a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,3 +1,57 @@ -+project(libkworkspace) -+ -+if(${CMAKE_SOURCE_DIR} STREQUAL ${libkworkspace_SOURCE_DIR}) -+set(PROJECT_VERSION "5.90.0") -+set(PROJECT_VERSION_MAJOR 6) -+ -+cmake_minimum_required(VERSION 3.16) -+ -+set(QT_MIN_VERSION "6.5.0") -+set(KF6_MIN_VERSION "5.240.0") -+find_package(Qt6 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core DBus WaylandClient) -+find_package(ECM ${KF6_MIN_VERSION} REQUIRED NO_MODULE) -+set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) -+ -+include(KDEInstallDirs) -+include(KDECMakeSettings) -+include(KDECompilerSettings NO_POLICY_SCOPE) -+include(ECMMarkNonGuiExecutable) -+include(CMakePackageConfigHelpers) -+include(WriteBasicConfigVersionFile) -+include(CheckIncludeFiles) -+include(FeatureSummary) -+include(ECMQtDeclareLoggingCategory) -+include(KDEPackageAppTemplates) -+include(ECMMarkAsTest) -+include(GenerateExportHeader) -+ -+find_package(KF6 ${KF6_MIN_VERSION} REQUIRED COMPONENTS Config CoreAddons I18n Package Service WindowSystem) -+find_package(Plasma ${PROJECT_VERSION} REQUIRED) -+find_package(KWinDBusInterface CONFIG REQUIRED) -+find_package(KScreenLocker 5.13.80 REQUIRED) -+find_package(ScreenSaverDBusInterface CONFIG REQUIRED) -+find_package(PlasmaWaylandProtocols 1.6 REQUIRED) -+ -+find_package(X11) -+set_package_properties(X11 PROPERTIES DESCRIPTION "X11 libraries" -+URL "http://www.x.org"; -+TYPE OPTIONAL -+PURPOSE "Required for X11 support") -+ -+if(X11_FOUND) -+find_package(XCB MODULE REQUIRED COMPONENTS XCB RANDR IMAGE) -+set(HAVE_X11 1) -+endif() -+ -+if(BUILD_TESTING) -+find_package(Qt6Test ${QT_MIN_VERSION} CONFIG REQUIRED) -+endif() -+ -+check_include_files(unistd.h HAVE_UNISTD_H) -+ -+configure_file(../config-workspace.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-workspace.h) -+configure_file(../config-X11.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-X11.h) -+endif() - - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config-outputorder.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-outputorder.h) - -@@ -23,11 +77,19 @@ set(kworkspace_LIB_SRCS kdisplaymanager.cpp - add_definitions(-DTRANSLATION_DOMAIN=\"libkworkspace\") - - qt_add_dbus_interface(kworkspace_LIB_SRCS ${KSCREENLOCKER_DBUS_INTERFACES_DIR}/kf6_org.freedesktop.ScreenSaver.xml screenlocker_interface ) -+if(${CMAKE_SOURCE_DIR} STREQUAL ${libkworkspace_SOURCE_DIR}) -+qt_add_dbus_interface(kworkspace_LIB_SRCS ../ksmserver/org.kde.LogoutPrompt.xml logoutprompt_interface) -+qt_add_dbus_interface(kworkspace_LIB_SRCS ../startkde/plasma-session/org.kde.Startup.xml startup_interface) -+qt_add_dbus_interface(kworkspace_LIB_SRCS ../startkde/plasma-shutdown/org.kde.Shutdown.xml shutdown_interface) -+set(ksmserver_xml ../ksmserver/org.kde.KSMServerInterface.xml) -+else() - qt_add_dbus_interface(kworkspace_LIB_SRCS ${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.LogoutPrompt.xml logoutprompt_interface) - qt_add_dbus_interface(kworkspace_LIB_SRCS ${plasma-workspace_SOURCE_DIR}/startkde/plasma-session/org.kde.Startup.xml startup_interface) - qt_add_dbus_interface(kworkspace_LIB_SRCS ${plasma-workspace_SOURCE_DIR}/startkde/plasma-shutdown/org.kde.Shutdown.xml shutdown_interface) - - set(ksmserver_xml ${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.KSMServerInterface.xml) -+endif() -+ - qt_add_dbus_interface( kworkspace_LIB_SRCS ${ksmserver_xml} ksmserver_interface ) - - add_library(kworkspace ${kwo
[gentoo-commits] proj/kde:master commit in: kde-plasma/libkworkspace/, kde-plasma/libkworkspace/files/
commit: 6001b74155bc5040fa30615d21f39b8b6d025d21 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Nov 30 22:54:46 2023 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Nov 30 22:54:46 2023 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=6001b741 kde-plasma/libkworkspace: Fist attempt at a standalone-build patch Signed-off-by: Andreas Sturmlechner gentoo.org> .../files/libkworkspace-5.90.0-standalone.patch| 104 + kde-plasma/libkworkspace/libkworkspace-.ebuild | 7 +- 2 files changed, 109 insertions(+), 2 deletions(-) diff --git a/kde-plasma/libkworkspace/files/libkworkspace-5.90.0-standalone.patch b/kde-plasma/libkworkspace/files/libkworkspace-5.90.0-standalone.patch new file mode 100644 index 00..5ce29c118a --- /dev/null +++ b/kde-plasma/libkworkspace/files/libkworkspace-5.90.0-standalone.patch @@ -0,0 +1,104 @@ +From a3c528c0d5c4305c44076141150ded3e89db6bc2 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Mon, 21 Feb 2022 12:24:56 +0100 +Subject: [PATCH] libkworkspace: Allow standalone build + +Signed-off-by: Andreas Sturmlechner +--- + CMakeLists.txt | 67 + 2 files changed, 72 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f1b66b8709..62f48ef99a 100644 +--- a/CMakeLists.txt b/CMakeLists.txt +@@ -1,3 +1,57 @@ ++project(libkworkspace) ++ ++if(${CMAKE_SOURCE_DIR} STREQUAL ${libkworkspace_SOURCE_DIR}) ++set(PROJECT_VERSION "5.90.0") ++set(PROJECT_VERSION_MAJOR 6) ++ ++cmake_minimum_required(VERSION 3.16) ++ ++set(QT_MIN_VERSION "6.5.0") ++set(KF6_MIN_VERSION "5.240.0") ++find_package(Qt6 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core DBus WaylandClient) ++find_package(ECM ${KF6_MIN_VERSION} REQUIRED NO_MODULE) ++set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) ++ ++include(KDEInstallDirs) ++include(KDECMakeSettings) ++include(KDECompilerSettings NO_POLICY_SCOPE) ++include(ECMMarkNonGuiExecutable) ++include(CMakePackageConfigHelpers) ++include(WriteBasicConfigVersionFile) ++include(CheckIncludeFiles) ++include(FeatureSummary) ++include(ECMQtDeclareLoggingCategory) ++include(KDEPackageAppTemplates) ++include(ECMMarkAsTest) ++include(GenerateExportHeader) ++ ++find_package(KF6 ${KF6_MIN_VERSION} REQUIRED COMPONENTS Config CoreAddons I18n Package Service WindowSystem) ++find_package(Plasma ${PROJECT_VERSION} REQUIRED) ++find_package(KWinDBusInterface CONFIG REQUIRED) ++find_package(KScreenLocker 5.13.80 REQUIRED) ++find_package(ScreenSaverDBusInterface CONFIG REQUIRED) ++find_package(PlasmaWaylandProtocols 1.6 REQUIRED) ++ ++find_package(X11) ++set_package_properties(X11 PROPERTIES DESCRIPTION "X11 libraries" ++URL "http://www.x.org"; ++TYPE OPTIONAL ++PURPOSE "Required for X11 support") ++ ++if(X11_FOUND) ++find_package(XCB MODULE REQUIRED COMPONENTS XCB RANDR IMAGE) ++set(HAVE_X11 1) ++endif() ++ ++if(BUILD_TESTING) ++find_package(Qt6Test ${QT_MIN_VERSION} CONFIG REQUIRED) ++endif() ++ ++check_include_files(unistd.h HAVE_UNISTD_H) ++ ++configure_file(../config-workspace.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-workspace.h) ++configure_file(../config-X11.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-X11.h) ++endif() + + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config-outputorder.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-outputorder.h) + +@@ -23,11 +77,19 @@ set(kworkspace_LIB_SRCS kdisplaymanager.cpp + add_definitions(-DTRANSLATION_DOMAIN=\"libkworkspace\") + + qt_add_dbus_interface(kworkspace_LIB_SRCS ${KSCREENLOCKER_DBUS_INTERFACES_DIR}/kf6_org.freedesktop.ScreenSaver.xml screenlocker_interface ) ++if(${CMAKE_SOURCE_DIR} STREQUAL ${libkworkspace_SOURCE_DIR}) ++qt_add_dbus_interface(kworkspace_LIB_SRCS ../ksmserver/org.kde.LogoutPrompt.xml logoutprompt_interface) ++qt_add_dbus_interface(kworkspace_LIB_SRCS ../startkde/plasma-session/org.kde.Startup.xml startup_interface) ++qt_add_dbus_interface(kworkspace_LIB_SRCS ../startkde/plasma-shutdown/org.kde.Shutdown.xml shutdown_interface) ++set(ksmserver_xml ../ksmserver/org.kde.KSMServerInterface.xml) ++else() + qt_add_dbus_interface(kworkspace_LIB_SRCS ${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.LogoutPrompt.xml logoutprompt_interface) + qt_add_dbus_interface(kworkspace_LIB_SRCS ${plasma-workspace_SOURCE_DIR}/startkde/plasma-session/org.kde.Startup.xml startup_interface) + qt_add_dbus_interface(kworkspace_LIB_SRCS ${plasma-workspace_SOURCE_DIR}/startkde/plasma-shutdown/org.kde.Shutdown.xml shutdown_interface) + + set(ksmserver_xml ${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.KSMServerInterface.xml) ++endif() ++ + qt_add_dbus_interface( kworkspace_LIB_SRCS ${ksmserver_xml} ksmserver_interface ) + + add_library(kwo
[gentoo-commits] proj/kde:master commit in: kde-plasma/libkworkspace/, kde-plasma/libkworkspace/files/
commit: db40acb48537157b96f7426a6c2ff4d9633748ca Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Nov 24 10:45:26 2023 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Nov 24 11:18:40 2023 + 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 gentoo.org> 22.80-standalone.patch => libkworkspace-5.27.9-standalone.patch} | 4 ++-- kde-plasma/libkworkspace/libkworkspace-5.27.49..ebuild | 5 ++--- kde-plasma/libkworkspace/libkworkspace-.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..ebuild b/kde-plasma/libkworkspace/libkworkspace-5.27.49..ebuild index 050451a862..0fdde3aac2 100644 --- a/kde-plasma/libkworkspace/libkworkspace-5.27.49..ebuild +++ b/kde-plasma/libkworkspace/libkworkspace-5.27.49..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-.ebuild b/kde-plasma/libkworkspace/libkworkspace-.ebuild index 050451a862..0fdde3aac2 100644 --- a/kde-plasma/libkworkspace/libkworkspace-.ebuild +++ b/kde-plasma/libkworkspace/libkworkspace-.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)
[gentoo-commits] proj/kde:master commit in: kde-plasma/libkworkspace/
commit: c2f26bedd090eda0a8a5b97cd8acc2d6a7773a6c Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Oct 16 11:41:17 2022 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Oct 16 11:41:17 2022 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=c2f26bed kde-plasma/libkworkspace: Translations moved to code repository Signed-off-by: Andreas Sturmlechner gentoo.org> kde-plasma/libkworkspace/libkworkspace-.ebuild | 8 +++- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/kde-plasma/libkworkspace/libkworkspace-.ebuild b/kde-plasma/libkworkspace/libkworkspace-.ebuild index 12eb281d41..49b8525e6c 100644 --- a/kde-plasma/libkworkspace/libkworkspace-.ebuild +++ b/kde-plasma/libkworkspace/libkworkspace-.ebuild @@ -38,11 +38,9 @@ S="${S}/${PN}" src_prepare() { # delete colliding libkworkspace translations, let ecm_src_prepare do its magic - if [[ ${KDE_BUILD_TYPE} = release ]]; then - find ../po -type f -name "*po" -and -not -name "libkworkspace*" -delete || die - rm -rf po/*/docs || die - cp -a ../po ./ || die - fi + 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" sed -e "/set/s/GENTOO_PV/$(ver_cut 1-3)/" -i CMakeLists.txt || die
[gentoo-commits] proj/kde:master commit in: kde-plasma/libkworkspace/
commit: 8a7559daa08a219750ff78d53cdf050c3fe20068 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Sep 15 21:36:22 2022 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Sep 15 21:41:11 2022 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=8a7559da kde-plasma/libkworkspace: 5.25.90 version bump Signed-off-by: Andreas Sturmlechner gentoo.org> .../libkworkspace/libkworkspace-5.25.90.ebuild | 54 ++ 1 file changed, 54 insertions(+) diff --git a/kde-plasma/libkworkspace/libkworkspace-5.25.90.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.25.90.ebuild new file mode 100644 index 00..dee0ce32a3 --- /dev/null +++ b/kde-plasma/libkworkspace/libkworkspace-5.25.90.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_TEST="true" +KDE_ORG_NAME="plasma-workspace" +KFMIN=5.98.0 +PVCUT=$(ver_cut 1-3) +QTMIN=5.15.5 +inherit ecm plasma.kde.org + +DESCRIPTION="Workspace library to interact with the Plasma session manager" + +LICENSE="GPL-2" # TODO: CHECK +SLOT="5" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +IUSE="" + +RDEPEND=" + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtx11extras-${QTMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5 + >=kde-plasma/kscreenlocker-${PVCUT}:5 + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXau +" +DEPEND="${RDEPEND} + >=kde-plasma/kwin-${PVCUT}:5 +" + +S="${S}/${PN}" + +src_prepare() { + # delete colliding libkworkspace translations, let ecm_src_prepare do its magic + if [[ ${KDE_BUILD_TYPE} = release ]]; then + find ../po -type f -name "*po" -and -not -name "libkworkspace*" -delete || die + rm -rf po/*/docs || die + cp -a ../po ./ || die + fi + + eapply "${FILESDIR}/${PN}-5.22.80-standalone.patch" + sed -e "/set/s/GENTOO_PV/$(ver_cut 1-3)/" -i CMakeLists.txt || die + cat >> CMakeLists.txt <<- _EOF_ || die + ki18n_install(po) + _EOF_ + + ecm_src_prepare +}
[gentoo-commits] proj/kde:master commit in: kde-plasma/libkworkspace/
commit: 31a9b3203e6f1d4f97069e4518a0f9d92dfd7e43 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Sep 15 20:54:47 2022 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Sep 15 20:57:04 2022 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=31a9b320 kde-plasma/libkworkspace: 5.26.49. version bump Signed-off-by: Andreas Sturmlechner gentoo.org> .../libkworkspace-5.26.49..ebuild | 54 ++ 1 file changed, 54 insertions(+) diff --git a/kde-plasma/libkworkspace/libkworkspace-5.26.49..ebuild b/kde-plasma/libkworkspace/libkworkspace-5.26.49..ebuild new file mode 100644 index 00..4597f69207 --- /dev/null +++ b/kde-plasma/libkworkspace/libkworkspace-5.26.49..ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_TEST="true" +KDE_ORG_NAME="plasma-workspace" +KFMIN=5.98.0 +PVCUT=$(ver_cut 1-3) +QTMIN=5.15.5 +inherit ecm plasma.kde.org + +DESCRIPTION="Workspace library to interact with the Plasma session manager" + +LICENSE="GPL-2" # TODO: CHECK +SLOT="5" +KEYWORDS="" +IUSE="" + +RDEPEND=" + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtx11extras-${QTMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5 + >=kde-plasma/kscreenlocker-${PVCUT}:5 + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXau +" +DEPEND="${RDEPEND} + >=kde-plasma/kwin-${PVCUT}:5 +" + +S="${S}/${PN}" + +src_prepare() { + # delete colliding libkworkspace translations, let ecm_src_prepare do its magic + if [[ ${KDE_BUILD_TYPE} = release ]]; then + find ../po -type f -name "*po" -and -not -name "libkworkspace*" -delete || die + rm -rf po/*/docs || die + cp -a ../po ./ || die + fi + + eapply "${FILESDIR}/${PN}-5.22.80-standalone.patch" + sed -e "/set/s/GENTOO_PV/$(ver_cut 1-3)/" -i CMakeLists.txt || die + cat >> CMakeLists.txt <<- _EOF_ || die + ki18n_install(po) + _EOF_ + + ecm_src_prepare +}
[gentoo-commits] proj/kde:master commit in: kde-plasma/libkworkspace/
commit: 2be0c539789833bf07db00811f5d802e97f484ef Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Sep 6 18:22:40 2022 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Sep 6 19:01:06 2022 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=2be0c539 kde-plasma/libkworkspace: drop 5.25.49. Signed-off-by: Andreas Sturmlechner gentoo.org> .../libkworkspace-5.25.49..ebuild | 55 -- 1 file changed, 55 deletions(-) diff --git a/kde-plasma/libkworkspace/libkworkspace-5.25.49..ebuild b/kde-plasma/libkworkspace/libkworkspace-5.25.49..ebuild deleted file mode 100644 index 9773a43fc5..00 --- a/kde-plasma/libkworkspace/libkworkspace-5.25.49..ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_TEST="true" -KDE_ORG_NAME="plasma-workspace" -KFMIN=5.95.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.5 -inherit ecm plasma.kde.org - -DESCRIPTION="Workspace library to interact with the Plasma session manager" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="5" -KEYWORDS="" -IUSE="" - -RDEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtx11extras-${QTMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-plasma/kscreenlocker-${PVCUT}:5 - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXau -" -DEPEND="${RDEPEND} - >=kde-frameworks/kinit-${KFMIN}:5 - >=kde-plasma/kwin-${PVCUT}:5 -" - -S="${S}/${PN}" - -src_prepare() { - # delete colliding libkworkspace translations, let ecm_src_prepare do its magic - if [[ ${KDE_BUILD_TYPE} = release ]]; then - find ../po -type f -name "*po" -and -not -name "libkworkspace*" -delete || die - rm -rf po/*/docs || die - cp -a ../po ./ || die - fi - - eapply "${FILESDIR}/${PN}-5.22.80-standalone.patch" - sed -e "/set/s/GENTOO_PV/$(ver_cut 1-3)/" -i CMakeLists.txt || die - cat >> CMakeLists.txt <<- _EOF_ || die - ki18n_install(po) - _EOF_ - - ecm_src_prepare -}
[gentoo-commits] proj/kde:master commit in: kde-plasma/libkworkspace/
commit: 88278c1fe1271aeefaeea35cdde0a4d51c697aba Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Sep 3 12:14:12 2022 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Sep 3 12:33:16 2022 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=88278c1f kde-plasma/libkworkspace: Drop unused kde-frameworks/kinit DEPEND Upstream commit 502430d769062565f6a09de05f98e1b829a99b90 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-plasma/libkworkspace/libkworkspace-.ebuild | 1 - 1 file changed, 1 deletion(-) diff --git a/kde-plasma/libkworkspace/libkworkspace-.ebuild b/kde-plasma/libkworkspace/libkworkspace-.ebuild index 4f276dbb04..12eb281d41 100644 --- a/kde-plasma/libkworkspace/libkworkspace-.ebuild +++ b/kde-plasma/libkworkspace/libkworkspace-.ebuild @@ -31,7 +31,6 @@ RDEPEND=" x11-libs/libXau " DEPEND="${RDEPEND} - >=kde-frameworks/kinit-${KFMIN}:5 >=kde-plasma/kwin-${PVCUT}:5 "
[gentoo-commits] proj/kde:master commit in: kde-plasma/libkworkspace/
commit: c51885d40d9850d77a8470c18f27cc99c0d8640f Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Jul 13 08:52:27 2022 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Jul 13 08:52:27 2022 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=c51885d4 kde-plasma/libkworkspace: drop 5.25.3* Signed-off-by: Andreas Sturmlechner gentoo.org> .../libkworkspace/libkworkspace-5.25.3.ebuild | 55 -- 1 file changed, 55 deletions(-) diff --git a/kde-plasma/libkworkspace/libkworkspace-5.25.3.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.25.3.ebuild deleted file mode 100644 index f2a0b02ac9..00 --- a/kde-plasma/libkworkspace/libkworkspace-5.25.3.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_TEST="true" -KDE_ORG_NAME="plasma-workspace" -KFMIN=5.95.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.5 -inherit ecm plasma.kde.org - -DESCRIPTION="Workspace library to interact with the Plasma session manager" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="" - -RDEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtx11extras-${QTMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-plasma/kscreenlocker-${PVCUT}:5 - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXau -" -DEPEND="${RDEPEND} - >=kde-frameworks/kinit-${KFMIN}:5 - >=kde-plasma/kwin-${PVCUT}:5 -" - -S="${S}/${PN}" - -src_prepare() { - # delete colliding libkworkspace translations, let ecm_src_prepare do its magic - if [[ ${KDE_BUILD_TYPE} = release ]]; then - find ../po -type f -name "*po" -and -not -name "libkworkspace*" -delete || die - rm -rf po/*/docs || die - cp -a ../po ./ || die - fi - - eapply "${FILESDIR}/${PN}-5.22.80-standalone.patch" - sed -e "/set/s/GENTOO_PV/$(ver_cut 1-3)/" -i CMakeLists.txt || die - cat >> CMakeLists.txt <<- _EOF_ || die - ki18n_install(po) - _EOF_ - - ecm_src_prepare -}
[gentoo-commits] proj/kde:master commit in: kde-plasma/libkworkspace/
commit: 11f2cd52e7555efa20c3d51c132aa26d3f3a6344 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Jul 12 11:24:32 2022 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Jul 12 11:24:32 2022 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=11f2cd52 kde-plasma/libkworkspace: 5.25.3 version bump Signed-off-by: Andreas Sturmlechner gentoo.org> .../libkworkspace/libkworkspace-5.25.3.ebuild | 55 ++ 1 file changed, 55 insertions(+) diff --git a/kde-plasma/libkworkspace/libkworkspace-5.25.3.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.25.3.ebuild new file mode 100644 index 00..f2a0b02ac9 --- /dev/null +++ b/kde-plasma/libkworkspace/libkworkspace-5.25.3.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_TEST="true" +KDE_ORG_NAME="plasma-workspace" +KFMIN=5.95.0 +PVCUT=$(ver_cut 1-3) +QTMIN=5.15.5 +inherit ecm plasma.kde.org + +DESCRIPTION="Workspace library to interact with the Plasma session manager" + +LICENSE="GPL-2" # TODO: CHECK +SLOT="5" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +IUSE="" + +RDEPEND=" + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtx11extras-${QTMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5 + >=kde-plasma/kscreenlocker-${PVCUT}:5 + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXau +" +DEPEND="${RDEPEND} + >=kde-frameworks/kinit-${KFMIN}:5 + >=kde-plasma/kwin-${PVCUT}:5 +" + +S="${S}/${PN}" + +src_prepare() { + # delete colliding libkworkspace translations, let ecm_src_prepare do its magic + if [[ ${KDE_BUILD_TYPE} = release ]]; then + find ../po -type f -name "*po" -and -not -name "libkworkspace*" -delete || die + rm -rf po/*/docs || die + cp -a ../po ./ || die + fi + + eapply "${FILESDIR}/${PN}-5.22.80-standalone.patch" + sed -e "/set/s/GENTOO_PV/$(ver_cut 1-3)/" -i CMakeLists.txt || die + cat >> CMakeLists.txt <<- _EOF_ || die + ki18n_install(po) + _EOF_ + + ecm_src_prepare +}
[gentoo-commits] proj/kde:master commit in: kde-plasma/libkworkspace/
commit: 32cc0ee2c3d48ee949fe44507f5e679be324e2ee Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Jun 14 12:46:41 2022 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Jun 14 12:46:41 2022 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=32cc0ee2 kde-plasma/libkworkspace: drop 5.25.0* Signed-off-by: Andreas Sturmlechner gentoo.org> .../libkworkspace/libkworkspace-5.25.0.ebuild | 55 -- 1 file changed, 55 deletions(-) diff --git a/kde-plasma/libkworkspace/libkworkspace-5.25.0.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.25.0.ebuild deleted file mode 100644 index 8b0a9703ed..00 --- a/kde-plasma/libkworkspace/libkworkspace-5.25.0.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_TEST="true" -KDE_ORG_NAME="plasma-workspace" -KFMIN=5.94.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.3 -inherit ecm kde.org - -DESCRIPTION="Workspace library to interact with the Plasma session manager" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" -IUSE="" - -RDEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtx11extras-${QTMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-plasma/kscreenlocker-${PVCUT}:5 - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXau -" -DEPEND="${RDEPEND} - >=kde-frameworks/kinit-${KFMIN}:5 - >=kde-plasma/kwin-${PVCUT}:5 -" - -S="${S}/${PN}" - -src_prepare() { - # delete colliding libkworkspace translations, let ecm_src_prepare do its magic - if [[ ${KDE_BUILD_TYPE} = release ]]; then - find ../po -type f -name "*po" -and -not -name "libkworkspace*" -delete || die - rm -rf po/*/docs || die - cp -a ../po ./ || die - fi - - eapply "${FILESDIR}/${PN}-5.22.80-standalone.patch" - sed -e "/set/s/GENTOO_PV/$(ver_cut 1-3)/" -i CMakeLists.txt || die - cat >> CMakeLists.txt <<- _EOF_ || die - ki18n_install(po) - _EOF_ - - ecm_src_prepare -}
[gentoo-commits] proj/kde:master commit in: kde-plasma/libkworkspace/files/
commit: aa6e6425a5f809fb51df9edc01b1dcff52585dae Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Jun 14 08:32:29 2022 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Jun 14 08:32:29 2022 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=aa6e6425 kde-plasma/libkworkspace: Drop obsolete patch Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> ...bkworkspace-5.23.3-synchronous-dbus-calls.patch | 48 -- 1 file changed, 48 deletions(-) diff --git a/kde-plasma/libkworkspace/files/libkworkspace-5.23.3-synchronous-dbus-calls.patch b/kde-plasma/libkworkspace/files/libkworkspace-5.23.3-synchronous-dbus-calls.patch deleted file mode 100644 index 411bebf704..00 --- a/kde-plasma/libkworkspace/files/libkworkspace-5.23.3-synchronous-dbus-calls.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 9ecd45f28dc5c3a4b1716d09e0ba121ec5fb2a50 Mon Sep 17 00:00:00 2001 -From: Joe Breuer -Date: Mon, 1 Nov 2021 07:19:51 + -Subject: [PATCH] Fix sleep/suspend sometimes not working ... from - ksmserver-logout-greeter, by making the DBus calls synchronous. - - libkworkspace/sessionmanagementbackend.cpp | 9 + - 1 file changed, 5 insertions(+), 4 deletions(-) - -diff --git a/sessionmanagementbackend.cpp b/sessionmanagementbackend.cpp -index 83cd39395..a77a8a475 100644 a/sessionmanagementbackend.cpp -+++ b/sessionmanagementbackend.cpp -@@ -137,7 +137,6 @@ void LogindSessionBackend::shutdown() - { - // logind will confirm credentials with the caller, if the app quits after sending this - // this may fail --// its not really needed for suspend tasks where the calling app won't be closing - m_login1->PowerOff(true).waitForFinished(); - } - -@@ -148,17 +147,19 @@ void LogindSessionBackend::reboot() - - void LogindSessionBackend::suspend() - { --m_login1->Suspend(true); -+// these need to be synchronous as well - ksmserver-logout-greeter specifically calls these -+// and will quit immediately after -+m_login1->Suspend(true).waitForFinished(); - } - - void LogindSessionBackend::hybridSuspend() - { --m_login1->HybridSleep(true); -+m_login1->HybridSleep(true).waitForFinished(); - } - - void LogindSessionBackend::hibernate() - { --m_login1->Hibernate(true); -+m_login1->Hibernate(true).waitForFinished();; - } - - bool LogindSessionBackend::canShutdown() const --- -GitLab -
[gentoo-commits] proj/kde:master commit in: kde-plasma/libkworkspace/
commit: 766cc6233248e3dda686f2590fcc6d43578536f7 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Jun 8 09:18:06 2022 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Jun 8 09:18:06 2022 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=766cc623 kde-plasma/libkworkspace: 5.25.49. version bump Signed-off-by: Andreas Sturmlechner gentoo.org> .../libkworkspace-5.25.49..ebuild | 55 ++ 1 file changed, 55 insertions(+) diff --git a/kde-plasma/libkworkspace/libkworkspace-5.25.49..ebuild b/kde-plasma/libkworkspace/libkworkspace-5.25.49..ebuild new file mode 100644 index 00..32a6ec2922 --- /dev/null +++ b/kde-plasma/libkworkspace/libkworkspace-5.25.49..ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_TEST="true" +KDE_ORG_NAME="plasma-workspace" +KFMIN= +PVCUT=$(ver_cut 1-3) +QTMIN=5.15.3 +inherit ecm kde.org + +DESCRIPTION="Workspace library to interact with the Plasma session manager" + +LICENSE="GPL-2" # TODO: CHECK +SLOT="5" +KEYWORDS="" +IUSE="" + +RDEPEND=" + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtx11extras-${QTMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5 + >=kde-plasma/kscreenlocker-${PVCUT}:5 + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXau +" +DEPEND="${RDEPEND} + >=kde-frameworks/kinit-${KFMIN}:5 + >=kde-plasma/kwin-${PVCUT}:5 +" + +S="${S}/${PN}" + +src_prepare() { + # delete colliding libkworkspace translations, let ecm_src_prepare do its magic + if [[ ${KDE_BUILD_TYPE} = release ]]; then + find ../po -type f -name "*po" -and -not -name "libkworkspace*" -delete || die + rm -rf po/*/docs || die + cp -a ../po ./ || die + fi + + eapply "${FILESDIR}/${PN}-5.22.80-standalone.patch" + sed -e "/set/s/GENTOO_PV/$(ver_cut 1-3)/" -i CMakeLists.txt || die + cat >> CMakeLists.txt <<- _EOF_ || die + ki18n_install(po) + _EOF_ + + ecm_src_prepare +}
[gentoo-commits] proj/kde:master commit in: kde-plasma/libkworkspace/
commit: 318914f57baac07b9fbf62d1b616475bc25ed619 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Mar 21 18:58:16 2022 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Mar 21 19:02:31 2022 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=318914f5 kde-plasma/libkworkspace: Set QTMIN to 5.15.3 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-plasma/libkworkspace/libkworkspace-.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-plasma/libkworkspace/libkworkspace-.ebuild b/kde-plasma/libkworkspace/libkworkspace-.ebuild index 93b854ae12..32a6ec2922 100644 --- a/kde-plasma/libkworkspace/libkworkspace-.ebuild +++ b/kde-plasma/libkworkspace/libkworkspace-.ebuild @@ -7,7 +7,7 @@ ECM_TEST="true" KDE_ORG_NAME="plasma-workspace" KFMIN= PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 +QTMIN=5.15.3 inherit ecm kde.org DESCRIPTION="Workspace library to interact with the Plasma session manager"
[gentoo-commits] proj/kde:master commit in: kde-plasma/libkworkspace/files/
commit: d7c0b528bb916a1d67902d794068301c45b66246 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Feb 21 11:31:22 2022 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Feb 21 11:47:06 2022 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=d7c0b528 kde-plasma/libkworkspace: Drop obsolete patch Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> .../files/libkworkspace-5.21.90-standalone.patch | 108 - 1 file changed, 108 deletions(-) diff --git a/kde-plasma/libkworkspace/files/libkworkspace-5.21.90-standalone.patch b/kde-plasma/libkworkspace/files/libkworkspace-5.21.90-standalone.patch deleted file mode 100644 index 430b98aadc..00 --- a/kde-plasma/libkworkspace/files/libkworkspace-5.21.90-standalone.patch +++ /dev/null @@ -1,108 +0,0 @@ -From 2360505a8f6475b6988efa60c3ba746bfbe4c4d0 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Sun, 2 Feb 2020 18:29:57 +0100 -Subject: [PATCH] libkworkspace: Allow standalone build - - libkworkspace/CMakeLists.txt | 67 +++- - 1 file changed, 66 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 015c5181f..0aa635e11 100644 a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,3 +1,56 @@ -+project(libkworkspace) -+ -+if(${CMAKE_SOURCE_DIR} STREQUAL ${libkworkspace_SOURCE_DIR}) -+set(PROJECT_VERSION "GENTOO_PV") -+set(PROJECT_VERSION_MAJOR 5) -+ -+cmake_minimum_required(VERSION 3.16) -+ -+set(QT_MIN_VERSION "5.15.0") -+set(KF5_MIN_VERSION "5.82.0") -+find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core DBus) -+find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE) -+set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) -+ -+include(KDEInstallDirs) -+include(KDECMakeSettings) -+include(KDECompilerSettings NO_POLICY_SCOPE) -+include(ECMMarkNonGuiExecutable) -+include(CMakePackageConfigHelpers) -+include(WriteBasicConfigVersionFile) -+include(CheckIncludeFiles) -+include(FeatureSummary) -+include(ECMQtDeclareLoggingCategory) -+include(KDEPackageAppTemplates) -+include(ECMMarkAsTest) -+include(GenerateExportHeader) -+ -+find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Config CoreAddons I18n Init WindowSystem) -+ -+find_package(KWinDBusInterface CONFIG REQUIRED) -+find_package(KScreenLocker 5.13.80 REQUIRED) -+find_package(ScreenSaverDBusInterface CONFIG REQUIRED) -+ -+find_package(X11) -+set_package_properties(X11 PROPERTIES DESCRIPTION "X11 libraries" -+URL "http://www.x.org"; -+TYPE OPTIONAL -+PURPOSE "Required for X11 support") -+ -+if(X11_FOUND) -+find_package(Qt5X11Extras ${QT_MIN_VERSION} CONFIG REQUIRED) -+set(HAVE_X11 1) -+endif() -+ -+if(BUILD_TESTING) -+find_package(Qt5Test ${QT_MIN_VERSION} CONFIG REQUIRED) -+endif() -+ -+check_include_files(unistd.h HAVE_UNISTD_H) -+ -+configure_file(../config-workspace.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-workspace.h) -+configure_file(../config-X11.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-X11.h) -+endif() - - set(kworkspace_LIB_SRCS kdisplaymanager.cpp - kworkspace.cpp -@@ -12,9 +65,17 @@ add_definitions(-DTRANSLATION_DOMAIN=\"libkworkspace\") - qt5_add_dbus_interface(kworkspace_LIB_SRCS ${KINIT_DBUS_INTERFACES_DIR}/kf5_org.kde.KLauncher.xml klauncher_interface) - qt5_add_dbus_interface(kworkspace_LIB_SRCS ${KSCREENLOCKER_DBUS_INTERFACES_DIR}/kf5_org.freedesktop.ScreenSaver.xml screenlocker_interface ) - qt5_add_dbus_interface(kworkspace_LIB_SRCS ${KSCREENLOCKER_DBUS_INTERFACES_DIR}/org.kde.screensaver.xml kscreenlocker_interface ) -+if(${CMAKE_SOURCE_DIR} STREQUAL ${libkworkspace_SOURCE_DIR}) -+qt5_add_dbus_interface(kworkspace_LIB_SRCS ../ksmserver/org.kde.LogoutPrompt.xml logoutprompt_interface) -+qt5_add_dbus_interface(kworkspace_LIB_SRCS ../startkde/plasma-session/org.kde.Startup.xml startup_interface) -+qt5_add_dbus_interface(kworkspace_LIB_SRCS ../startkde/plasma-shutdown/org.kde.Shutdown.xml shutdown_interface) -+set(ksmserver_xml ../ksmserver/org.kde.KSMServerInterface.xml) -+else() - qt5_add_dbus_interface(kworkspace_LIB_SRCS ${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.LogoutPrompt.xml logoutprompt_interface) - qt5_add_dbus_interface(kworkspace_LIB_SRCS ${plasma-workspace_SOURCE_DIR}/startkde/plasma-session/org.kde.Startup.xml startup_interface) - qt5_add_dbus_interface(kworkspace_LIB_SRCS ${plasma-workspace_SOURCE_DIR}/startkde/plasma-shutdown/org.kde.Shutdown.xml shutdown_interface) -+set(ksmserver_xml ${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.KSMServerInterface.xml) -+endif() - - set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/org.freedesktop.login1.Manager.xml" - "${CMAKE_SOU
[gentoo-commits] proj/kde:master commit in: kde-plasma/libkworkspace/
commit: 4759b2c34b8c1491fa6dd7ca23919132ec0a55e9 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Feb 8 12:59:52 2022 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Feb 8 12:59:52 2022 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=4759b2c3 kde-plasma/libkworkspace: drop 5.24.0* Signed-off-by: Andreas Sturmlechner gentoo.org> .../libkworkspace/libkworkspace-5.24.0.ebuild | 55 -- 1 file changed, 55 deletions(-) diff --git a/kde-plasma/libkworkspace/libkworkspace-5.24.0.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.24.0.ebuild deleted file mode 100644 index 7b3149edc1..00 --- a/kde-plasma/libkworkspace/libkworkspace-5.24.0.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_TEST="true" -KDE_ORG_NAME="plasma-workspace" -KFMIN=5.90.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -inherit ecm kde.org - -DESCRIPTION="Workspace library to interact with the Plasma session manager" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" -IUSE="" - -RDEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtx11extras-${QTMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-plasma/kscreenlocker-${PVCUT}:5 - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXau -" -DEPEND="${RDEPEND} - >=kde-frameworks/kinit-${KFMIN}:5 - >=kde-plasma/kwin-${PVCUT}:5 -" - -S="${S}/${PN}" - -src_prepare() { - # delete colliding libkworkspace translations, let ecm_src_prepare do its magic - if [[ ${KDE_BUILD_TYPE} = release ]]; then - find ../po -type f -name "*po" -and -not -name "libkworkspace*" -delete || die - rm -rf po/*/docs || die - cp -a ../po ./ || die - fi - - eapply "${FILESDIR}/${PN}-5.22.80-standalone.patch" - sed -e "/set/s/GENTOO_PV/$(ver_cut 1-3)/" -i CMakeLists.txt || die - cat >> CMakeLists.txt <<- _EOF_ || die - ki18n_install(po) - _EOF_ - - ecm_src_prepare -}
[gentoo-commits] proj/kde:master commit in: kde-plasma/libkworkspace/
commit: 73382832c3847a747af956318b6f49cb84b2997c Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Feb 3 20:03:29 2022 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Feb 3 20:03:29 2022 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=73382832 kde-plasma/libkworkspace: 5.24.0 version bump Signed-off-by: Andreas Sturmlechner gentoo.org> .../libkworkspace/libkworkspace-5.24.0.ebuild | 55 ++ 1 file changed, 55 insertions(+) diff --git a/kde-plasma/libkworkspace/libkworkspace-5.24.0.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.24.0.ebuild new file mode 100644 index 00..7b3149edc1 --- /dev/null +++ b/kde-plasma/libkworkspace/libkworkspace-5.24.0.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_TEST="true" +KDE_ORG_NAME="plasma-workspace" +KFMIN=5.90.0 +PVCUT=$(ver_cut 1-3) +QTMIN=5.15.2 +inherit ecm kde.org + +DESCRIPTION="Workspace library to interact with the Plasma session manager" + +LICENSE="GPL-2" # TODO: CHECK +SLOT="5" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" +IUSE="" + +RDEPEND=" + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtx11extras-${QTMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5 + >=kde-plasma/kscreenlocker-${PVCUT}:5 + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXau +" +DEPEND="${RDEPEND} + >=kde-frameworks/kinit-${KFMIN}:5 + >=kde-plasma/kwin-${PVCUT}:5 +" + +S="${S}/${PN}" + +src_prepare() { + # delete colliding libkworkspace translations, let ecm_src_prepare do its magic + if [[ ${KDE_BUILD_TYPE} = release ]]; then + find ../po -type f -name "*po" -and -not -name "libkworkspace*" -delete || die + rm -rf po/*/docs || die + cp -a ../po ./ || die + fi + + eapply "${FILESDIR}/${PN}-5.22.80-standalone.patch" + sed -e "/set/s/GENTOO_PV/$(ver_cut 1-3)/" -i CMakeLists.txt || die + cat >> CMakeLists.txt <<- _EOF_ || die + ki18n_install(po) + _EOF_ + + ecm_src_prepare +}
[gentoo-commits] proj/kde:master commit in: kde-plasma/libkworkspace/
commit: 1b8e7e57b07c202223fb67f0dead21ac5878 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Jan 18 17:38:46 2022 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Jan 18 17:38:46 2022 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=1b8e7e54 kde-plasma/libkworkspace: drop 5.23.90* Signed-off-by: Andreas Sturmlechner gentoo.org> .../libkworkspace/libkworkspace-5.23.90.ebuild | 55 -- 1 file changed, 55 deletions(-) diff --git a/kde-plasma/libkworkspace/libkworkspace-5.23.90.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.23.90.ebuild deleted file mode 100644 index 7b3149edc1..00 --- a/kde-plasma/libkworkspace/libkworkspace-5.23.90.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_TEST="true" -KDE_ORG_NAME="plasma-workspace" -KFMIN=5.90.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -inherit ecm kde.org - -DESCRIPTION="Workspace library to interact with the Plasma session manager" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" -IUSE="" - -RDEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtx11extras-${QTMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-plasma/kscreenlocker-${PVCUT}:5 - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXau -" -DEPEND="${RDEPEND} - >=kde-frameworks/kinit-${KFMIN}:5 - >=kde-plasma/kwin-${PVCUT}:5 -" - -S="${S}/${PN}" - -src_prepare() { - # delete colliding libkworkspace translations, let ecm_src_prepare do its magic - if [[ ${KDE_BUILD_TYPE} = release ]]; then - find ../po -type f -name "*po" -and -not -name "libkworkspace*" -delete || die - rm -rf po/*/docs || die - cp -a ../po ./ || die - fi - - eapply "${FILESDIR}/${PN}-5.22.80-standalone.patch" - sed -e "/set/s/GENTOO_PV/$(ver_cut 1-3)/" -i CMakeLists.txt || die - cat >> CMakeLists.txt <<- _EOF_ || die - ki18n_install(po) - _EOF_ - - ecm_src_prepare -}
[gentoo-commits] proj/kde:master commit in: kde-plasma/libkworkspace/
commit: 19fedafe5dab6c2626c7775e3684a67bef9935a5 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Jan 17 17:40:43 2022 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Jan 17 17:46:39 2022 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=19fedafe kde-plasma/libkworkspace: 5.23.90 version bump Signed-off-by: Andreas Sturmlechner gentoo.org> .../libkworkspace/libkworkspace-5.23.90.ebuild | 55 ++ 1 file changed, 55 insertions(+) diff --git a/kde-plasma/libkworkspace/libkworkspace-5.23.90.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.23.90.ebuild new file mode 100644 index 00..7b3149edc1 --- /dev/null +++ b/kde-plasma/libkworkspace/libkworkspace-5.23.90.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_TEST="true" +KDE_ORG_NAME="plasma-workspace" +KFMIN=5.90.0 +PVCUT=$(ver_cut 1-3) +QTMIN=5.15.2 +inherit ecm kde.org + +DESCRIPTION="Workspace library to interact with the Plasma session manager" + +LICENSE="GPL-2" # TODO: CHECK +SLOT="5" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" +IUSE="" + +RDEPEND=" + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtx11extras-${QTMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5 + >=kde-plasma/kscreenlocker-${PVCUT}:5 + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXau +" +DEPEND="${RDEPEND} + >=kde-frameworks/kinit-${KFMIN}:5 + >=kde-plasma/kwin-${PVCUT}:5 +" + +S="${S}/${PN}" + +src_prepare() { + # delete colliding libkworkspace translations, let ecm_src_prepare do its magic + if [[ ${KDE_BUILD_TYPE} = release ]]; then + find ../po -type f -name "*po" -and -not -name "libkworkspace*" -delete || die + rm -rf po/*/docs || die + cp -a ../po ./ || die + fi + + eapply "${FILESDIR}/${PN}-5.22.80-standalone.patch" + sed -e "/set/s/GENTOO_PV/$(ver_cut 1-3)/" -i CMakeLists.txt || die + cat >> CMakeLists.txt <<- _EOF_ || die + ki18n_install(po) + _EOF_ + + ecm_src_prepare +}
[gentoo-commits] proj/kde:master commit in: kde-plasma/libkworkspace/
commit: ee1fca957a34d527137f67dedff205b5b5283b3c Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Jan 4 16:01:40 2022 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Jan 4 16:01:40 2022 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=ee1fca95 kde-plasma/libkworkspace: drop 5.23.5* Signed-off-by: Andreas Sturmlechner gentoo.org> .../libkworkspace/libkworkspace-5.23.5.ebuild | 60 -- 1 file changed, 60 deletions(-) diff --git a/kde-plasma/libkworkspace/libkworkspace-5.23.5.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.23.5.ebuild deleted file mode 100644 index b5d44b5c9a..00 --- a/kde-plasma/libkworkspace/libkworkspace-5.23.5.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_TEST="true" -KDE_ORG_NAME="plasma-workspace" -KFMIN=5.86.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -inherit ecm kde.org - -DESCRIPTION="Workspace library to interact with the Plasma session manager" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" -IUSE="" - -RDEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtx11extras-${QTMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-plasma/kscreenlocker-${PVCUT}:5 - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXau -" -DEPEND="${RDEPEND} - >=kde-frameworks/kinit-${KFMIN}:5 - >=kde-plasma/kwin-${PVCUT}:5 -" - -S="${S}/${PN}" - -PATCHES=( - # Pending: https://invent.kde.org/plasma/plasma-workspace/-/merge_requests/1164 - "${FILESDIR}"/${PN}-5.23.3-synchronous-dbus-calls.patch # bug 818124 -) - -src_prepare() { - # delete colliding libkworkspace translations, let ecm_src_prepare do its magic - if [[ ${KDE_BUILD_TYPE} = release ]]; then - find ../po -type f -name "*po" -and -not -name "libkworkspace*" -delete || die - rm -rf po/*/docs || die - cp -a ../po ./ || die - fi - - eapply "${FILESDIR}/${PN}-5.22.80-standalone.patch" - sed -e "/set/s/GENTOO_PV/$(ver_cut 1-3)/" -i CMakeLists.txt || die - cat >> CMakeLists.txt <<- _EOF_ || die - ki18n_install(po) - _EOF_ - - ecm_src_prepare -}
[gentoo-commits] proj/kde:master commit in: kde-plasma/libkworkspace/
commit: 2caf2c8a0a396761d788e0e08c378355b0d634d9 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Jan 4 11:15:57 2022 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Jan 4 11:15:57 2022 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=2caf2c8a kde-plasma/libkworkspace: drop 5.23.49.* Signed-off-by: Andreas Sturmlechner gentoo.org> .../libkworkspace-5.23.49..ebuild | 60 -- 1 file changed, 60 deletions(-) diff --git a/kde-plasma/libkworkspace/libkworkspace-5.23.49..ebuild b/kde-plasma/libkworkspace/libkworkspace-5.23.49..ebuild deleted file mode 100644 index 2122fa3b82..00 --- a/kde-plasma/libkworkspace/libkworkspace-5.23.49..ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_TEST="true" -KDE_ORG_NAME="plasma-workspace" -KFMIN=5.86.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -inherit ecm kde.org - -DESCRIPTION="Workspace library to interact with the Plasma session manager" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="5" -KEYWORDS="" -IUSE="" - -RDEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtx11extras-${QTMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-plasma/kscreenlocker-${PVCUT}:5 - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXau -" -DEPEND="${RDEPEND} - >=kde-frameworks/kinit-${KFMIN}:5 - >=kde-plasma/kwin-${PVCUT}:5 -" - -S="${S}/${PN}" - -PATCHES=( - # Pending: https://invent.kde.org/plasma/plasma-workspace/-/merge_requests/1164 - "${FILESDIR}"/${PN}-5.23.3-synchronous-dbus-calls.patch # bug 818124 -) - -src_prepare() { - # delete colliding libkworkspace translations, let ecm_src_prepare do its magic - if [[ ${KDE_BUILD_TYPE} = release ]]; then - find ../po -type f -name "*po" -and -not -name "libkworkspace*" -delete || die - rm -rf po/*/docs || die - cp -a ../po ./ || die - fi - - eapply "${FILESDIR}/${PN}-5.22.80-standalone.patch" - sed -e "/set/s/GENTOO_PV/$(ver_cut 1-3)/" -i CMakeLists.txt || die - cat >> CMakeLists.txt <<- _EOF_ || die - ki18n_install(po) - _EOF_ - - ecm_src_prepare -}
[gentoo-commits] proj/kde:master commit in: kde-plasma/libkworkspace/, kde-plasma/libkworkspace/files/
commit: 92c8a38b51613f972cbbdcf6fe3a6a96612f20c1 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Nov 9 14:35:21 2021 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Dec 10 15:09:54 2021 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=92c8a38b kde-plasma/libkworkspace: Fix sleep/suspend race condition (not fixed in 5.23 branch yet) See also: https://invent.kde.org/plasma/plasma-workspace/-/merge_requests/1164 Thanks-to: Joe Breuer jmbreuer.net> Bug: https://bugs.gentoo.org/818124 Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> ...bkworkspace-5.23.3-synchronous-dbus-calls.patch | 48 ++ .../libkworkspace-5.23.49..ebuild | 5 +++ 2 files changed, 53 insertions(+) diff --git a/kde-plasma/libkworkspace/files/libkworkspace-5.23.3-synchronous-dbus-calls.patch b/kde-plasma/libkworkspace/files/libkworkspace-5.23.3-synchronous-dbus-calls.patch new file mode 100644 index 00..411bebf704 --- /dev/null +++ b/kde-plasma/libkworkspace/files/libkworkspace-5.23.3-synchronous-dbus-calls.patch @@ -0,0 +1,48 @@ +From 9ecd45f28dc5c3a4b1716d09e0ba121ec5fb2a50 Mon Sep 17 00:00:00 2001 +From: Joe Breuer +Date: Mon, 1 Nov 2021 07:19:51 + +Subject: [PATCH] Fix sleep/suspend sometimes not working ... from + ksmserver-logout-greeter, by making the DBus calls synchronous. + +--- + libkworkspace/sessionmanagementbackend.cpp | 9 + + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/sessionmanagementbackend.cpp b/sessionmanagementbackend.cpp +index 83cd39395..a77a8a475 100644 +--- a/sessionmanagementbackend.cpp b/sessionmanagementbackend.cpp +@@ -137,7 +137,6 @@ void LogindSessionBackend::shutdown() + { + // logind will confirm credentials with the caller, if the app quits after sending this + // this may fail +-// its not really needed for suspend tasks where the calling app won't be closing + m_login1->PowerOff(true).waitForFinished(); + } + +@@ -148,17 +147,19 @@ void LogindSessionBackend::reboot() + + void LogindSessionBackend::suspend() + { +-m_login1->Suspend(true); ++// these need to be synchronous as well - ksmserver-logout-greeter specifically calls these ++// and will quit immediately after ++m_login1->Suspend(true).waitForFinished(); + } + + void LogindSessionBackend::hybridSuspend() + { +-m_login1->HybridSleep(true); ++m_login1->HybridSleep(true).waitForFinished(); + } + + void LogindSessionBackend::hibernate() + { +-m_login1->Hibernate(true); ++m_login1->Hibernate(true).waitForFinished();; + } + + bool LogindSessionBackend::canShutdown() const +-- +GitLab + diff --git a/kde-plasma/libkworkspace/libkworkspace-5.23.49..ebuild b/kde-plasma/libkworkspace/libkworkspace-5.23.49..ebuild index 252d6c896f..2122fa3b82 100644 --- a/kde-plasma/libkworkspace/libkworkspace-5.23.49..ebuild +++ b/kde-plasma/libkworkspace/libkworkspace-5.23.49..ebuild @@ -37,6 +37,11 @@ DEPEND="${RDEPEND} S="${S}/${PN}" +PATCHES=( + # Pending: https://invent.kde.org/plasma/plasma-workspace/-/merge_requests/1164 + "${FILESDIR}"/${PN}-5.23.3-synchronous-dbus-calls.patch # bug 818124 +) + src_prepare() { # delete colliding libkworkspace translations, let ecm_src_prepare do its magic if [[ ${KDE_BUILD_TYPE} = release ]]; then
[gentoo-commits] proj/kde:master commit in: kde-plasma/libkworkspace/
commit: 22cc7c142fa71274d65de14ec98f3c2172276ab1 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Oct 14 10:08:13 2021 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Oct 14 10:08:13 2021 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=22cc7c14 kde-plasma/libkworkspace: drop 5.23.0* Signed-off-by: Andreas Sturmlechner gentoo.org> .../libkworkspace/libkworkspace-5.23.0.ebuild | 55 -- 1 file changed, 55 deletions(-) diff --git a/kde-plasma/libkworkspace/libkworkspace-5.23.0.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.23.0.ebuild deleted file mode 100644 index aacfb311c9..00 --- a/kde-plasma/libkworkspace/libkworkspace-5.23.0.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_TEST="true" -KDE_ORG_NAME="plasma-workspace" -KFMIN=5.86.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -inherit ecm kde.org - -DESCRIPTION="Workspace library to interact with the Plasma session manager" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" -IUSE="" - -RDEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtx11extras-${QTMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-plasma/kscreenlocker-${PVCUT}:5 - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXau -" -DEPEND="${RDEPEND} - >=kde-frameworks/kinit-${KFMIN}:5 - >=kde-plasma/kwin-${PVCUT}:5 -" - -S="${S}/${PN}" - -src_prepare() { - # delete colliding libkworkspace translations, let ecm_src_prepare do its magic - if [[ ${KDE_BUILD_TYPE} = release ]]; then - find ../po -type f -name "*po" -and -not -name "libkworkspace*" -delete || die - rm -rf po/*/docs || die - cp -a ../po ./ || die - fi - - eapply "${FILESDIR}/${PN}-5.22.80-standalone.patch" - sed -e "/set/s/GENTOO_PV/$(ver_cut 1-3)/" -i CMakeLists.txt || die - cat >> CMakeLists.txt <<- _EOF_ || die - ki18n_install(po) - _EOF_ - - ecm_src_prepare -}
[gentoo-commits] proj/kde:master commit in: kde-plasma/libkworkspace/
commit: 6431be4a82d2124ac29ca749f906070d063122d4 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Oct 4 12:52:21 2021 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Oct 4 12:52:21 2021 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=6431be4a kde-plasma/libkworkspace: drop 5.22.90* Signed-off-by: Andreas Sturmlechner gentoo.org> .../libkworkspace/libkworkspace-5.22.90.ebuild | 55 -- 1 file changed, 55 deletions(-) diff --git a/kde-plasma/libkworkspace/libkworkspace-5.22.90.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.22.90.ebuild deleted file mode 100644 index aacfb311c9..00 --- a/kde-plasma/libkworkspace/libkworkspace-5.22.90.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_TEST="true" -KDE_ORG_NAME="plasma-workspace" -KFMIN=5.86.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -inherit ecm kde.org - -DESCRIPTION="Workspace library to interact with the Plasma session manager" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" -IUSE="" - -RDEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtx11extras-${QTMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-plasma/kscreenlocker-${PVCUT}:5 - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXau -" -DEPEND="${RDEPEND} - >=kde-frameworks/kinit-${KFMIN}:5 - >=kde-plasma/kwin-${PVCUT}:5 -" - -S="${S}/${PN}" - -src_prepare() { - # delete colliding libkworkspace translations, let ecm_src_prepare do its magic - if [[ ${KDE_BUILD_TYPE} = release ]]; then - find ../po -type f -name "*po" -and -not -name "libkworkspace*" -delete || die - rm -rf po/*/docs || die - cp -a ../po ./ || die - fi - - eapply "${FILESDIR}/${PN}-5.22.80-standalone.patch" - sed -e "/set/s/GENTOO_PV/$(ver_cut 1-3)/" -i CMakeLists.txt || die - cat >> CMakeLists.txt <<- _EOF_ || die - ki18n_install(po) - _EOF_ - - ecm_src_prepare -}
[gentoo-commits] proj/kde:master commit in: kde-plasma/libkworkspace/
commit: f654908df6b10f8d77bc5135be5b12aac3be7d7d Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Sep 21 18:05:48 2021 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Sep 21 18:25:59 2021 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=f654908d kde-plasma/libkworkspace: 5.22.90 version bump Signed-off-by: Andreas Sturmlechner gentoo.org> .../libkworkspace/libkworkspace-5.22.90.ebuild | 55 ++ 1 file changed, 55 insertions(+) diff --git a/kde-plasma/libkworkspace/libkworkspace-5.22.90.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.22.90.ebuild new file mode 100644 index 00..aacfb311c9 --- /dev/null +++ b/kde-plasma/libkworkspace/libkworkspace-5.22.90.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_TEST="true" +KDE_ORG_NAME="plasma-workspace" +KFMIN=5.86.0 +PVCUT=$(ver_cut 1-3) +QTMIN=5.15.2 +inherit ecm kde.org + +DESCRIPTION="Workspace library to interact with the Plasma session manager" + +LICENSE="GPL-2" # TODO: CHECK +SLOT="5" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" +IUSE="" + +RDEPEND=" + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtx11extras-${QTMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5 + >=kde-plasma/kscreenlocker-${PVCUT}:5 + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXau +" +DEPEND="${RDEPEND} + >=kde-frameworks/kinit-${KFMIN}:5 + >=kde-plasma/kwin-${PVCUT}:5 +" + +S="${S}/${PN}" + +src_prepare() { + # delete colliding libkworkspace translations, let ecm_src_prepare do its magic + if [[ ${KDE_BUILD_TYPE} = release ]]; then + find ../po -type f -name "*po" -and -not -name "libkworkspace*" -delete || die + rm -rf po/*/docs || die + cp -a ../po ./ || die + fi + + eapply "${FILESDIR}/${PN}-5.22.80-standalone.patch" + sed -e "/set/s/GENTOO_PV/$(ver_cut 1-3)/" -i CMakeLists.txt || die + cat >> CMakeLists.txt <<- _EOF_ || die + ki18n_install(po) + _EOF_ + + ecm_src_prepare +}
[gentoo-commits] proj/kde:master commit in: kde-plasma/libkworkspace/
commit: fb417c8ea1e88d50f49bf0bb498409baa801e2e9 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Sep 2 17:06:57 2021 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Sep 2 17:15:00 2021 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=fb417c8e kde-plasma/libkworkspace: drop 5.22.5* Signed-off-by: Andreas Sturmlechner gentoo.org> .../libkworkspace/libkworkspace-5.22.5.ebuild | 55 -- 1 file changed, 55 deletions(-) diff --git a/kde-plasma/libkworkspace/libkworkspace-5.22.5.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.22.5.ebuild deleted file mode 100644 index 9d21d07183..00 --- a/kde-plasma/libkworkspace/libkworkspace-5.22.5.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_TEST="true" -KDE_ORG_NAME="plasma-workspace" -KFMIN=5.82.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -inherit ecm kde.org - -DESCRIPTION="Workspace library to interact with the Plasma session manager" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" -IUSE="" - -RDEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtx11extras-${QTMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-plasma/kscreenlocker-${PVCUT}:5 - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXau -" -DEPEND="${RDEPEND} - >=kde-frameworks/kinit-${KFMIN}:5 - >=kde-plasma/kwin-${PVCUT}:5 -" - -S="${S}/${PN}" - -src_prepare() { - # delete colliding libkworkspace translations, let ecm_src_prepare do its magic - if [[ ${KDE_BUILD_TYPE} = release ]]; then - find ../po -type f -name "*po" -and -not -name "libkworkspace*" -delete || die - rm -rf po/*/docs || die - cp -a ../po ./ || die - fi - - eapply "${FILESDIR}/${PN}-5.21.90-standalone.patch" - sed -e "/set/s/GENTOO_PV/$(ver_cut 1-3)/" -i CMakeLists.txt || die - cat >> CMakeLists.txt <<- _EOF_ || die - ki18n_install(po) - _EOF_ - - ecm_src_prepare -}
[gentoo-commits] proj/kde:master commit in: kde-plasma/libkworkspace/
commit: 227ac36c2c5ad26927a110bc4085ab578e511900 Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Jun 11 05:39:35 2021 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Jun 11 05:40:29 2021 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=227ac36c kde-plasma/libkworkspace: drop 5.21.90* Signed-off-by: Andreas Sturmlechner gentoo.org> .../libkworkspace/libkworkspace-5.21.90.ebuild | 55 -- 1 file changed, 55 deletions(-) diff --git a/kde-plasma/libkworkspace/libkworkspace-5.21.90.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.21.90.ebuild deleted file mode 100644 index 683900192d..00 --- a/kde-plasma/libkworkspace/libkworkspace-5.21.90.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ECM_TEST="true" -KDE_ORG_NAME="plasma-workspace" -KFMIN=5.82.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -inherit ecm kde.org - -DESCRIPTION="Workspace library to interact with the Plasma session manager" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" -IUSE="" - -RDEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtx11extras-${QTMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-plasma/kscreenlocker-${PVCUT}:5 - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXau -" -DEPEND="${RDEPEND} - >=kde-frameworks/kinit-${KFMIN}:5 - >=kde-plasma/kwin-${PVCUT}:5 -" - -S="${S}/${PN}" - -src_prepare() { - # delete colliding libkworkspace translations, let ecm_src_prepare do its magic - if [[ ${KDE_BUILD_TYPE} = release ]]; then - find ../po -type f -name "*po" -and -not -name "libkworkspace*" -delete || die - rm -rf po/*/docs || die - cp -a ../po ./ || die - fi - - eapply "${FILESDIR}/${PN}-5.21.90-standalone.patch" - sed -e "/set/s/GENTOO_PV/$(ver_cut 1-3)/" -i CMakeLists.txt || die - cat >> CMakeLists.txt <<- _EOF_ || die - ki18n_install(po) - _EOF_ - - ecm_src_prepare -}
[gentoo-commits] proj/kde:master commit in: kde-plasma/libkworkspace/, kde-plasma/libkworkspace/files/
commit: 8c3a34b8a167c3ec6713ac3731115a4cbda7926a Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Jun 3 10:55:17 2021 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Jun 3 10:55:17 2021 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=8c3a34b8 kde-plasma/libkworkspace: Rebase standalone.patch on top of HEAD Closes: https://bugs.gentoo.org/793194 Package-Manager: Portage-3.0.19, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> .../files/libkworkspace-5.22.80-standalone.patch | 108 + kde-plasma/libkworkspace/libkworkspace-.ebuild | 2 +- 2 files changed, 109 insertions(+), 1 deletion(-) diff --git a/kde-plasma/libkworkspace/files/libkworkspace-5.22.80-standalone.patch b/kde-plasma/libkworkspace/files/libkworkspace-5.22.80-standalone.patch new file mode 100644 index 00..971dc941d0 --- /dev/null +++ b/kde-plasma/libkworkspace/files/libkworkspace-5.22.80-standalone.patch @@ -0,0 +1,108 @@ +From 2360505a8f6475b6988efa60c3ba746bfbe4c4d0 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Sun, 2 Feb 2020 18:29:57 +0100 +Subject: [PATCH] libkworkspace: Allow standalone build + +--- + libkworkspace/CMakeLists.txt | 67 +++- + 1 file changed, 66 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 015c5181f..0aa635e11 100644 +--- a/CMakeLists.txt b/CMakeLists.txt +@@ -1,3 +1,56 @@ ++project(libkworkspace) ++ ++if(${CMAKE_SOURCE_DIR} STREQUAL ${libkworkspace_SOURCE_DIR}) ++set(PROJECT_VERSION "GENTOO_PV") ++set(PROJECT_VERSION_MAJOR 5) ++ ++cmake_minimum_required(VERSION 3.16) ++ ++set(QT_MIN_VERSION "5.15.0") ++set(KF5_MIN_VERSION "5.82.0") ++find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core DBus) ++find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE) ++set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) ++ ++include(KDEInstallDirs) ++include(KDECMakeSettings) ++include(KDECompilerSettings NO_POLICY_SCOPE) ++include(ECMMarkNonGuiExecutable) ++include(CMakePackageConfigHelpers) ++include(WriteBasicConfigVersionFile) ++include(CheckIncludeFiles) ++include(FeatureSummary) ++include(ECMQtDeclareLoggingCategory) ++include(KDEPackageAppTemplates) ++include(ECMMarkAsTest) ++include(GenerateExportHeader) ++ ++find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Config CoreAddons I18n Init WindowSystem) ++ ++find_package(KWinDBusInterface CONFIG REQUIRED) ++find_package(KScreenLocker 5.13.80 REQUIRED) ++find_package(ScreenSaverDBusInterface CONFIG REQUIRED) ++ ++find_package(X11) ++set_package_properties(X11 PROPERTIES DESCRIPTION "X11 libraries" ++URL "http://www.x.org"; ++TYPE OPTIONAL ++PURPOSE "Required for X11 support") ++ ++if(X11_FOUND) ++find_package(Qt5X11Extras ${QT_MIN_VERSION} CONFIG REQUIRED) ++set(HAVE_X11 1) ++endif() ++ ++if(BUILD_TESTING) ++find_package(Qt5Test ${QT_MIN_VERSION} CONFIG REQUIRED) ++endif() ++ ++check_include_files(unistd.h HAVE_UNISTD_H) ++ ++configure_file(../config-workspace.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-workspace.h) ++configure_file(../config-X11.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-X11.h) ++endif() + + 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 ${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}) ++qt_add_dbus_interface(kworkspace_LIB_SRCS ../ksmserver/org.kde.LogoutPrompt.xml logoutprompt_interface) ++qt_add_dbus_interface(kworkspace_LIB_SRCS ../startkde/plasma-session/org.kde.Startup.xml startup_interface) ++qt_add_dbus_interface(kworkspace_LIB_SRCS ../startkde/plasma-shutdown/org.kde.Shutdown.xml shutdown_interface) ++set(ksmserver_xml ../ksmserver/org.kde.KSMServerInterface.xml) ++else() + qt_add_dbus_interface(kworkspace_LIB_SRCS ${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.LogoutPrompt.xml logoutprompt_interface) + qt_add_dbus_interface(kworkspace_LIB_SRCS ${plasma-workspace_SOURCE_DIR}/startkde/plasma-session/org.kde.Startup.xml startup_interface) + qt_add_dbus_interface(kworkspace_LIB_SRCS ${plasma-workspace_SOURCE_DIR}/startkde/plasma-shutdown/org.kde.Shutdown.xml shutdown_interface) ++set(ksmserver_xml ${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.KSMServerInterface.xml) ++endif() + + set_source_fi
[gentoo-commits] proj/kde:master commit in: kde-plasma/libkworkspace/files/, kde-plasma/libkworkspace/
commit: 60afee16cb4f582903ad90e43c5a956588fbc9c6 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat May 29 20:06:12 2021 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat May 29 20:06:12 2021 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=60afee16 kde-plasma/libkworkspace: Rebase standalone.patch, update DEPENDs - Add KF5Config - Drop KF5Plasma - Move KF5Init to DEPEND-only Package-Manager: Portage-3.0.19, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> ...patch => libkworkspace-5.21.90-standalone.patch} | 20 ++-- .../libkworkspace/libkworkspace-5.21.90.ebuild | 21 + .../libkworkspace/libkworkspace-5.22.49..ebuild | 21 + kde-plasma/libkworkspace/libkworkspace-.ebuild | 21 + 4 files changed, 37 insertions(+), 46 deletions(-) diff --git a/kde-plasma/libkworkspace/files/libkworkspace-5.19.80-standalone.patch b/kde-plasma/libkworkspace/files/libkworkspace-5.21.90-standalone.patch similarity index 90% rename from kde-plasma/libkworkspace/files/libkworkspace-5.19.80-standalone.patch rename to kde-plasma/libkworkspace/files/libkworkspace-5.21.90-standalone.patch index 8c8213d002..430b98aadc 100644 --- a/kde-plasma/libkworkspace/files/libkworkspace-5.19.80-standalone.patch +++ b/kde-plasma/libkworkspace/files/libkworkspace-5.21.90-standalone.patch @@ -1,4 +1,4 @@ -From 30d75ef4b3e75155e78924aa82aa9f368bb86f4f Mon Sep 17 00:00:00 2001 +From 2360505a8f6475b6988efa60c3ba746bfbe4c4d0 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Sun, 2 Feb 2020 18:29:57 +0100 Subject: [PATCH] libkworkspace: Allow standalone build @@ -8,7 +8,7 @@ Subject: [PATCH] libkworkspace: Allow standalone build 1 file changed, 66 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7ba097a6e..66f70c0b6 100644 +index 015c5181f..0aa635e11 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,3 +1,56 @@ @@ -18,10 +18,10 @@ index 7ba097a6e..66f70c0b6 100644 +set(PROJECT_VERSION "GENTOO_PV") +set(PROJECT_VERSION_MAJOR 5) + -+cmake_minimum_required(VERSION 3.0) ++cmake_minimum_required(VERSION 3.16) + -+set(QT_MIN_VERSION "5.14.0") -+set(KF5_MIN_VERSION "5.71.0") ++set(QT_MIN_VERSION "5.15.0") ++set(KF5_MIN_VERSION "5.82.0") +find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core DBus) +find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE) +set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) @@ -39,7 +39,7 @@ index 7ba097a6e..66f70c0b6 100644 +include(ECMMarkAsTest) +include(GenerateExportHeader) + -+find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS CoreAddons I18n Init Plasma WindowSystem) ++find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Config CoreAddons I18n Init WindowSystem) + +find_package(KWinDBusInterface CONFIG REQUIRED) +find_package(KScreenLocker 5.13.80 REQUIRED) @@ -68,7 +68,7 @@ index 7ba097a6e..66f70c0b6 100644 set(kworkspace_LIB_SRCS kdisplaymanager.cpp kworkspace.cpp -@@ -16,9 +69,17 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) +@@ -12,9 +65,17 @@ add_definitions(-DTRANSLATION_DOMAIN=\"libkworkspace\") qt5_add_dbus_interface(kworkspace_LIB_SRCS ${KINIT_DBUS_INTERFACES_DIR}/kf5_org.kde.KLauncher.xml klauncher_interface) qt5_add_dbus_interface(kworkspace_LIB_SRCS ${KSCREENLOCKER_DBUS_INTERFACES_DIR}/kf5_org.freedesktop.ScreenSaver.xml screenlocker_interface ) qt5_add_dbus_interface(kworkspace_LIB_SRCS ${KSCREENLOCKER_DBUS_INTERFACES_DIR}/org.kde.screensaver.xml kscreenlocker_interface ) @@ -86,7 +86,7 @@ index 7ba097a6e..66f70c0b6 100644 set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/org.freedesktop.login1.Manager.xml" "${CMAKE_SOURCE_DIR}/data/interfaces/org.freedesktop.login1.Seat.xml" -@@ -34,7 +95,6 @@ list(APPEND kworkspace_LIB_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/login1_manager_inte +@@ -30,7 +91,6 @@ list(APPEND kworkspace_LIB_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/login1_manager_inte qt5_add_dbus_interface(kworkspace_LIB_SRCS "org.freedesktop.UPower.xml" upower_interface) qt5_add_dbus_interface(kworkspace_LIB_SRCS "org.freedesktop.ConsoleKit.Manager.xml" consolekit_manager_interface) @@ -94,7 +94,7 @@ index 7ba097a6e..66f70c0b6 100644 qt5_add_dbus_interface( kworkspace_LIB_SRCS ${ksmserver_xml} ksmserver_interface ) add_library(kworkspace ${kworkspace_LIB_SRCS}) -@@ -100,3 +160,8 @@ if(BUILD_TESTING) +@@ -98,3 +158,8 @@ if(BUILD_TESTING) add_subdirectory(autotests) add_subdirectory(tests) endif() @@ -104,5 +104,5 @@ index 7ba097a6e..66f70c0b6 100644 +feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) +endif() -- -2.27.0 +2.31.1 diff --git a/kde-plasma/libkworkspace/libkworkspace-5.21.90.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.21.90.ebu
[gentoo-commits] proj/kde:master commit in: kde-plasma/libkworkspace/
commit: e5016526c9fac18cf5278541a427c04ef2941b74 Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri May 14 20:32:25 2021 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri May 14 20:38:50 2021 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=e5016526 kde-plasma/libkworkspace: 5.21.90 version bump Signed-off-by: Andreas Sturmlechner gentoo.org> .../libkworkspace/libkworkspace-5.21.90.ebuild | 58 ++ 1 file changed, 58 insertions(+) diff --git a/kde-plasma/libkworkspace/libkworkspace-5.21.90.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.21.90.ebuild new file mode 100644 index 00..d5de9a8d1e --- /dev/null +++ b/kde-plasma/libkworkspace/libkworkspace-5.21.90.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +ECM_TEST="true" +KDE_ORG_NAME="plasma-workspace" +KFMIN=5.82.0 +PVCUT=$(ver_cut 1-3) +QTMIN=5.15.2 +inherit ecm kde.org + +DESCRIPTION="Workspace library to interact with the Plasma session manager" + +LICENSE="GPL-2" # TODO: CHECK +SLOT="5" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +IUSE="" + +RDEPEND=" + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtx11extras-${QTMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kinit-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5 + >=kde-frameworks/plasma-${KFMIN}:5 + >=kde-plasma/kscreenlocker-${PVCUT}:5 + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXau +" +DEPEND="${RDEPEND} + >=kde-plasma/kwin-${PVCUT}:5 +" + +S="${S}/${PN}" + +PATCHES=( "${FILESDIR}/${PN}-5.19.80-standalone.patch" ) + +src_prepare() { + # delete colliding libkworkspace translations, let ecm_src_prepare do its magic + if [[ ${KDE_BUILD_TYPE} = release ]]; then + find ../po -type f -name "*po" -and -not -name "libkworkspace*" -delete || die + rm -rf po/*/docs || die + cp -a ../po ./ || die + fi + ecm_src_prepare + if [[ ${KDE_BUILD_TYPE} = release ]]; then + cat >> CMakeLists.txt <<- _EOF_ || die + ki18n_install(po) + _EOF_ + fi + + sed -e "/set/s/GENTOO_PV/$(ver_cut 1-3)/" \ + -i CMakeLists.txt || die "Failed to prepare CMakeLists.txt" +}
[gentoo-commits] proj/kde:master commit in: kde-plasma/libkworkspace/
commit: 110aafcf82830ea5b1246d4a0cc8c2893af2a812 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Apr 11 11:35:20 2021 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Apr 11 11:35:20 2021 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=110aafcf kde-plasma/libkworkspace: Drop alternative RDEPEND gui-wm/kwinft It forked off too far. Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-plasma/libkworkspace/libkworkspace-.ebuild | 5 + 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/kde-plasma/libkworkspace/libkworkspace-.ebuild b/kde-plasma/libkworkspace/libkworkspace-.ebuild index b7daf32374..bb6a957aa7 100644 --- a/kde-plasma/libkworkspace/libkworkspace-.ebuild +++ b/kde-plasma/libkworkspace/libkworkspace-.ebuild @@ -32,10 +32,7 @@ RDEPEND=" x11-libs/libXau " DEPEND="${RDEPEND} - || ( - >=kde-plasma/kwin-${PVCUT}:5 - >=gui-wm/kwinft-$(ver_cut 1-2):5 - ) + >=kde-plasma/kwin-${PVCUT}:5 " S="${S}/${PN}"
[gentoo-commits] proj/kde:master commit in: kde-plasma/libkworkspace/
commit: ecb20adf51bc2ecc50fe7e44421fe4a5ae31bd80 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Feb 16 14:40:41 2021 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Feb 16 14:40:41 2021 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=ecb20adf kde-plasma/libkworkspace: drop 5.21.0* Signed-off-by: Andreas Sturmlechner gentoo.org> .../libkworkspace/libkworkspace-5.21.0.ebuild | 61 -- 1 file changed, 61 deletions(-) diff --git a/kde-plasma/libkworkspace/libkworkspace-5.21.0.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.21.0.ebuild deleted file mode 100644 index 243437a233..00 --- a/kde-plasma/libkworkspace/libkworkspace-5.21.0.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ECM_TEST="true" -KDE_ORG_NAME="plasma-workspace" -KFMIN=5.78.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -inherit ecm kde.org - -DESCRIPTION="Workspace library to interact with the Plasma session manager" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" -IUSE="" - -RDEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtx11extras-${QTMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kinit-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/plasma-${KFMIN}:5 - >=kde-plasma/kscreenlocker-${PVCUT}:5 - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXau -" -DEPEND="${RDEPEND} - || ( - >=kde-plasma/kwin-${PVCUT}:5 - >=gui-wm/kwinft-$(ver_cut 1-2):5 - ) -" - -S="${S}/${PN}" - -PATCHES=( "${FILESDIR}/${PN}-5.19.80-standalone.patch" ) - -src_prepare() { - # delete colliding libkworkspace translations, let ecm_src_prepare do its magic - if [[ ${KDE_BUILD_TYPE} = release ]]; then - find ../po -type f -name "*po" -and -not -name "libkworkspace*" -delete || die - rm -rf po/*/docs || die - cp -a ../po ./ || die - fi - ecm_src_prepare - if [[ ${KDE_BUILD_TYPE} = release ]]; then - cat >> CMakeLists.txt <<- _EOF_ || die - ki18n_install(po) - _EOF_ - fi - - sed -e "/set/s/GENTOO_PV/$(ver_cut 1-3)/" \ - -i CMakeLists.txt || die "Failed to prepare CMakeLists.txt" -}
[gentoo-commits] proj/kde:master commit in: kde-plasma/libkworkspace/
commit: 18cab0deb5349e575b55194b15a5ede8087e8c90 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Feb 16 14:19:35 2021 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Feb 16 14:25:30 2021 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=18cab0de kde-plasma/libkworkspace: drop 5.20.90* Signed-off-by: Andreas Sturmlechner gentoo.org> .../libkworkspace/libkworkspace-5.20.90.ebuild | 61 -- 1 file changed, 61 deletions(-) diff --git a/kde-plasma/libkworkspace/libkworkspace-5.20.90.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.20.90.ebuild deleted file mode 100644 index 243437a233..00 --- a/kde-plasma/libkworkspace/libkworkspace-5.20.90.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ECM_TEST="true" -KDE_ORG_NAME="plasma-workspace" -KFMIN=5.78.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -inherit ecm kde.org - -DESCRIPTION="Workspace library to interact with the Plasma session manager" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" -IUSE="" - -RDEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtx11extras-${QTMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kinit-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/plasma-${KFMIN}:5 - >=kde-plasma/kscreenlocker-${PVCUT}:5 - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXau -" -DEPEND="${RDEPEND} - || ( - >=kde-plasma/kwin-${PVCUT}:5 - >=gui-wm/kwinft-$(ver_cut 1-2):5 - ) -" - -S="${S}/${PN}" - -PATCHES=( "${FILESDIR}/${PN}-5.19.80-standalone.patch" ) - -src_prepare() { - # delete colliding libkworkspace translations, let ecm_src_prepare do its magic - if [[ ${KDE_BUILD_TYPE} = release ]]; then - find ../po -type f -name "*po" -and -not -name "libkworkspace*" -delete || die - rm -rf po/*/docs || die - cp -a ../po ./ || die - fi - ecm_src_prepare - if [[ ${KDE_BUILD_TYPE} = release ]]; then - cat >> CMakeLists.txt <<- _EOF_ || die - ki18n_install(po) - _EOF_ - fi - - sed -e "/set/s/GENTOO_PV/$(ver_cut 1-3)/" \ - -i CMakeLists.txt || die "Failed to prepare CMakeLists.txt" -}
[gentoo-commits] proj/kde:master commit in: kde-plasma/libkworkspace/
commit: dcb67e029fba2070923e3502a1430b8178fa3419 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Feb 11 12:42:03 2021 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Feb 11 12:46:23 2021 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=dcb67e02 kde-plasma/libkworkspace: 5.21.0 version bump Signed-off-by: Andreas Sturmlechner gentoo.org> .../libkworkspace/libkworkspace-5.21.0.ebuild | 61 ++ 1 file changed, 61 insertions(+) diff --git a/kde-plasma/libkworkspace/libkworkspace-5.21.0.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.21.0.ebuild new file mode 100644 index 00..243437a233 --- /dev/null +++ b/kde-plasma/libkworkspace/libkworkspace-5.21.0.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +ECM_TEST="true" +KDE_ORG_NAME="plasma-workspace" +KFMIN=5.78.0 +PVCUT=$(ver_cut 1-3) +QTMIN=5.15.2 +inherit ecm kde.org + +DESCRIPTION="Workspace library to interact with the Plasma session manager" + +LICENSE="GPL-2" # TODO: CHECK +SLOT="5" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +IUSE="" + +RDEPEND=" + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtx11extras-${QTMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kinit-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5 + >=kde-frameworks/plasma-${KFMIN}:5 + >=kde-plasma/kscreenlocker-${PVCUT}:5 + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXau +" +DEPEND="${RDEPEND} + || ( + >=kde-plasma/kwin-${PVCUT}:5 + >=gui-wm/kwinft-$(ver_cut 1-2):5 + ) +" + +S="${S}/${PN}" + +PATCHES=( "${FILESDIR}/${PN}-5.19.80-standalone.patch" ) + +src_prepare() { + # delete colliding libkworkspace translations, let ecm_src_prepare do its magic + if [[ ${KDE_BUILD_TYPE} = release ]]; then + find ../po -type f -name "*po" -and -not -name "libkworkspace*" -delete || die + rm -rf po/*/docs || die + cp -a ../po ./ || die + fi + ecm_src_prepare + if [[ ${KDE_BUILD_TYPE} = release ]]; then + cat >> CMakeLists.txt <<- _EOF_ || die + ki18n_install(po) + _EOF_ + fi + + sed -e "/set/s/GENTOO_PV/$(ver_cut 1-3)/" \ + -i CMakeLists.txt || die "Failed to prepare CMakeLists.txt" +}
[gentoo-commits] proj/kde:master commit in: kde-plasma/libkworkspace/
commit: 4d460fe65ed8095b3b5287e4f983f738d8ba135d Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Jan 22 23:31:53 2021 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Jan 22 23:58:45 2021 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=4d460fe6 kde-plasma/libkworkspace: 5.20.90 version bump Signed-off-by: Andreas Sturmlechner gentoo.org> .../libkworkspace/libkworkspace-5.20.90.ebuild | 61 ++ 1 file changed, 61 insertions(+) diff --git a/kde-plasma/libkworkspace/libkworkspace-5.20.90.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.20.90.ebuild new file mode 100644 index 00..243437a233 --- /dev/null +++ b/kde-plasma/libkworkspace/libkworkspace-5.20.90.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +ECM_TEST="true" +KDE_ORG_NAME="plasma-workspace" +KFMIN=5.78.0 +PVCUT=$(ver_cut 1-3) +QTMIN=5.15.2 +inherit ecm kde.org + +DESCRIPTION="Workspace library to interact with the Plasma session manager" + +LICENSE="GPL-2" # TODO: CHECK +SLOT="5" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +IUSE="" + +RDEPEND=" + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtx11extras-${QTMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kinit-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5 + >=kde-frameworks/plasma-${KFMIN}:5 + >=kde-plasma/kscreenlocker-${PVCUT}:5 + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXau +" +DEPEND="${RDEPEND} + || ( + >=kde-plasma/kwin-${PVCUT}:5 + >=gui-wm/kwinft-$(ver_cut 1-2):5 + ) +" + +S="${S}/${PN}" + +PATCHES=( "${FILESDIR}/${PN}-5.19.80-standalone.patch" ) + +src_prepare() { + # delete colliding libkworkspace translations, let ecm_src_prepare do its magic + if [[ ${KDE_BUILD_TYPE} = release ]]; then + find ../po -type f -name "*po" -and -not -name "libkworkspace*" -delete || die + rm -rf po/*/docs || die + cp -a ../po ./ || die + fi + ecm_src_prepare + if [[ ${KDE_BUILD_TYPE} = release ]]; then + cat >> CMakeLists.txt <<- _EOF_ || die + ki18n_install(po) + _EOF_ + fi + + sed -e "/set/s/GENTOO_PV/$(ver_cut 1-3)/" \ + -i CMakeLists.txt || die "Failed to prepare CMakeLists.txt" +}
[gentoo-commits] proj/kde:master commit in: kde-plasma/libkworkspace/
commit: 99d938ed81b8094f7d1284c17d746d43551b8e36 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Jan 6 19:27:20 2021 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Jan 6 19:27:20 2021 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=99d938ed kde-plasma/libkworkspace: Drop obsolete blocker Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-plasma/libkworkspace/libkworkspace-.ebuild | 7 ++- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/kde-plasma/libkworkspace/libkworkspace-.ebuild b/kde-plasma/libkworkspace/libkworkspace-.ebuild index 9f7ee84ae8..9cc6ab6ad4 100644 --- a/kde-plasma/libkworkspace/libkworkspace-.ebuild +++ b/kde-plasma/libkworkspace/libkworkspace-.ebuild @@ -17,7 +17,7 @@ SLOT="5" KEYWORDS="" IUSE="" -COMMON_DEPEND=" +RDEPEND=" >=dev-qt/qtdbus-${QTMIN}:5 >=dev-qt/qtx11extras-${QTMIN}:5 >=kde-frameworks/kcoreaddons-${KFMIN}:5 @@ -31,15 +31,12 @@ COMMON_DEPEND=" x11-libs/libX11 x11-libs/libXau " -DEPEND="${COMMON_DEPEND} +DEPEND="${RDEPEND} || ( >=kde-plasma/kwin-${PVCUT}:5 >=gui-wm/kwinft-$(ver_cut 1-2):5 ) " -RDEPEND="${COMMON_DEPEND} - !
[gentoo-commits] proj/kde:master commit in: kde-plasma/libkworkspace/
commit: 1dcaf005fb6ea24ce24ea5da8e1db5a2be821e38 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Jan 5 17:40:17 2021 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Jan 5 17:43:46 2021 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=1dcaf005 kde-plasma/libkworkspace: drop 5.20.49.* Signed-off-by: Andreas Sturmlechner gentoo.org> .../libkworkspace-5.20.49..ebuild | 61 -- 1 file changed, 61 deletions(-) diff --git a/kde-plasma/libkworkspace/libkworkspace-5.20.49..ebuild b/kde-plasma/libkworkspace/libkworkspace-5.20.49..ebuild deleted file mode 100644 index 88fbb18768..00 --- a/kde-plasma/libkworkspace/libkworkspace-5.20.49..ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ECM_TEST="true" -KDE_ORG_NAME="plasma-workspace" -KFMIN=5.74.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.1 -inherit ecm kde.org - -DESCRIPTION="Workspace library to interact with the Plasma session manager" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="5" -KEYWORDS="" -IUSE="" - -COMMON_DEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtx11extras-${QTMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kinit-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/plasma-${KFMIN}:5 - >=kde-plasma/kscreenlocker-${PVCUT}:5 - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXau -" -DEPEND="${COMMON_DEPEND} - >=kde-plasma/kwin-${PVCUT}:5 -" -RDEPEND="${COMMON_DEPEND} - !> CMakeLists.txt <<- _EOF_ || die - ki18n_install(po) - _EOF_ - fi - - sed -e "/set/s/GENTOO_PV/$(ver_cut 1-3)/" \ - -i CMakeLists.txt || die "Failed to prepare CMakeLists.txt" -}
[gentoo-commits] proj/kde:master commit in: kde-plasma/libkworkspace/
commit: d4ab6b6a5d4641b0c3ed64a21e4969b74184a261 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Oct 13 11:49:42 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Oct 13 11:49:42 2020 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=d4ab6b6a kde-plasma/libkworkspace: drop 5.20.0* Signed-off-by: Andreas Sturmlechner gentoo.org> .../libkworkspace/libkworkspace-5.20.0.ebuild | 61 -- 1 file changed, 61 deletions(-) diff --git a/kde-plasma/libkworkspace/libkworkspace-5.20.0.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.20.0.ebuild deleted file mode 100644 index fa283d1fa3..00 --- a/kde-plasma/libkworkspace/libkworkspace-5.20.0.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ECM_TEST="true" -KDE_ORG_NAME="plasma-workspace" -KFMIN=5.74.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.1 -inherit ecm kde.org - -DESCRIPTION="Workspace library to interact with the Plasma session manager" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" -IUSE="" - -COMMON_DEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtx11extras-${QTMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kinit-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/plasma-${KFMIN}:5 - >=kde-plasma/kscreenlocker-${PVCUT}:5 - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXau -" -DEPEND="${COMMON_DEPEND} - >=kde-plasma/kwin-${PVCUT}:5 -" -RDEPEND="${COMMON_DEPEND} - !> CMakeLists.txt <<- _EOF_ || die - ki18n_install(po) - _EOF_ - fi - - sed -e "/set/s/GENTOO_PV/$(ver_cut 1-3)/" \ - -i CMakeLists.txt || die "Failed to prepare CMakeLists.txt" -}
[gentoo-commits] proj/kde:master commit in: kde-plasma/libkworkspace/
commit: 1cbee8dad428ce26c8f803e8dbb490a98d4db4a2 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Oct 8 18:09:11 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Oct 8 18:09:11 2020 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=1cbee8da kde-plasma/libkworkspace: 5.20.0 version bump Signed-off-by: Andreas Sturmlechner gentoo.org> .../libkworkspace/libkworkspace-5.20.0.ebuild | 61 ++ 1 file changed, 61 insertions(+) diff --git a/kde-plasma/libkworkspace/libkworkspace-5.20.0.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.20.0.ebuild new file mode 100644 index 00..d185a16395 --- /dev/null +++ b/kde-plasma/libkworkspace/libkworkspace-5.20.0.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +ECM_TEST="true" +KDE_ORG_NAME="plasma-workspace" +KFMIN=5.74.0 +PVCUT=$(ver_cut 1-3) +QTMIN=5.15.0 +inherit ecm kde.org + +DESCRIPTION="Workspace library to interact with the Plasma session manager" + +LICENSE="GPL-2" # TODO: CHECK +SLOT="5" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +IUSE="" + +COMMON_DEPEND=" + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtx11extras-${QTMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kinit-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5 + >=kde-frameworks/plasma-${KFMIN}:5 + >=kde-plasma/kscreenlocker-${PVCUT}:5 + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXau +" +DEPEND="${COMMON_DEPEND} + >=kde-plasma/kwin-${PVCUT}:5 +" +RDEPEND="${COMMON_DEPEND} + !> CMakeLists.txt <<- _EOF_ || die + ki18n_install(po) + _EOF_ + fi + + sed -e "/set/s/GENTOO_PV/$(ver_cut 1-3)/" \ + -i CMakeLists.txt || die "Failed to prepare CMakeLists.txt" +}
[gentoo-commits] proj/kde:master commit in: kde-plasma/libkworkspace/
commit: 396df45285a60d0712e6c3a8c237c1925ce52b59 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Sep 19 03:04:46 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Sep 19 03:04:46 2020 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=396df452 kde-plasma/libkworkspace: 5.19.90 version bump Signed-off-by: Andreas Sturmlechner gentoo.org> .../libkworkspace/libkworkspace-5.19.90.ebuild | 61 ++ 1 file changed, 61 insertions(+) diff --git a/kde-plasma/libkworkspace/libkworkspace-5.19.90.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.19.90.ebuild new file mode 100644 index 00..d185a16395 --- /dev/null +++ b/kde-plasma/libkworkspace/libkworkspace-5.19.90.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +ECM_TEST="true" +KDE_ORG_NAME="plasma-workspace" +KFMIN=5.74.0 +PVCUT=$(ver_cut 1-3) +QTMIN=5.15.0 +inherit ecm kde.org + +DESCRIPTION="Workspace library to interact with the Plasma session manager" + +LICENSE="GPL-2" # TODO: CHECK +SLOT="5" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +IUSE="" + +COMMON_DEPEND=" + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtx11extras-${QTMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kinit-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5 + >=kde-frameworks/plasma-${KFMIN}:5 + >=kde-plasma/kscreenlocker-${PVCUT}:5 + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXau +" +DEPEND="${COMMON_DEPEND} + >=kde-plasma/kwin-${PVCUT}:5 +" +RDEPEND="${COMMON_DEPEND} + !> CMakeLists.txt <<- _EOF_ || die + ki18n_install(po) + _EOF_ + fi + + sed -e "/set/s/GENTOO_PV/$(ver_cut 1-3)/" \ + -i CMakeLists.txt || die "Failed to prepare CMakeLists.txt" +}
[gentoo-commits] proj/kde:master commit in: kde-plasma/libkworkspace/
commit: 66014b69ce8869108d87367977e4afb9f98d24a7 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Sep 1 16:34:46 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Sep 1 16:34:46 2020 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=66014b69 kde-plasma/libkworkspace: drop 5.19.5* Signed-off-by: Andreas Sturmlechner gentoo.org> .../libkworkspace/libkworkspace-5.19.5.ebuild | 61 -- 1 file changed, 61 deletions(-) diff --git a/kde-plasma/libkworkspace/libkworkspace-5.19.5.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.19.5.ebuild deleted file mode 100644 index 56426b1fa6..00 --- a/kde-plasma/libkworkspace/libkworkspace-5.19.5.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ECM_TEST="true" -KDE_ORG_NAME="plasma-workspace" -KFMIN=5.71.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.14.2 -inherit ecm kde.org - -DESCRIPTION="Workspace library to interact with the Plasma session manager" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" -IUSE="" - -COMMON_DEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtx11extras-${QTMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kinit-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/plasma-${KFMIN}:5 - >=kde-plasma/kscreenlocker-${PVCUT}:5 - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXau -" -DEPEND="${COMMON_DEPEND} - >=kde-plasma/kwin-${PVCUT}:5 -" -RDEPEND="${COMMON_DEPEND} - !> CMakeLists.txt <<- _EOF_ || die - ki18n_install(po) - _EOF_ - fi - - sed -e "/set/s/GENTOO_PV/$(ver_cut 1-3)/" \ - -i CMakeLists.txt || die "Failed to prepare CMakeLists.txt" -}
[gentoo-commits] proj/kde:master commit in: kde-plasma/libkworkspace/
commit: 4719ada0cf3c59a37b3963db6890196d698b9181 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Sep 1 11:59:00 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Sep 1 11:59:00 2020 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=4719ada0 kde-plasma/libkworkspace: drop 5.19.49.* Signed-off-by: Andreas Sturmlechner gentoo.org> .../libkworkspace-5.19.49..ebuild | 61 -- 1 file changed, 61 deletions(-) diff --git a/kde-plasma/libkworkspace/libkworkspace-5.19.49..ebuild b/kde-plasma/libkworkspace/libkworkspace-5.19.49..ebuild deleted file mode 100644 index 2a52434725..00 --- a/kde-plasma/libkworkspace/libkworkspace-5.19.49..ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ECM_TEST="true" -KDE_ORG_NAME="plasma-workspace" -KFMIN=5.71.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.14.2 -inherit ecm kde.org - -DESCRIPTION="Workspace library to interact with the Plasma session manager" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="5" -KEYWORDS="" -IUSE="" - -COMMON_DEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtx11extras-${QTMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kinit-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/plasma-${KFMIN}:5 - >=kde-plasma/kscreenlocker-${PVCUT}:5 - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXau -" -DEPEND="${COMMON_DEPEND} - >=kde-plasma/kwin-${PVCUT}:5 -" -RDEPEND="${COMMON_DEPEND} - !> CMakeLists.txt <<- _EOF_ || die - ki18n_install(po) - _EOF_ - fi - - sed -e "/set/s/GENTOO_PV/$(ver_cut 1-3)/" \ - -i CMakeLists.txt || die "Failed to prepare CMakeLists.txt" -}
[gentoo-commits] proj/kde:master commit in: kde-plasma/libkworkspace/, kde-plasma/libkworkspace/files/
commit: 526b182cc76c27ce787af835fbc8bfa3da07bc37 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Jun 6 14:16:37 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Jun 6 14:17:39 2020 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=526b182c kde-plasma/libkworkspace: Rebase standalone.patch on top of HEAD Reported-by: Duncan <1i5t5.duncan cox.net> Closes: https://bugs.gentoo.org/726078 Package-Manager: Portage-2.3.100, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner gentoo.org> .../files/libkworkspace-5.19.80-standalone.patch | 108 + kde-plasma/libkworkspace/libkworkspace-.ebuild | 2 +- 2 files changed, 109 insertions(+), 1 deletion(-) diff --git a/kde-plasma/libkworkspace/files/libkworkspace-5.19.80-standalone.patch b/kde-plasma/libkworkspace/files/libkworkspace-5.19.80-standalone.patch new file mode 100644 index 00..8c8213d002 --- /dev/null +++ b/kde-plasma/libkworkspace/files/libkworkspace-5.19.80-standalone.patch @@ -0,0 +1,108 @@ +From 30d75ef4b3e75155e78924aa82aa9f368bb86f4f Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Sun, 2 Feb 2020 18:29:57 +0100 +Subject: [PATCH] libkworkspace: Allow standalone build + +--- + libkworkspace/CMakeLists.txt | 67 +++- + 1 file changed, 66 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7ba097a6e..66f70c0b6 100644 +--- a/CMakeLists.txt b/CMakeLists.txt +@@ -1,3 +1,56 @@ ++project(libkworkspace) ++ ++if(${CMAKE_SOURCE_DIR} STREQUAL ${libkworkspace_SOURCE_DIR}) ++set(PROJECT_VERSION "GENTOO_PV") ++set(PROJECT_VERSION_MAJOR 5) ++ ++cmake_minimum_required(VERSION 3.0) ++ ++set(QT_MIN_VERSION "5.14.0") ++set(KF5_MIN_VERSION "5.71.0") ++find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core DBus) ++find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE) ++set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) ++ ++include(KDEInstallDirs) ++include(KDECMakeSettings) ++include(KDECompilerSettings NO_POLICY_SCOPE) ++include(ECMMarkNonGuiExecutable) ++include(CMakePackageConfigHelpers) ++include(WriteBasicConfigVersionFile) ++include(CheckIncludeFiles) ++include(FeatureSummary) ++include(ECMQtDeclareLoggingCategory) ++include(KDEPackageAppTemplates) ++include(ECMMarkAsTest) ++include(GenerateExportHeader) ++ ++find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS CoreAddons I18n Init Plasma WindowSystem) ++ ++find_package(KWinDBusInterface CONFIG REQUIRED) ++find_package(KScreenLocker 5.13.80 REQUIRED) ++find_package(ScreenSaverDBusInterface CONFIG REQUIRED) ++ ++find_package(X11) ++set_package_properties(X11 PROPERTIES DESCRIPTION "X11 libraries" ++URL "http://www.x.org"; ++TYPE OPTIONAL ++PURPOSE "Required for X11 support") ++ ++if(X11_FOUND) ++find_package(Qt5X11Extras ${QT_MIN_VERSION} CONFIG REQUIRED) ++set(HAVE_X11 1) ++endif() ++ ++if(BUILD_TESTING) ++find_package(Qt5Test ${QT_MIN_VERSION} CONFIG REQUIRED) ++endif() ++ ++check_include_files(unistd.h HAVE_UNISTD_H) ++ ++configure_file(../config-workspace.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-workspace.h) ++configure_file(../config-X11.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-X11.h) ++endif() + + set(kworkspace_LIB_SRCS kdisplaymanager.cpp + kworkspace.cpp +@@ -16,9 +69,17 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) + qt5_add_dbus_interface(kworkspace_LIB_SRCS ${KINIT_DBUS_INTERFACES_DIR}/kf5_org.kde.KLauncher.xml klauncher_interface) + qt5_add_dbus_interface(kworkspace_LIB_SRCS ${KSCREENLOCKER_DBUS_INTERFACES_DIR}/kf5_org.freedesktop.ScreenSaver.xml screenlocker_interface ) + qt5_add_dbus_interface(kworkspace_LIB_SRCS ${KSCREENLOCKER_DBUS_INTERFACES_DIR}/org.kde.screensaver.xml kscreenlocker_interface ) ++if(${CMAKE_SOURCE_DIR} STREQUAL ${libkworkspace_SOURCE_DIR}) ++qt5_add_dbus_interface(kworkspace_LIB_SRCS ../ksmserver/org.kde.LogoutPrompt.xml logoutprompt_interface) ++qt5_add_dbus_interface(kworkspace_LIB_SRCS ../startkde/plasma-session/org.kde.Startup.xml startup_interface) ++qt5_add_dbus_interface(kworkspace_LIB_SRCS ../startkde/plasma-shutdown/org.kde.Shutdown.xml shutdown_interface) ++set(ksmserver_xml ../ksmserver/org.kde.KSMServerInterface.xml) ++else() + qt5_add_dbus_interface(kworkspace_LIB_SRCS ${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.LogoutPrompt.xml logoutprompt_interface) + qt5_add_dbus_interface(kworkspace_LIB_SRCS ${plasma-workspace_SOURCE_DIR}/startkde/plasma-session/org.kde.Startup.xml startup_interface) + qt5_add_dbus_interface(kworkspace_LIB_SRCS ${plasma-workspace_SOURCE_DIR}/startkde/plasma-shutdown/org.kde.Shutdown.xml shutdown_interface) ++set(ksmserver_xml ${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.KSMSer
[gentoo-commits] proj/kde:master commit in: kde-plasma/libkworkspace/, kde-plasma/plasma-workspace/, kde-plasma/plasma-meta/, ...
commit: d964079e461022aab8e1adbece117f1a2dcd1fae Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Apr 16 11:36:14 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Apr 16 13:56:29 2020 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=d964079e kde-plasma: Optional gui-wm/kwinft support Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-plasma/libkworkspace/libkworkspace-5.18.49..ebuild | 5 - kde-plasma/libkworkspace/libkworkspace-.ebuild | 5 - kde-plasma/plasma-desktop/plasma-desktop-5.18.49..ebuild | 5 - kde-plasma/plasma-desktop/plasma-desktop-.ebuild | 5 - kde-plasma/plasma-meta/metadata.xml | 1 + kde-plasma/plasma-meta/plasma-meta-5.18.49..ebuild | 9 + kde-plasma/plasma-meta/plasma-meta-.ebuild | 9 + kde-plasma/plasma-workspace/plasma-workspace-5.18.49..ebuild | 5 - kde-plasma/plasma-workspace/plasma-workspace-.ebuild | 5 - 9 files changed, 35 insertions(+), 14 deletions(-) diff --git a/kde-plasma/libkworkspace/libkworkspace-5.18.49..ebuild b/kde-plasma/libkworkspace/libkworkspace-5.18.49..ebuild index 879922830e..a634618ea7 100644 --- a/kde-plasma/libkworkspace/libkworkspace-5.18.49..ebuild +++ b/kde-plasma/libkworkspace/libkworkspace-5.18.49..ebuild @@ -31,7 +31,10 @@ COMMON_DEPEND=" x11-libs/libXau " DEPEND="${COMMON_DEPEND} - >=kde-plasma/kwin-${PVCUT}:5 + || ( + >=kde-plasma/kwin-${PVCUT}:5 + >=gui-wm/kwinft-$(ver_cut 1-2):5 + ) " RDEPEND="${COMMON_DEPEND} !=kde-frameworks/plasma-${KFMIN}:5 >=kde-frameworks/solid-${KFMIN}:5 >=kde-frameworks/sonnet-${KFMIN}:5 - >=kde-plasma/kwin-${PVCUT}:5 + || ( + >=kde-plasma/kwin-${PVCUT}:5 + >=gui-wm/kwinft-$(ver_cut 1-2):5 + ) >=kde-plasma/libksysguard-${PVCUT}:5 >=kde-plasma/plasma-workspace-${PVCUT}:5 media-libs/phonon[qt5(+)] diff --git a/kde-plasma/plasma-desktop/plasma-desktop-.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-.ebuild index ec6504cb73..fd31f2ac7b 100644 --- a/kde-plasma/plasma-desktop/plasma-desktop-.ebuild +++ b/kde-plasma/plasma-desktop/plasma-desktop-.ebuild @@ -77,7 +77,10 @@ COMMON_DEPEND=" >=kde-frameworks/plasma-${KFMIN}:5 >=kde-frameworks/solid-${KFMIN}:5 >=kde-frameworks/sonnet-${KFMIN}:5 - >=kde-plasma/kwin-${PVCUT}:5 + || ( + >=kde-plasma/kwin-${PVCUT}:5 + >=gui-wm/kwinft-$(ver_cut 1-2):5 + ) >=kde-plasma/libksysguard-${PVCUT}:5 >=kde-plasma/plasma-workspace-${PVCUT}:5 media-libs/phonon[qt5(+)] diff --git a/kde-plasma/plasma-meta/metadata.xml b/kde-plasma/plasma-meta/metadata.xml index ad4cccb579..e3ad14b3e9 100644 --- a/kde-plasma/plasma-meta/metadata.xml +++ b/kde-plasma/plasma-meta/metadata.xml @@ -15,6 +15,7 @@ Use sys-auth/elogind for session tracking Pull in Breeze theme for sys-boot/grub Enable Breeze widget style and system settings module for GTK+ + Pull in gui-wm/kwinft instead of kde-plasma/kwin Add support for legacy applications using kde-plasma/xembed-sni-proxy Enable support for kwallet auto-unlocking Pull in Breeze theme for sys-boot/plymouth diff --git a/kde-plasma/plasma-meta/plasma-meta-5.18.49..ebuild b/kde-plasma/plasma-meta/plasma-meta-5.18.49..ebuild index f55a635c96..5cb896a062 100644 --- a/kde-plasma/plasma-meta/plasma-meta-5.18.49..ebuild +++ b/kde-plasma/plasma-meta/plasma-meta-5.18.49..ebuild @@ -10,8 +10,8 @@ LICENSE="metapackage" SLOT="5" KEYWORDS="" IUSE="bluetooth +browser-integration consolekit crypt +desktop-portal discover -+display-manager elogind grub gtk +handbook +legacy-systray networkmanager pam -plymouth pulseaudio qrcode +sddm sdk systemd thunderbolt +wallpapers" ++display-manager elogind grub gtk +handbook kwinft +legacy-systray networkmanager +pam plymouth pulseaudio qrcode +sddm sdk systemd thunderbolt +wallpapers" REQUIRED_USE="?? ( consolekit elogind systemd )" @@ -31,9 +31,10 @@ RDEPEND=" >=kde-plasma/ksshaskpass-${PV}:${SLOT} >=kde-plasma/ksysguard-${PV}:${SLOT} >=kde-plasma/kwayland-integration-${PV}:${SLOT} - >=kde-plasma/kwin-${PV}:${SLOT} + !kwinft? ( >=kde-plasma/kwin-${PV}:${SLOT} ) + kwinft? ( >=gui-wm/kwinft-$(ver_cut 1-2):${SLOT} ) >=kde-plasma/kwrited-${PV}:${SLOT} - >=kde-plasma/libkscreen-${PV}:${SLOT} + >=kde-plasma/libkscreen-${PV}:${SLOT}[kwinft?] >=kde-plasma/libksysguard-${PV}:${SLOT} >=kde-plasma/milou-${PV}:${SLOT} >=kde-plasma/oxygen-${PV}:${SLOT} diff --git a/kde
[gentoo-commits] proj/kde:master commit in: kde-plasma/libkworkspace/
commit: 2573e622df480fc23d08c3e80ac738680f047a71 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Apr 16 11:16:48 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Apr 16 13:56:29 2020 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=2573e622 kde-plasma/libkworkspace: Sort DEPENDs Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-plasma/libkworkspace/libkworkspace-5.18.49..ebuild | 4 ++-- kde-plasma/libkworkspace/libkworkspace-.ebuild | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/kde-plasma/libkworkspace/libkworkspace-5.18.49..ebuild b/kde-plasma/libkworkspace/libkworkspace-5.18.49..ebuild index d10bc1690c..879922830e 100644 --- a/kde-plasma/libkworkspace/libkworkspace-5.18.49..ebuild +++ b/kde-plasma/libkworkspace/libkworkspace-5.18.49..ebuild @@ -18,13 +18,13 @@ KEYWORDS="" IUSE="" COMMON_DEPEND=" + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtx11extras-${QTMIN}:5 >=kde-frameworks/kcoreaddons-${KFMIN}:5 >=kde-frameworks/ki18n-${KFMIN}:5 >=kde-frameworks/kwindowsystem-${KFMIN}:5 >=kde-frameworks/plasma-${KFMIN}:5 >=kde-plasma/kscreenlocker-${PVCUT}:5 - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtx11extras-${QTMIN}:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 diff --git a/kde-plasma/libkworkspace/libkworkspace-.ebuild b/kde-plasma/libkworkspace/libkworkspace-.ebuild index 741eb62a13..f762643294 100644 --- a/kde-plasma/libkworkspace/libkworkspace-.ebuild +++ b/kde-plasma/libkworkspace/libkworkspace-.ebuild @@ -18,14 +18,14 @@ KEYWORDS="" IUSE="" COMMON_DEPEND=" + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtx11extras-${QTMIN}:5 >=kde-frameworks/kcoreaddons-${KFMIN}:5 >=kde-frameworks/ki18n-${KFMIN}:5 >=kde-frameworks/kinit-${KFMIN}:5 >=kde-frameworks/kwindowsystem-${KFMIN}:5 >=kde-frameworks/plasma-${KFMIN}:5 >=kde-plasma/kscreenlocker-${PVCUT}:5 - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtx11extras-${QTMIN}:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11
[gentoo-commits] proj/kde:master commit in: kde-plasma/libkworkspace/files/
commit: ec6b5a1e8fb547754f055f0d0a5cec35ad2d73c6 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Mar 12 23:31:49 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Mar 12 23:33:19 2020 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=ec6b5a1e kde-plasma/libkworkspace: Rebase ${PN}-5.18.80-standalone.patch on HEAD Necessary after upstream commit 3c34dfa97 Thanks-to: Duncan <1i5t5.duncan cox.net> Closes: https://bugs.gentoo.org/712226 Package-Manager: Portage-2.3.93, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner gentoo.org> .../files/libkworkspace-5.18.80-standalone.patch | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/kde-plasma/libkworkspace/files/libkworkspace-5.18.80-standalone.patch b/kde-plasma/libkworkspace/files/libkworkspace-5.18.80-standalone.patch index 28ee1c5851..8f0523ab8e 100644 --- a/kde-plasma/libkworkspace/files/libkworkspace-5.18.80-standalone.patch +++ b/kde-plasma/libkworkspace/files/libkworkspace-5.18.80-standalone.patch @@ -1,6 +1,6 @@ -From 34cbb4d2482c0df07bf9cd376e30ed878ed44b9f Mon Sep 17 00:00:00 2001 +From 85564b5264546866be56b9bc546689fbab20506d Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner -Date: Sun, 2 Feb 2020 18:29:57 +0100 +Date: Fri, 13 Mar 2020 00:14:31 +0100 Subject: [PATCH] libkworkspace: Allow standalone build --- @@ -8,7 +8,7 @@ Subject: [PATCH] libkworkspace: Allow standalone build 1 file changed, 67 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index a1869fae2..8de7a5c28 100644 +index 85cbb5e6c..de17e9287 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,3 +1,56 @@ @@ -75,12 +75,12 @@ index a1869fae2..8de7a5c28 100644 +if(${CMAKE_SOURCE_DIR} STREQUAL ${libkworkspace_SOURCE_DIR}) +qt5_add_dbus_interface(kworkspace_LIB_SRCS ../ksmserver/org.kde.LogoutPrompt.xml logoutprompt_interface) +qt5_add_dbus_interface(kworkspace_LIB_SRCS ../startkde/plasma-session/org.kde.Startup.xml startup_interface) -+qt5_add_dbus_interface(kworkspace_LIB_SRCS ../startkde/plasma-session/org.kde.Shutdown.xml shutdown_interface) ++qt5_add_dbus_interface(kworkspace_LIB_SRCS ../startkde/plasma-shutdown/org.kde.Shutdown.xml shutdown_interface) +set(ksmserver_xml ../ksmserver/org.kde.KSMServerInterface.xml) +else() qt5_add_dbus_interface(kworkspace_LIB_SRCS ${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.LogoutPrompt.xml logoutprompt_interface) qt5_add_dbus_interface(kworkspace_LIB_SRCS ${plasma-workspace_SOURCE_DIR}/startkde/plasma-session/org.kde.Startup.xml startup_interface) - qt5_add_dbus_interface(kworkspace_LIB_SRCS ${plasma-workspace_SOURCE_DIR}/startkde/plasma-session/org.kde.Shutdown.xml shutdown_interface) + qt5_add_dbus_interface(kworkspace_LIB_SRCS ${plasma-workspace_SOURCE_DIR}/startkde/plasma-shutdown/org.kde.Shutdown.xml shutdown_interface) +set(ksmserver_xml ${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.KSMServerInterface.xml) +set_source_files_properties(${KWIN_INTERFACE} PROPERTIES INCLUDE "interface_util.h") +endif() @@ -109,5 +109,5 @@ index a1869fae2..8de7a5c28 100644 +feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) +endif() -- -2.25.0 +2.25.1
[gentoo-commits] proj/kde:master commit in: kde-plasma/libkworkspace/files/, kde-plasma/libkworkspace/
commit: bf1fce5d328c12dba297b2f4be5274ebb1ac4475 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Feb 8 19:59:26 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Feb 8 20:01:51 2020 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=bf1fce5d kde-plasma/libkworkspace: Properly rebase on top of HEAD, fix DEPENDs Upstream commit 6253163af827e049d53b912494e04c1ea36d4e57 Thanks-to: Urmet Saar gmail.com> Closes: https://bugs.gentoo.org/707670 Package-Manager: Portage-2.3.87, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner gentoo.org> .../files/libkworkspace-5.18.80-standalone.patch| 17 + kde-plasma/libkworkspace/libkworkspace-.ebuild | 1 + 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/kde-plasma/libkworkspace/files/libkworkspace-5.18.80-standalone.patch b/kde-plasma/libkworkspace/files/libkworkspace-5.18.80-standalone.patch index 79c039afd5..28ee1c5851 100644 --- a/kde-plasma/libkworkspace/files/libkworkspace-5.18.80-standalone.patch +++ b/kde-plasma/libkworkspace/files/libkworkspace-5.18.80-standalone.patch @@ -1,14 +1,14 @@ -From 04f6a5fed3df9b1443159befd8e17ac6cd797916 Mon Sep 17 00:00:00 2001 +From 34cbb4d2482c0df07bf9cd376e30ed878ed44b9f Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Sun, 2 Feb 2020 18:29:57 +0100 Subject: [PATCH] libkworkspace: Allow standalone build --- - CMakeLists.txt | 70 +--- - 1 file changed, 66 insertions(+), 4 deletions(-) + CMakeLists.txt | 71 ++-- + 1 file changed, 67 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index a1869fae2..c7768ce17 100644 +index a1869fae2..8de7a5c28 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,3 +1,56 @@ @@ -39,7 +39,7 @@ index a1869fae2..c7768ce17 100644 +include(ECMMarkAsTest) +include(GenerateExportHeader) + -+find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS CoreAddons I18n Plasma WindowSystem) ++find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS CoreAddons I18n Init Plasma WindowSystem) + +find_package(KWinDBusInterface CONFIG REQUIRED) +find_package(KScreenLocker 5.13.80 REQUIRED) @@ -68,12 +68,13 @@ index a1869fae2..c7768ce17 100644 set(kworkspace_LIB_SRCS kdisplaymanager.cpp kworkspace.cpp -@@ -16,9 +69,17 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) +@@ -16,9 +69,18 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) qt5_add_dbus_interface(kworkspace_LIB_SRCS ${KINIT_DBUS_INTERFACES_DIR}/kf5_org.kde.KLauncher.xml klauncher_interface) qt5_add_dbus_interface(kworkspace_LIB_SRCS ${KSCREENLOCKER_DBUS_INTERFACES_DIR}/kf5_org.freedesktop.ScreenSaver.xml screenlocker_interface ) qt5_add_dbus_interface(kworkspace_LIB_SRCS ${KSCREENLOCKER_DBUS_INTERFACES_DIR}/org.kde.screensaver.xml kscreenlocker_interface ) +if(${CMAKE_SOURCE_DIR} STREQUAL ${libkworkspace_SOURCE_DIR}) +qt5_add_dbus_interface(kworkspace_LIB_SRCS ../ksmserver/org.kde.LogoutPrompt.xml logoutprompt_interface) ++qt5_add_dbus_interface(kworkspace_LIB_SRCS ../startkde/plasma-session/org.kde.Startup.xml startup_interface) +qt5_add_dbus_interface(kworkspace_LIB_SRCS ../startkde/plasma-session/org.kde.Shutdown.xml shutdown_interface) +set(ksmserver_xml ../ksmserver/org.kde.KSMServerInterface.xml) +else() @@ -86,7 +87,7 @@ index a1869fae2..c7768ce17 100644 set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/org.freedesktop.login1.Manager.xml" "${CMAKE_SOURCE_DIR}/data/interfaces/org.freedesktop.login1.Seat.xml" -@@ -34,11 +95,7 @@ list(APPEND kworkspace_LIB_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/login1_manager_inte +@@ -34,11 +96,7 @@ list(APPEND kworkspace_LIB_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/login1_manager_inte qt5_add_dbus_interface(kworkspace_LIB_SRCS "org.freedesktop.UPower.xml" upower_interface) qt5_add_dbus_interface(kworkspace_LIB_SRCS "org.freedesktop.ConsoleKit.Manager.xml" consolekit_manager_interface) @@ -98,7 +99,7 @@ index a1869fae2..c7768ce17 100644 qt5_add_dbus_interface( kworkspace_LIB_SRCS ${KWIN_INTERFACE} kwin_interface ) -@@ -105,3 +162,8 @@ if(BUILD_TESTING) +@@ -105,3 +163,8 @@ if(BUILD_TESTING) add_subdirectory(autotests) add_subdirectory(tests) endif() diff --git a/kde-plasma/libkworkspace/libkworkspace-.ebuild b/kde-plasma/libkworkspace/libkworkspace-.ebuild index b7b8b72673..66ba007363 100644 --- a/kde-plasma/libkworkspace/libkworkspace-.ebuild +++ b/kde-plasma/libkworkspace/libkworkspace-.ebuild @@ -20,6 +20,7 @@ IUSE="" COMMON_DEPEND=" >=kde-frameworks/kcoreaddons-${KFMIN}:5 >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kinit-${KFMIN}:5 >=kde-frameworks/kwindowsystem-${KFMIN}:5 >=kde-frameworks/plasma-${KFMIN}:5 >=kde-plasma/kscreenlocker-${PVCUT}:5
[gentoo-commits] proj/kde:master commit in: kde-plasma/libkworkspace/, kde-plasma/libkworkspace/files/
commit: 6be3f31e14f6df74b7c843d1d5535d3971620feb Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Feb 2 17:38:56 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Feb 2 18:04:56 2020 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=6be3f31e kde-plasma/libkworkspace: Rebase standalone-patch on top of HEAD Reported-by: Duncan <1i5t5.duncan cox.net> Closes: https://bugs.gentoo.org/707670 Package-Manager: Portage-2.3.87, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner gentoo.org> .../files/libkworkspace-5.18.80-standalone.patch | 112 + kde-plasma/libkworkspace/libkworkspace-.ebuild | 2 +- 2 files changed, 113 insertions(+), 1 deletion(-) diff --git a/kde-plasma/libkworkspace/files/libkworkspace-5.18.80-standalone.patch b/kde-plasma/libkworkspace/files/libkworkspace-5.18.80-standalone.patch new file mode 100644 index 00..79c039afd5 --- /dev/null +++ b/kde-plasma/libkworkspace/files/libkworkspace-5.18.80-standalone.patch @@ -0,0 +1,112 @@ +From 04f6a5fed3df9b1443159befd8e17ac6cd797916 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Sun, 2 Feb 2020 18:29:57 +0100 +Subject: [PATCH] libkworkspace: Allow standalone build + +--- + CMakeLists.txt | 70 +--- + 1 file changed, 66 insertions(+), 4 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a1869fae2..c7768ce17 100644 +--- a/CMakeLists.txt b/CMakeLists.txt +@@ -1,3 +1,56 @@ ++project(libkworkspace) ++ ++if(${CMAKE_SOURCE_DIR} STREQUAL ${libkworkspace_SOURCE_DIR}) ++set(PROJECT_VERSION "GENTOO_PV") ++set(PROJECT_VERSION_MAJOR 5) ++ ++cmake_minimum_required(VERSION 3.0) ++ ++set(QT_MIN_VERSION "5.12.0") ++set(KF5_MIN_VERSION "5.58.0") ++find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core DBus) ++find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE) ++set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) ++ ++include(KDEInstallDirs) ++include(KDECMakeSettings) ++include(KDECompilerSettings NO_POLICY_SCOPE) ++include(ECMMarkNonGuiExecutable) ++include(CMakePackageConfigHelpers) ++include(WriteBasicConfigVersionFile) ++include(CheckIncludeFiles) ++include(FeatureSummary) ++include(ECMQtDeclareLoggingCategory) ++include(KDEPackageAppTemplates) ++include(ECMMarkAsTest) ++include(GenerateExportHeader) ++ ++find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS CoreAddons I18n Plasma WindowSystem) ++ ++find_package(KWinDBusInterface CONFIG REQUIRED) ++find_package(KScreenLocker 5.13.80 REQUIRED) ++find_package(ScreenSaverDBusInterface CONFIG REQUIRED) ++ ++find_package(X11) ++set_package_properties(X11 PROPERTIES DESCRIPTION "X11 libraries" ++URL "http://www.x.org"; ++TYPE OPTIONAL ++PURPOSE "Required for X11 support") ++ ++if(X11_FOUND) ++find_package(Qt5X11Extras ${QT_MIN_VERSION} CONFIG REQUIRED) ++set(HAVE_X11 1) ++endif() ++ ++if(BUILD_TESTING) ++find_package(Qt5Test ${QT_MIN_VERSION} CONFIG REQUIRED) ++endif() ++ ++check_include_files(unistd.h HAVE_UNISTD_H) ++ ++configure_file(../config-workspace.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-workspace.h) ++configure_file(../config-X11.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-X11.h) ++endif() + + set(kworkspace_LIB_SRCS kdisplaymanager.cpp + kworkspace.cpp +@@ -16,9 +69,17 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) + qt5_add_dbus_interface(kworkspace_LIB_SRCS ${KINIT_DBUS_INTERFACES_DIR}/kf5_org.kde.KLauncher.xml klauncher_interface) + qt5_add_dbus_interface(kworkspace_LIB_SRCS ${KSCREENLOCKER_DBUS_INTERFACES_DIR}/kf5_org.freedesktop.ScreenSaver.xml screenlocker_interface ) + qt5_add_dbus_interface(kworkspace_LIB_SRCS ${KSCREENLOCKER_DBUS_INTERFACES_DIR}/org.kde.screensaver.xml kscreenlocker_interface ) ++if(${CMAKE_SOURCE_DIR} STREQUAL ${libkworkspace_SOURCE_DIR}) ++qt5_add_dbus_interface(kworkspace_LIB_SRCS ../ksmserver/org.kde.LogoutPrompt.xml logoutprompt_interface) ++qt5_add_dbus_interface(kworkspace_LIB_SRCS ../startkde/plasma-session/org.kde.Shutdown.xml shutdown_interface) ++set(ksmserver_xml ../ksmserver/org.kde.KSMServerInterface.xml) ++else() + qt5_add_dbus_interface(kworkspace_LIB_SRCS ${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.LogoutPrompt.xml logoutprompt_interface) + qt5_add_dbus_interface(kworkspace_LIB_SRCS ${plasma-workspace_SOURCE_DIR}/startkde/plasma-session/org.kde.Startup.xml startup_interface) + qt5_add_dbus_interface(kworkspace_LIB_SRCS ${plasma-workspace_SOURCE_DIR}/startkde/plasma-session/org.kde.Shutdown.xml shutdown_interface) ++set(ksmserver_xml ${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.KSMServerInterface.xml) ++set_source_files_properties(${KWIN_INTERFACE} PROPERTIES INCLUDE "interface_util.h") ++endif() + + set_source_
[gentoo-commits] proj/kde:master commit in: kde-plasma/libkworkspace/files/
commit: 4cbf9c0eed4462eb08fe0be20d64ea8807075fec Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Sep 17 15:39:34 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Sep 17 15:39:34 2019 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=4cbf9c0e kde-plasma/libkworkspace: Drop unused patch Package-Manager: Portage-2.3.76, Repoman-2.3.17 Signed-off-by: Andreas Sturmlechner gentoo.org> .../files/libkworkspace-5.14.90-standalone.patch | 96 -- 1 file changed, 96 deletions(-) diff --git a/kde-plasma/libkworkspace/files/libkworkspace-5.14.90-standalone.patch b/kde-plasma/libkworkspace/files/libkworkspace-5.14.90-standalone.patch deleted file mode 100644 index 78042c5d16..00 --- a/kde-plasma/libkworkspace/files/libkworkspace-5.14.90-standalone.patch +++ /dev/null @@ -1,96 +0,0 @@ -From 2e0a1d8f524d3bb645248787eed4532a250540fc Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Mon, 22 Oct 2018 10:35:10 +0200 -Subject: [PATCH] libkworkspace: Allow standalone build - - libkworkspace/CMakeLists.txt | 64 +--- - 1 file changed, 60 insertions(+), 4 deletions(-) - -diff --git a/libkworkspace/CMakeLists.txt b/libkworkspace/CMakeLists.txt -index f66013f9..4e58bd60 100644 a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,3 +1,59 @@ -+project(libkworkspace) -+ -+if(${CMAKE_SOURCE_DIR} STREQUAL ${libkworkspace_SOURCE_DIR}) -+set(PROJECT_VERSION "GENTOO_PV") -+set(PROJECT_VERSION_MAJOR 5) -+ -+cmake_minimum_required(VERSION 3.0) -+ -+set(QT_MIN_VERSION "5.11.0") -+set(KF5_MIN_VERSION "5.54.0") -+find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core DBus) -+find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE) -+set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) -+ -+include(KDEInstallDirs) -+include(KDECMakeSettings) -+include(KDECompilerSettings NO_POLICY_SCOPE) -+include(ECMMarkNonGuiExecutable) -+include(CMakePackageConfigHelpers) -+include(WriteBasicConfigVersionFile) -+include(CheckIncludeFiles) -+include(FeatureSummary) -+include(ECMQtDeclareLoggingCategory) -+include(KDEPackageAppTemplates) -+include(ECMMarkAsTest) -+include(GenerateExportHeader) -+ -+find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS CoreAddons I18n Plasma WindowSystem) -+ -+find_package(KWinDBusInterface CONFIG REQUIRED) -+ -+find_package(X11) -+set_package_properties(X11 PROPERTIES DESCRIPTION "X11 libraries" -+URL "http://www.x.org"; -+TYPE OPTIONAL -+PURPOSE "Required for X11 support") -+ -+if(X11_FOUND) -+find_package(Qt5X11Extras ${QT_MIN_VERSION} CONFIG REQUIRED) -+set(HAVE_X11 1) -+endif() -+ -+if(BUILD_TESTING) -+find_package(Qt5Test ${QT_MIN_VERSION} CONFIG REQUIRED) -+endif() -+ -+check_include_files(unistd.h HAVE_UNISTD_H) -+ -+configure_file(../config-workspace.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-workspace.h) -+configure_file(../config-X11.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-X11.h) -+ -+set(ksmserver_xml ../ksmserver/org.kde.KSMServerInterface.xml) -+else() -+set(ksmserver_xml ${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.KSMServerInterface.xml) -+set_source_files_properties(${KWIN_INTERFACE} PROPERTIES INCLUDE "interface_util.h") -+endif() - - set(kworkspace_LIB_SRCS kdisplaymanager.cpp - kworkspace.cpp -@@ -9,11 +65,7 @@ remove_definitions(-DQT_NO_CAST_FROM_BYTEARRAY) - remove_definitions(-DQT_NO_CAST_TO_ASCII) - - --set(ksmserver_xml ${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.KSMServerInterface.xml) - qt5_add_dbus_interface( kworkspace_LIB_SRCS ${ksmserver_xml} ksmserver_interface ) -- --set_source_files_properties(${KWIN_INTERFACE} PROPERTIES INCLUDE "interface_util.h") -- - qt5_add_dbus_interface( kworkspace_LIB_SRCS ${KWIN_INTERFACE} kwin_interface ) - - -@@ -77,3 +129,7 @@ install(EXPORT libkworkspaceLibraryTargets - if(BUILD_TESTING) - add_subdirectory(autotests) - endif() -+ -+if ("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}") -+feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) -+endif() --- -2.19.1 -
[gentoo-commits] proj/kde:master commit in: kde-plasma/libkworkspace/files/
commit: 9757d81546d349739813297ce7f66225c964c6aa Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Jul 24 11:41:11 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Jul 24 11:43:45 2019 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=9757d815 kde-plasma/libkworkspace: Fix libkworspace standalone.patch Thanks-to: Urmet Saar gmail.com> Closes: https://bugs.gentoo.org/690098 Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: Andreas Sturmlechner gentoo.org> .../files/libkworkspace-5.16.80-standalone.patch| 13 +++-- 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/kde-plasma/libkworkspace/files/libkworkspace-5.16.80-standalone.patch b/kde-plasma/libkworkspace/files/libkworkspace-5.16.80-standalone.patch index d27bb3b275..ed0d29d759 100644 --- a/kde-plasma/libkworkspace/files/libkworkspace-5.16.80-standalone.patch +++ b/kde-plasma/libkworkspace/files/libkworkspace-5.16.80-standalone.patch @@ -1,21 +1,21 @@ -From 74087723f0738f4a4a3a60ec72480e8bc4f1b53c Mon Sep 17 00:00:00 2001 +From 7e2bf26af99f5b242b2e4bb2ee5e62914d5d5861 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Wed, 10 Jul 2019 11:38:44 +0200 Subject: [PATCH] libkworkspace: Allow standalone build --- - libkworkspace/CMakeLists.txt | 69 +--- - 1 file changed, 65 insertions(+), 4 deletions(-) + CMakeLists.txt | 70 +--- + 1 file changed, 66 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3c4c47870..cd41a54ce 100644 +index 3c4c47870..53bc780b5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,3 +1,56 @@ +project(libkworkspace) + +if(${CMAKE_SOURCE_DIR} STREQUAL ${libkworkspace_SOURCE_DIR}) -+set(PROJECT_VERSION "5.16.80") ++set(PROJECT_VERSION "GENTOO_PV") +set(PROJECT_VERSION_MAJOR 5) + +cmake_minimum_required(VERSION 3.0) @@ -97,12 +97,13 @@ index 3c4c47870..cd41a54ce 100644 qt5_add_dbus_interface( kworkspace_LIB_SRCS ${KWIN_INTERFACE} kwin_interface ) -@@ -101,3 +158,7 @@ if(BUILD_TESTING) +@@ -101,3 +158,8 @@ if(BUILD_TESTING) add_subdirectory(autotests) add_subdirectory(tests) endif() + +if ("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}") ++install( FILES sessionmanagementbackend.h DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kworkspace5 COMPONENT Devel ) +feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) +endif() --
[gentoo-commits] proj/kde:master commit in: kde-plasma/libkworkspace/files/
commit: ba84c4bca4439ae1bb37a797130c52c19b9de329 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Jul 15 14:52:24 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Jul 15 14:52:24 2019 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=ba84c4bc kde-plasma/libkworkspace: Rebase standalone-patch on top of HEAD Bug: https://bugs.gentoo.org/689466 Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: Andreas Sturmlechner gentoo.org> .../files/libkworkspace-5.16.80-standalone.patch | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/kde-plasma/libkworkspace/files/libkworkspace-5.16.80-standalone.patch b/kde-plasma/libkworkspace/files/libkworkspace-5.16.80-standalone.patch index 6c67a049a2..d27bb3b275 100644 --- a/kde-plasma/libkworkspace/files/libkworkspace-5.16.80-standalone.patch +++ b/kde-plasma/libkworkspace/files/libkworkspace-5.16.80-standalone.patch @@ -1,4 +1,4 @@ -From d3413c9a69b186fb20d8b4caf5f48e7d372c5294 Mon Sep 17 00:00:00 2001 +From 74087723f0738f4a4a3a60ec72480e8bc4f1b53c Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Wed, 10 Jul 2019 11:38:44 +0200 Subject: [PATCH] libkworkspace: Allow standalone build @@ -7,10 +7,10 @@ Subject: [PATCH] libkworkspace: Allow standalone build libkworkspace/CMakeLists.txt | 69 +--- 1 file changed, 65 insertions(+), 4 deletions(-) -diff --git a/libkworkspace/CMakeLists.txt b/libkworkspace/CMakeLists.txt -index 94576213e..27d46f83a 100644 a/libkworkspace/CMakeLists.txt -+++ b/libkworkspace/CMakeLists.txt +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3c4c47870..cd41a54ce 100644 +--- a/CMakeLists.txt b/CMakeLists.txt @@ -1,3 +1,56 @@ +project(libkworkspace) + @@ -74,11 +74,11 @@ index 94576213e..27d46f83a 100644 qt5_add_dbus_interface(kworkspace_LIB_SRCS ${KSCREENLOCKER_DBUS_INTERFACES_DIR}/org.kde.screensaver.xml kscreenlocker_interface ) +if(${CMAKE_SOURCE_DIR} STREQUAL ${libkworkspace_SOURCE_DIR}) +qt5_add_dbus_interface(kworkspace_LIB_SRCS ../ksmserver/org.kde.LogoutPrompt.xml logoutprompt_interface) -+qt5_add_dbus_interface(kworkspace_LIB_SRCS ../ksmserver/org.kde.Shutdown.xml shutdown_interface) ++qt5_add_dbus_interface(kworkspace_LIB_SRCS ../startkde/plasma-session/org.kde.Shutdown.xml shutdown_interface) +set(ksmserver_xml ../ksmserver/org.kde.KSMServerInterface.xml) +else() qt5_add_dbus_interface(kworkspace_LIB_SRCS ${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.LogoutPrompt.xml logoutprompt_interface) - qt5_add_dbus_interface(kworkspace_LIB_SRCS ${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.Shutdown.xml shutdown_interface) + qt5_add_dbus_interface(kworkspace_LIB_SRCS ${plasma-workspace_SOURCE_DIR}/startkde/plasma-session/org.kde.Shutdown.xml shutdown_interface) +set(ksmserver_xml ${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.KSMServerInterface.xml) +set_source_files_properties(${KWIN_INTERFACE} PROPERTIES INCLUDE "interface_util.h") +endif()
[gentoo-commits] proj/kde:master commit in: kde-plasma/libkworkspace/files/, kde-plasma/libkworkspace/
commit: c7314eb2cdafb3c56892c65ad09b1ac9a01ecd1b Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Jul 10 10:29:53 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Jul 10 10:29:53 2019 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=c7314eb2 kde-plasma/libkworkspace: Rebase standalone-patch on top of HEAD Bug: https://bugs.gentoo.org/689466 Package-Manager: Portage-2.3.68, Repoman-2.3.16 Signed-off-by: Andreas Sturmlechner gentoo.org> .../files/libkworkspace-5.16.80-standalone.patch | 110 + kde-plasma/libkworkspace/libkworkspace-.ebuild | 3 +- 2 files changed, 112 insertions(+), 1 deletion(-) diff --git a/kde-plasma/libkworkspace/files/libkworkspace-5.16.80-standalone.patch b/kde-plasma/libkworkspace/files/libkworkspace-5.16.80-standalone.patch new file mode 100644 index 00..6c67a049a2 --- /dev/null +++ b/kde-plasma/libkworkspace/files/libkworkspace-5.16.80-standalone.patch @@ -0,0 +1,110 @@ +From d3413c9a69b186fb20d8b4caf5f48e7d372c5294 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Wed, 10 Jul 2019 11:38:44 +0200 +Subject: [PATCH] libkworkspace: Allow standalone build + +--- + libkworkspace/CMakeLists.txt | 69 +--- + 1 file changed, 65 insertions(+), 4 deletions(-) + +diff --git a/libkworkspace/CMakeLists.txt b/libkworkspace/CMakeLists.txt +index 94576213e..27d46f83a 100644 +--- a/libkworkspace/CMakeLists.txt b/libkworkspace/CMakeLists.txt +@@ -1,3 +1,56 @@ ++project(libkworkspace) ++ ++if(${CMAKE_SOURCE_DIR} STREQUAL ${libkworkspace_SOURCE_DIR}) ++set(PROJECT_VERSION "5.16.80") ++set(PROJECT_VERSION_MAJOR 5) ++ ++cmake_minimum_required(VERSION 3.0) ++ ++set(QT_MIN_VERSION "5.12.0") ++set(KF5_MIN_VERSION "5.58.0") ++find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core DBus) ++find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE) ++set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) ++ ++include(KDEInstallDirs) ++include(KDECMakeSettings) ++include(KDECompilerSettings NO_POLICY_SCOPE) ++include(ECMMarkNonGuiExecutable) ++include(CMakePackageConfigHelpers) ++include(WriteBasicConfigVersionFile) ++include(CheckIncludeFiles) ++include(FeatureSummary) ++include(ECMQtDeclareLoggingCategory) ++include(KDEPackageAppTemplates) ++include(ECMMarkAsTest) ++include(GenerateExportHeader) ++ ++find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS CoreAddons I18n Plasma WindowSystem) ++ ++find_package(KWinDBusInterface CONFIG REQUIRED) ++find_package(KScreenLocker 5.13.80 REQUIRED) ++find_package(ScreenSaverDBusInterface CONFIG REQUIRED) ++ ++find_package(X11) ++set_package_properties(X11 PROPERTIES DESCRIPTION "X11 libraries" ++URL "http://www.x.org"; ++TYPE OPTIONAL ++PURPOSE "Required for X11 support") ++ ++if(X11_FOUND) ++find_package(Qt5X11Extras ${QT_MIN_VERSION} CONFIG REQUIRED) ++set(HAVE_X11 1) ++endif() ++ ++if(BUILD_TESTING) ++find_package(Qt5Test ${QT_MIN_VERSION} CONFIG REQUIRED) ++endif() ++ ++check_include_files(unistd.h HAVE_UNISTD_H) ++ ++configure_file(../config-workspace.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-workspace.h) ++configure_file(../config-X11.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-X11.h) ++endif() + + set(kworkspace_LIB_SRCS kdisplaymanager.cpp + kworkspace.cpp +@@ -14,8 +67,16 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) + + qt5_add_dbus_interface(kworkspace_LIB_SRCS ${KSCREENLOCKER_DBUS_INTERFACES_DIR}/kf5_org.freedesktop.ScreenSaver.xml screenlocker_interface ) + qt5_add_dbus_interface(kworkspace_LIB_SRCS ${KSCREENLOCKER_DBUS_INTERFACES_DIR}/org.kde.screensaver.xml kscreenlocker_interface ) ++if(${CMAKE_SOURCE_DIR} STREQUAL ${libkworkspace_SOURCE_DIR}) ++qt5_add_dbus_interface(kworkspace_LIB_SRCS ../ksmserver/org.kde.LogoutPrompt.xml logoutprompt_interface) ++qt5_add_dbus_interface(kworkspace_LIB_SRCS ../ksmserver/org.kde.Shutdown.xml shutdown_interface) ++set(ksmserver_xml ../ksmserver/org.kde.KSMServerInterface.xml) ++else() + qt5_add_dbus_interface(kworkspace_LIB_SRCS ${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.LogoutPrompt.xml logoutprompt_interface) + qt5_add_dbus_interface(kworkspace_LIB_SRCS ${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.Shutdown.xml shutdown_interface) ++set(ksmserver_xml ${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.KSMServerInterface.xml) ++set_source_files_properties(${KWIN_INTERFACE} PROPERTIES INCLUDE "interface_util.h") ++endif() + + set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/org.freedesktop.login1.Manager.xml" + "${CMAKE_SOURCE_DIR}/data/interfaces/org.freedesktop.login1.Seat.xml" +@@ -31,11 +92,7 @@ list(APPEND kworkspace_LIB_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/l
[gentoo-commits] proj/kde:master commit in: kde-plasma/libkworkspace/files/, kde-plasma/libkworkspace/
commit: 49c3daab8f8550aacb7b4267c53351438f82b5dc Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Jan 13 12:15:58 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Jan 13 12:15:58 2019 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=49c3daab kde-plasma/libkworkspace: Fix standalone patch to 5.15 min versions Package-Manager: Portage-2.3.55, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> 2-standalone.patch => libkworkspace-5.14.90-standalone.patch} | 4 ++-- kde-plasma/libkworkspace/libkworkspace-.ebuild| 8 ++-- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/kde-plasma/libkworkspace/files/libkworkspace-5.14.2-standalone.patch b/kde-plasma/libkworkspace/files/libkworkspace-5.14.90-standalone.patch similarity index 97% rename from kde-plasma/libkworkspace/files/libkworkspace-5.14.2-standalone.patch rename to kde-plasma/libkworkspace/files/libkworkspace-5.14.90-standalone.patch index f2332f7261..78042c5d16 100644 --- a/kde-plasma/libkworkspace/files/libkworkspace-5.14.2-standalone.patch +++ b/kde-plasma/libkworkspace/files/libkworkspace-5.14.90-standalone.patch @@ -20,8 +20,8 @@ index f66013f9..4e58bd60 100644 + +cmake_minimum_required(VERSION 3.0) + -+set(QT_MIN_VERSION "GENTOO_QT_MINIMAL") -+set(KF5_MIN_VERSION "GENTOO_KF5_MINIMAL") ++set(QT_MIN_VERSION "5.11.0") ++set(KF5_MIN_VERSION "5.54.0") +find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core DBus) +find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE) +set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) diff --git a/kde-plasma/libkworkspace/libkworkspace-.ebuild b/kde-plasma/libkworkspace/libkworkspace-.ebuild index 59ede30087..7ae1f21cce 100644 --- a/kde-plasma/libkworkspace/libkworkspace-.ebuild +++ b/kde-plasma/libkworkspace/libkworkspace-.ebuild @@ -3,8 +3,6 @@ EAPI=6 -FRAMEWORKS_MINIMAL="5.50.0" -QT_MINIMAL="5.11.1" KDE_TEST="true" KMNAME="plasma-workspace" inherit kde5 @@ -36,7 +34,7 @@ RDEPEND="${COMMON_DEPEND} S="${S}/${PN}" -PATCHES=( "${FILESDIR}/${PN}-5.14.2-standalone.patch" ) +PATCHES=( "${FILESDIR}/${PN}-5.14.90-standalone.patch" ) src_prepare() { # delete colliding libkworkspace translations, let kde5_src_prepare do its magic @@ -52,8 +50,6 @@ src_prepare() { _EOF_ fi - sed -e "/set/s/GENTOO_PV/${PV}/" \ - -e "/set/s/GENTOO_QT_MINIMAL/${QT_MINIMAL}/" \ - -e "/set/s/GENTOO_KF5_MINIMAL/${FRAMEWORKS_MINIMAL}/" \ + sed -e "/set/s/GENTOO_PV/$(ver_cut 1-3)/" \ -i CMakeLists.txt || die "Failed to prepare CMakeLists.txt" }
[gentoo-commits] proj/kde:master commit in: kde-plasma/libkworkspace/
commit: fe8e6dcbe6e07031c9445017d99f7bda1bf655de Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Oct 24 17:49:37 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Oct 24 18:23:38 2018 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=fe8e6dcb kde-plasma/libkworkspace: Add kde-plasma/kwin to DEPEND Closes: https://bugs.gentoo.org/669524 Signed-off-by: Andreas Sturmlechner gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 kde-plasma/libkworkspace/libkworkspace-5.14.49..ebuild | 7 +-- kde-plasma/libkworkspace/libkworkspace-.ebuild | 7 +-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/kde-plasma/libkworkspace/libkworkspace-5.14.49..ebuild b/kde-plasma/libkworkspace/libkworkspace-5.14.49..ebuild index c4dc801b96..ec50706c5a 100644 --- a/kde-plasma/libkworkspace/libkworkspace-5.14.49..ebuild +++ b/kde-plasma/libkworkspace/libkworkspace-5.14.49..ebuild @@ -14,7 +14,7 @@ DESCRIPTION="Workspace library to interact with the Plasma session manager" KEYWORDS="" IUSE="" -DEPEND=" +COMMON_DEPEND=" $(add_frameworks_dep kcoreaddons) $(add_frameworks_dep ki18n) $(add_frameworks_dep kwindowsystem) @@ -26,7 +26,10 @@ DEPEND=" x11-libs/libX11 x11-libs/libXau " -RDEPEND="${DEPEND} +DEPEND="${COMMON_DEPEND} + $(add_plasma_dep kwin) +" +RDEPEND="${COMMON_DEPEND} !kde-plasma/libkworkspace:4 !
[gentoo-commits] proj/kde:master commit in: kde-plasma/libkworkspace/
commit: 641a3bce8acf305162cc9ce183eddbc1220efe6e Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Oct 22 20:03:54 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Oct 22 20:23:47 2018 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=641a3bce kde-plasma/libkworkspace: Fix buildsys deps Signed-off-by: Andreas Sturmlechner gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 kde-plasma/libkworkspace/libkworkspace-5.14.49..ebuild | 2 ++ kde-plasma/libkworkspace/libkworkspace-.ebuild | 2 ++ 2 files changed, 4 insertions(+) diff --git a/kde-plasma/libkworkspace/libkworkspace-5.14.49..ebuild b/kde-plasma/libkworkspace/libkworkspace-5.14.49..ebuild index f2e5f9b894..c4dc801b96 100644 --- a/kde-plasma/libkworkspace/libkworkspace-5.14.49..ebuild +++ b/kde-plasma/libkworkspace/libkworkspace-5.14.49..ebuild @@ -3,6 +3,8 @@ EAPI=6 +FRAMEWORKS_MINIMAL="5.50.0" +QT_MINIMAL="5.11.1" KDE_TEST="true" KMNAME="plasma-workspace" inherit kde5 diff --git a/kde-plasma/libkworkspace/libkworkspace-.ebuild b/kde-plasma/libkworkspace/libkworkspace-.ebuild index f2e5f9b894..c4dc801b96 100644 --- a/kde-plasma/libkworkspace/libkworkspace-.ebuild +++ b/kde-plasma/libkworkspace/libkworkspace-.ebuild @@ -3,6 +3,8 @@ EAPI=6 +FRAMEWORKS_MINIMAL="5.50.0" +QT_MINIMAL="5.11.1" KDE_TEST="true" KMNAME="plasma-workspace" inherit kde5
[gentoo-commits] proj/kde:master commit in: kde-plasma/libkworkspace/, kde-plasma/libkworkspace/files/
commit: fb911c3477d846c25f47e37f91deeb2e86e1ef84 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Oct 22 09:04:35 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Oct 22 18:06:12 2018 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=fb911c34 kde-plasma/libkworkspace: New package (split from plasma-workspace) In Plasma 5.13, kde-cli-tools began to depend on libkworkspace for Wayland support in KCMs. Besides making circular dep workarounds necessary, this also meant a considerable chunk of Plasma added to the kde-cli-tools depgraph, which is used by applications even if not having a Plasma desktop installed. Revdeps already search for libkworkspace independently, which means no revdep patching is required to support this split package. Signed-off-by: Andreas Sturmlechner gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 .../files/libkworkspace-5.14.2-standalone.patch| 96 ++ .../libkworkspace-5.14.49..ebuild | 54 kde-plasma/libkworkspace/libkworkspace-.ebuild | 54 kde-plasma/libkworkspace/metadata.xml | 8 ++ 4 files changed, 212 insertions(+) diff --git a/kde-plasma/libkworkspace/files/libkworkspace-5.14.2-standalone.patch b/kde-plasma/libkworkspace/files/libkworkspace-5.14.2-standalone.patch new file mode 100644 index 00..f2332f7261 --- /dev/null +++ b/kde-plasma/libkworkspace/files/libkworkspace-5.14.2-standalone.patch @@ -0,0 +1,96 @@ +From 2e0a1d8f524d3bb645248787eed4532a250540fc Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Mon, 22 Oct 2018 10:35:10 +0200 +Subject: [PATCH] libkworkspace: Allow standalone build + +--- + libkworkspace/CMakeLists.txt | 64 +--- + 1 file changed, 60 insertions(+), 4 deletions(-) + +diff --git a/libkworkspace/CMakeLists.txt b/libkworkspace/CMakeLists.txt +index f66013f9..4e58bd60 100644 +--- a/CMakeLists.txt b/CMakeLists.txt +@@ -1,3 +1,59 @@ ++project(libkworkspace) ++ ++if(${CMAKE_SOURCE_DIR} STREQUAL ${libkworkspace_SOURCE_DIR}) ++set(PROJECT_VERSION "GENTOO_PV") ++set(PROJECT_VERSION_MAJOR 5) ++ ++cmake_minimum_required(VERSION 3.0) ++ ++set(QT_MIN_VERSION "GENTOO_QT_MINIMAL") ++set(KF5_MIN_VERSION "GENTOO_KF5_MINIMAL") ++find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core DBus) ++find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE) ++set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) ++ ++include(KDEInstallDirs) ++include(KDECMakeSettings) ++include(KDECompilerSettings NO_POLICY_SCOPE) ++include(ECMMarkNonGuiExecutable) ++include(CMakePackageConfigHelpers) ++include(WriteBasicConfigVersionFile) ++include(CheckIncludeFiles) ++include(FeatureSummary) ++include(ECMQtDeclareLoggingCategory) ++include(KDEPackageAppTemplates) ++include(ECMMarkAsTest) ++include(GenerateExportHeader) ++ ++find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS CoreAddons I18n Plasma WindowSystem) ++ ++find_package(KWinDBusInterface CONFIG REQUIRED) ++ ++find_package(X11) ++set_package_properties(X11 PROPERTIES DESCRIPTION "X11 libraries" ++URL "http://www.x.org"; ++TYPE OPTIONAL ++PURPOSE "Required for X11 support") ++ ++if(X11_FOUND) ++find_package(Qt5X11Extras ${QT_MIN_VERSION} CONFIG REQUIRED) ++set(HAVE_X11 1) ++endif() ++ ++if(BUILD_TESTING) ++find_package(Qt5Test ${QT_MIN_VERSION} CONFIG REQUIRED) ++endif() ++ ++check_include_files(unistd.h HAVE_UNISTD_H) ++ ++configure_file(../config-workspace.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-workspace.h) ++configure_file(../config-X11.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-X11.h) ++ ++set(ksmserver_xml ../ksmserver/org.kde.KSMServerInterface.xml) ++else() ++set(ksmserver_xml ${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.KSMServerInterface.xml) ++set_source_files_properties(${KWIN_INTERFACE} PROPERTIES INCLUDE "interface_util.h") ++endif() + + set(kworkspace_LIB_SRCS kdisplaymanager.cpp + kworkspace.cpp +@@ -9,11 +65,7 @@ remove_definitions(-DQT_NO_CAST_FROM_BYTEARRAY) + remove_definitions(-DQT_NO_CAST_TO_ASCII) + + +-set(ksmserver_xml ${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.KSMServerInterface.xml) + qt5_add_dbus_interface( kworkspace_LIB_SRCS ${ksmserver_xml} ksmserver_interface ) +- +-set_source_files_properties(${KWIN_INTERFACE} PROPERTIES INCLUDE "interface_util.h") +- + qt5_add_dbus_interface( kworkspace_LIB_SRCS ${KWIN_INTERFACE} kwin_interface ) + + +@@ -77,3 +129,7 @@ install(EXPORT libkworkspaceLibraryTargets + if(BUILD_TESTING) + add_subdirectory(autotests) + endif() ++ ++if ("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}") ++feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) ++endif() +-- +