diff options
Diffstat (limited to 'kde-plasma/libkworkspace')
-rw-r--r-- | kde-plasma/libkworkspace/Manifest | 8 | ||||
-rw-r--r-- | kde-plasma/libkworkspace/files/libkworkspace-5.19.80-standalone.patch (renamed from kde-plasma/libkworkspace/files/libkworkspace-5.16.80-standalone.patch) | 39 | ||||
-rw-r--r-- | kde-plasma/libkworkspace/libkworkspace-5.19.5.ebuild | 2 | ||||
-rw-r--r-- | kde-plasma/libkworkspace/libkworkspace-5.20.3.ebuild (renamed from kde-plasma/libkworkspace/libkworkspace-5.18.5.ebuild) | 9 |
4 files changed, 28 insertions, 30 deletions
diff --git a/kde-plasma/libkworkspace/Manifest b/kde-plasma/libkworkspace/Manifest index 0700e61fabd0..c471d1207073 100644 --- a/kde-plasma/libkworkspace/Manifest +++ b/kde-plasma/libkworkspace/Manifest @@ -1,7 +1,7 @@ -AUX libkworkspace-5.16.80-standalone.patch 4815 BLAKE2B 8269cba2d49020e643ae7aca211d9ecf2c38a8abf5c87cdb2185c80cb67824be1a3b79da67cd267e917c8d9ee3b67eef37b58b2845a6383d98c322b3ca90e4e9 SHA512 20bc3f75521e548311b2126ce40e59ce61e0beb85a0ce643e2b31e3a82ce3deb578e2b4049f5524d81129c4872661303bff9011623f0d8436358b3790115efa5 AUX libkworkspace-5.18.80-standalone.patch 5188 BLAKE2B 5635ef59e36581aee87689dcc3b2b9acc66eb37de12b084f249c6f80ae18d727b830cdf7b2e9795ad4ecb956cce431ed25b4ff0b9b3be02a09c835f182f49fdb SHA512 02b36fc91b10b0dc38cd57f3e138cfab51994a31edf73727762ec92a6e8fd1d786724cc3591956d337f6cc46b87596004909503e0a21a52115828b594bb0cca4 -DIST plasma-workspace-5.18.5.tar.xz 5696256 BLAKE2B 7aaf19ff75eb796bbd687e6c63b9703431ecc567bc52c2c173718d45b3946b22572b3a097f7fb7e9726cedcb98cfbb2f20c580efefa4d9cb9d4f2473abeac636 SHA512 870cf89649d9498831f4ef9b21d3c07504b7fc7b09b95dd7e0a1d356b41fbfceed1c4f27aa258bcf1e23cfe915d31701c155325fcd4944f9cc957a287ebc1ee2 +AUX libkworkspace-5.19.80-standalone.patch 4989 BLAKE2B 6487cb2071b4ac026966d23cfe5dd6ca8e3ddab77cffb08d51b5266e3a9ea16f74a90d987fc1b86891a65b40bcbacc3fd9dc865c79e08206cd0ac67cf7bb82cb SHA512 d86365f59cbd20979c9f7412f106c34eec26d3ce0361269e192c0310d3107fb2486eebc1fb7fc7bd331887a883ae5722259467b4edb0d23cb4355ab472f93c7f DIST plasma-workspace-5.19.5.tar.xz 5682264 BLAKE2B 435ea4c73fe50fb78911efb607f1a22ce6fe4a8f089b90b44374e7932d4f0111069dbce0168eedb61de09affdae3549563365bf85b4bbafb33fc69fad6b343e8 SHA512 4cab64c1f817f391a61ae15e37bf1fc936ddd3fb3b234e281a3e5750b67dab05c1c156789446096cbde719bf972e876757c1c5ae78adde4e85f3591fa8df5df9 -EBUILD libkworkspace-5.18.5.ebuild 1454 BLAKE2B a885654deeaf4d2fec1735b188f42d48f5660df726f69e27ab721fba9f4abc01b5f01e18dca2ba68e2632cfcc2916a177940dc8190420ed6646b2bb685de8a44 SHA512 544539081c4274d1c58728a8c35ee312915ba61f3687c757c4acdc71d80ef52e1517e6f80a3862a2eeae7af69ec95f3ea89e425022e0f36c9f1f5af5e34bb23f -EBUILD libkworkspace-5.19.5.ebuild 1492 BLAKE2B c9f03bae3d4a41d430bf626a0255b55413fce4c56d783f6a3c978e07dc5f56389fe44ae3c6269884b7a170d0a76310401dfc30c6e0c621516554888c1c2adfaf SHA512 394905164db563e9d5d4240988fa6133572c5efa9641861287600dfae2d2e3995c504e67a060c5dce1de5333758c2270036736f97979ca314972335943e1fcae +DIST plasma-workspace-5.20.3.tar.xz 9031572 BLAKE2B 242286eef9d15b9dacec0dca3a7899c538141490611f932e0ebff59e1ea7a54cbad56e3bcad6e4a720b4f7610de2fc0e128288c3fe3d2b9e8255ffe16e0b86fa SHA512 c1daa19834ea7997a8e44fcb6ce9745d5bac56a0a4d99320e1e3e42e9cb5489aa36887e3c2bd8e385644d555d355211c9dba6c40edf2471478566c531a2d9c89 +EBUILD libkworkspace-5.19.5.ebuild 1489 BLAKE2B 53d3846cd030eea66ecc98dd65d644e5ea5898e985ed9f16e33f1de96be534d0c8f917ba62e84e284be001766acfcb2505988bd0c2f30cc13c2afef186c5904d SHA512 989aeacfcb48f10857cefe15a0959077a41f415a2bae4936f0e01bb219b3b3350cf70a16dccc28b405372992eb1b1c996f20600631af9a4cc5c54e20854b3a1b +EBUILD libkworkspace-5.20.3.ebuild 1492 BLAKE2B 1d9776d1321806f785b3a1d992ae195425b41f0ee783a9c2a8078811b4cd3ef273f91bc1e89f49664f15db4ff020b1537713305ff55cb0135b4fabe2b6ebe03a SHA512 c7def611e9eab3457d0046b26711b022798b48393bfe5dd463dc456af510a6ea62a8536af203bb1047ab59f5c60b47841ecda66fddb942dd11fa7ac36b3e24cd MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 diff --git a/kde-plasma/libkworkspace/files/libkworkspace-5.16.80-standalone.patch b/kde-plasma/libkworkspace/files/libkworkspace-5.19.80-standalone.patch index ed0d29d759f9..8c8213d002dc 100644 --- a/kde-plasma/libkworkspace/files/libkworkspace-5.16.80-standalone.patch +++ b/kde-plasma/libkworkspace/files/libkworkspace-5.19.80-standalone.patch @@ -1,14 +1,14 @@ -From 7e2bf26af99f5b242b2e4bb2ee5e62914d5d5861 Mon Sep 17 00:00:00 2001 +From 30d75ef4b3e75155e78924aa82aa9f368bb86f4f Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Wed, 10 Jul 2019 11:38:44 +0200 +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(-) + libkworkspace/CMakeLists.txt | 67 +++++++++++++++++++++++++++++++++++- + 1 file changed, 66 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3c4c47870..53bc780b5 100644 +index 7ba097a6e..66f70c0b6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,3 +1,56 @@ @@ -20,8 +20,8 @@ index 3c4c47870..53bc780b5 100644 + + cmake_minimum_required(VERSION 3.0) + -+ set(QT_MIN_VERSION "5.12.0") -+ set(KF5_MIN_VERSION "5.58.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}) @@ -39,7 +39,7 @@ index 3c4c47870..53bc780b5 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,36 +68,33 @@ index 3c4c47870..53bc780b5 100644 set(kworkspace_LIB_SRCS kdisplaymanager.cpp kworkspace.cpp -@@ -14,8 +67,16 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) - +@@ -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) ++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.Shutdown.xml shutdown_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) -+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}/login1_manager_inte +@@ -34,7 +95,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) -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 ) - -@@ -101,3 +158,8 @@ if(BUILD_TESTING) + add_library(kworkspace ${kworkspace_LIB_SRCS}) +@@ -100,3 +160,8 @@ if(BUILD_TESTING) add_subdirectory(autotests) add_subdirectory(tests) endif() @@ -107,5 +104,5 @@ index 3c4c47870..53bc780b5 100644 + feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) +endif() -- -2.22.0 +2.27.0 diff --git a/kde-plasma/libkworkspace/libkworkspace-5.19.5.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.19.5.ebuild index 56426b1fa6a7..ccb11d117c2b 100644 --- a/kde-plasma/libkworkspace/libkworkspace-5.19.5.ebuild +++ b/kde-plasma/libkworkspace/libkworkspace-5.19.5.ebuild @@ -14,7 +14,7 @@ DESCRIPTION="Workspace library to interact with the Plasma session manager" LICENSE="GPL-2" # TODO: CHECK SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +KEYWORDS="amd64 ~arm arm64 ~ppc64 x86" IUSE="" COMMON_DEPEND=" diff --git a/kde-plasma/libkworkspace/libkworkspace-5.18.5.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.20.3.ebuild index cce15eca35b2..fa283d1fa3ce 100644 --- a/kde-plasma/libkworkspace/libkworkspace-5.18.5.ebuild +++ b/kde-plasma/libkworkspace/libkworkspace-5.20.3.ebuild @@ -5,16 +5,16 @@ EAPI=7 ECM_TEST="true" KDE_ORG_NAME="plasma-workspace" -KFMIN=5.66.0 +KFMIN=5.74.0 PVCUT=$(ver_cut 1-3) -QTMIN=5.12.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" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" IUSE="" COMMON_DEPEND=" @@ -22,6 +22,7 @@ COMMON_DEPEND=" >=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 @@ -39,7 +40,7 @@ RDEPEND="${COMMON_DEPEND} S="${S}/${PN}" -PATCHES=( "${FILESDIR}/${PN}-5.16.80-standalone.patch" ) +PATCHES=( "${FILESDIR}/${PN}-5.19.80-standalone.patch" ) src_prepare() { # delete colliding libkworkspace translations, let ecm_src_prepare do its magic |