* [gentoo-commits] proj/kde:master commit in: kde-plasma/libkworkspace/files/, kde-plasma/libkworkspace/
@ 2019-01-13 12:16 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2019-01-13 12:16 UTC (permalink / raw
To: gentoo-commits
commit: 49c3daab8f8550aacb7b4267c53351438f82b5dc
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 13 12:15:58 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jan 13 12:15:58 2019 +0000
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 <asturm <AT> gentoo.org>
....2-standalone.patch => libkworkspace-5.14.90-standalone.patch} | 4 ++--
kde-plasma/libkworkspace/libkworkspace-9999.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-9999.ebuild b/kde-plasma/libkworkspace/libkworkspace-9999.ebuild
index 59ede30087..7ae1f21cce 100644
--- a/kde-plasma/libkworkspace/libkworkspace-9999.ebuild
+++ b/kde-plasma/libkworkspace/libkworkspace-9999.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"
}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-plasma/libkworkspace/files/, kde-plasma/libkworkspace/
@ 2019-07-10 10:30 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2019-07-10 10:30 UTC (permalink / raw
To: gentoo-commits
commit: c7314eb2cdafb3c56892c65ad09b1ac9a01ecd1b
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 10 10:29:53 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jul 10 10:29:53 2019 +0000
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 <asturm <AT> gentoo.org>
.../files/libkworkspace-5.16.80-standalone.patch | 110 +++++++++++++++++++++
kde-plasma/libkworkspace/libkworkspace-9999.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 0000000000..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 <asturm@gentoo.org>
+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}/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,7 @@ if(BUILD_TESTING)
+ add_subdirectory(autotests)
+ add_subdirectory(tests)
+ endif()
++
++if ("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
++ feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
++endif()
+--
+2.22.0
+
diff --git a/kde-plasma/libkworkspace/libkworkspace-9999.ebuild b/kde-plasma/libkworkspace/libkworkspace-9999.ebuild
index 8c4d2cbf19..1282f6d256 100644
--- a/kde-plasma/libkworkspace/libkworkspace-9999.ebuild
+++ b/kde-plasma/libkworkspace/libkworkspace-9999.ebuild
@@ -17,6 +17,7 @@ COMMON_DEPEND="
$(add_frameworks_dep ki18n)
$(add_frameworks_dep kwindowsystem)
$(add_frameworks_dep plasma)
+ $(add_plasma_dep kscreenlocker)
$(add_qt_dep qtdbus)
$(add_qt_dep qtx11extras)
x11-libs/libICE
@@ -33,7 +34,7 @@ RDEPEND="${COMMON_DEPEND}
S="${S}/${PN}"
-PATCHES=( "${FILESDIR}/${PN}-5.14.90-standalone.patch" )
+PATCHES=( "${FILESDIR}/${PN}-5.16.80-standalone.patch" )
src_prepare() {
# delete colliding libkworkspace translations, let kde5_src_prepare do its magic
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-plasma/libkworkspace/files/, kde-plasma/libkworkspace/
@ 2020-02-08 20:02 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2020-02-08 20:02 UTC (permalink / raw
To: gentoo-commits
commit: bf1fce5d328c12dba297b2f4be5274ebb1ac4475
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 8 19:59:26 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Feb 8 20:01:51 2020 +0000
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 <urmet.saar <AT> gmail.com>
Closes: https://bugs.gentoo.org/707670
Package-Manager: Portage-2.3.87, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/libkworkspace-5.18.80-standalone.patch | 17 +++++++++--------
kde-plasma/libkworkspace/libkworkspace-9999.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 <asturm@gentoo.org>
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-9999.ebuild b/kde-plasma/libkworkspace/libkworkspace-9999.ebuild
index b7b8b72673..66ba007363 100644
--- a/kde-plasma/libkworkspace/libkworkspace-9999.ebuild
+++ b/kde-plasma/libkworkspace/libkworkspace-9999.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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-plasma/libkworkspace/files/, kde-plasma/libkworkspace/
@ 2021-05-29 21:13 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2021-05-29 21:13 UTC (permalink / raw
To: gentoo-commits
commit: 60afee16cb4f582903ad90e43c5a956588fbc9c6
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat May 29 20:06:12 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat May 29 20:06:12 2021 +0000
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 <asturm <AT> gentoo.org>
...patch => libkworkspace-5.21.90-standalone.patch} | 20 ++++++++++----------
.../libkworkspace/libkworkspace-5.21.90.ebuild | 21 +++++++++------------
.../libkworkspace/libkworkspace-5.22.49.9999.ebuild | 21 +++++++++------------
kde-plasma/libkworkspace/libkworkspace-9999.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 <asturm@gentoo.org>
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.ebuild
index d5de9a8d1e..683900192d 100644
--- a/kde-plasma/libkworkspace/libkworkspace-5.21.90.ebuild
+++ b/kde-plasma/libkworkspace/libkworkspace-5.21.90.ebuild
@@ -20,11 +20,10 @@ 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/kinit-${KFMIN}:5
>=kde-frameworks/kwindowsystem-${KFMIN}:5
- >=kde-frameworks/plasma-${KFMIN}:5
>=kde-plasma/kscreenlocker-${PVCUT}:5
x11-libs/libICE
x11-libs/libSM
@@ -32,13 +31,12 @@ RDEPEND="
x11-libs/libXau
"
DEPEND="${RDEPEND}
+ >=kde-frameworks/kinit-${KFMIN}:5
>=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
@@ -46,13 +44,12 @@ src_prepare() {
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"
+ 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
}
diff --git a/kde-plasma/libkworkspace/libkworkspace-5.22.49.9999.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.22.49.9999.ebuild
index 6fb729ae2f..1bf51a0c68 100644
--- a/kde-plasma/libkworkspace/libkworkspace-5.22.49.9999.ebuild
+++ b/kde-plasma/libkworkspace/libkworkspace-5.22.49.9999.ebuild
@@ -20,11 +20,10 @@ 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/kinit-${KFMIN}:5
>=kde-frameworks/kwindowsystem-${KFMIN}:5
- >=kde-frameworks/plasma-${KFMIN}:5
>=kde-plasma/kscreenlocker-${PVCUT}:5
x11-libs/libICE
x11-libs/libSM
@@ -32,13 +31,12 @@ RDEPEND="
x11-libs/libXau
"
DEPEND="${RDEPEND}
+ >=kde-frameworks/kinit-${KFMIN}:5
>=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
@@ -46,13 +44,12 @@ src_prepare() {
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"
+ 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
}
diff --git a/kde-plasma/libkworkspace/libkworkspace-9999.ebuild b/kde-plasma/libkworkspace/libkworkspace-9999.ebuild
index bb6a957aa7..63c4abaef4 100644
--- a/kde-plasma/libkworkspace/libkworkspace-9999.ebuild
+++ b/kde-plasma/libkworkspace/libkworkspace-9999.ebuild
@@ -20,11 +20,10 @@ 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/kinit-${KFMIN}:5
>=kde-frameworks/kwindowsystem-${KFMIN}:5
- >=kde-frameworks/plasma-${KFMIN}:5
>=kde-plasma/kscreenlocker-${PVCUT}:5
x11-libs/libICE
x11-libs/libSM
@@ -32,13 +31,12 @@ RDEPEND="
x11-libs/libXau
"
DEPEND="${RDEPEND}
+ >=kde-frameworks/kinit-${KFMIN}:5
>=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
@@ -46,13 +44,12 @@ src_prepare() {
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"
+ 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
}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-plasma/libkworkspace/files/, kde-plasma/libkworkspace/
@ 2023-12-09 15:15 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2023-12-09 15:15 UTC (permalink / raw
To: gentoo-commits
commit: b8621bbfe3fa8ba703fdfcc66a32008f5ab47a68
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 9 14:39:48 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec 9 14:57:25 2023 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=b8621bbf
kde-plasma/libkworkspace: drop 9999, the split is history
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/libkworkspace-5.90.0-standalone.patch | 104 ---------------------
kde-plasma/libkworkspace/libkworkspace-9999.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..0000000000
--- 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 <asturm@gentoo.org>
-Date: Mon, 21 Feb 2022 12:24:56 +0100
-Subject: [PATCH] libkworkspace: Allow standalone build
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- 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 ${kworkspace_LIB_SRCS})
-@@ -108,3 +170,8 @@ install(EXPORT libkworkspaceLibraryTargets
- if(BUILD_TESTING)
- add_subdirectory(tests)
- endif()
-+
-+if ("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
-+ install( FILES sessionmanagementbackend.h DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kworkspace6 COMPONENT Devel )
-+ feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
-+endif()
---
-2.43.0
-
diff --git a/kde-plasma/libkworkspace/libkworkspace-9999.ebuild b/kde-plasma/libkworkspace/libkworkspace-9999.ebuild
deleted file mode 100644
index 71f89dbae7..0000000000
--- a/kde-plasma/libkworkspace/libkworkspace-9999.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2023 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.245.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=6.6.0
-inherit ecm plasma.kde.org
-
-DESCRIPTION="Workspace library to interact with the Plasma session manager"
-S="${S}/${PN}"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS=""
-IUSE=""
-
-RDEPEND="
- >=dev-qt/qtbase-${QTMIN}:6[dbus,gui]
- >=dev-qt/qtwayland-${QTMIN}:6
- >=kde-frameworks/kconfig-${KFMIN}:6
- >=kde-frameworks/kcoreaddons-${KFMIN}:6
- >=kde-frameworks/ki18n-${KFMIN}:6
- >=kde-frameworks/kpackage-${KFMIN}:6
- >=kde-frameworks/kservice-${KFMIN}:6
- >=kde-frameworks/kwindowsystem-${KFMIN}:6
- >=kde-plasma/kscreenlocker-${PVCUT}:6
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libXau
-"
-DEPEND="${RDEPEND}
- >=kde-plasma/kwin-${PVCUT}:6
-"
-
-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.90.0-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
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-plasma/libkworkspace/files/, kde-plasma/libkworkspace/
@ 2024-01-16 15:28 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2024-01-16 15:28 UTC (permalink / raw
To: gentoo-commits
commit: 483f34aa737a73985e1889086d5861f4ae83bc4b
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 16 14:31:59 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jan 16 15:26:51 2024 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=483f34aa
kde-plasma/libkworkspace: treeclean
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/libkworkspace-5.27.9-standalone.patch | 108 ---------------------
.../libkworkspace-5.27.49.9999.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..0000000000
--- 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 <asturm@gentoo.org>
-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"
- "${CMAKE_SOURCE_DIR}/data/interfaces/org.freedesktop.login1.Seat.xml"
-@@ -30,7 +91,6 @@ list(APPEND kworkspace_LIB_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/login1_manager_inte
- qt_add_dbus_interface(kworkspace_LIB_SRCS "org.freedesktop.UPower.xml" upower_interface)
- qt_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)
- qt_add_dbus_interface( kworkspace_LIB_SRCS ${ksmserver_xml} ksmserver_interface )
-
- add_library(kworkspace ${kworkspace_LIB_SRCS})
-@@ -98,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()
---
-2.31.1
-
diff --git a/kde-plasma/libkworkspace/libkworkspace-5.27.49.9999.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.27.49.9999.ebuild
deleted file mode 100644
index a6a63adbc7..0000000000
--- a/kde-plasma/libkworkspace/libkworkspace-5.27.49.9999.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2024 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.106.0
-PVCUT=$(ver_cut 1-3)
-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"
-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
-"
-
-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.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)
- _EOF_
-
- ecm_src_prepare
-}
diff --git a/kde-plasma/libkworkspace/metadata.xml b/kde-plasma/libkworkspace/metadata.xml
deleted file mode 100644
index d925f24397..0000000000
--- a/kde-plasma/libkworkspace/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>kde@gentoo.org</email>
- <name>Gentoo KDE Project</name>
- </maintainer>
- <upstream>
- <bugs-to>https://bugs.kde.org/</bugs-to>
- </upstream>
-</pkgmetadata>
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-01-16 15:28 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-01-13 12:16 [gentoo-commits] proj/kde:master commit in: kde-plasma/libkworkspace/files/, kde-plasma/libkworkspace/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2019-07-10 10:30 Andreas Sturmlechner
2020-02-08 20:02 Andreas Sturmlechner
2021-05-29 21:13 Andreas Sturmlechner
2023-12-09 15:15 Andreas Sturmlechner
2024-01-16 15:28 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox