1 |
commit: e574c22419c876fc9b3ed81e80f9c3b714886284 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat May 29 19:10:22 2021 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat May 29 21:16:20 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e574c224 |
7 |
|
8 |
kde-plasma/libkworkspace: Rebase standalone.patch, update DEPENDs |
9 |
|
10 |
- Add KF5Config |
11 |
- Drop KF5Plasma |
12 |
- Move KF5Init to DEPEND-only |
13 |
|
14 |
Package-Manager: Portage-3.0.19, Repoman-3.0.3 |
15 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
16 |
|
17 |
.../files/libkworkspace-5.21.5-standalone.patch | 108 +++++++++++++++++++++ |
18 |
.../libkworkspace/libkworkspace-5.21.5-r1.ebuild | 54 +++++++++++ |
19 |
2 files changed, 162 insertions(+) |
20 |
|
21 |
diff --git a/kde-plasma/libkworkspace/files/libkworkspace-5.21.5-standalone.patch b/kde-plasma/libkworkspace/files/libkworkspace-5.21.5-standalone.patch |
22 |
new file mode 100644 |
23 |
index 00000000000..8c4e88949c5 |
24 |
--- /dev/null |
25 |
+++ b/kde-plasma/libkworkspace/files/libkworkspace-5.21.5-standalone.patch |
26 |
@@ -0,0 +1,108 @@ |
27 |
+From 0a8473a131caf3b076e8dd8932964a07103d810a Mon Sep 17 00:00:00 2001 |
28 |
+From: Andreas Sturmlechner <asturm@g.o> |
29 |
+Date: Sun, 2 Feb 2020 18:29:57 +0100 |
30 |
+Subject: [PATCH] libkworkspace: Allow standalone build |
31 |
+ |
32 |
+--- |
33 |
+ libkworkspace/CMakeLists.txt | 67 +++++++++++++++++++++++++++++++++++- |
34 |
+ 1 file changed, 66 insertions(+), 1 deletion(-) |
35 |
+ |
36 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
37 |
+index 4babcb683..419158539 100644 |
38 |
+--- a/CMakeLists.txt |
39 |
++++ b/CMakeLists.txt |
40 |
+@@ -1,3 +1,56 @@ |
41 |
++project(libkworkspace) |
42 |
++ |
43 |
++if(${CMAKE_SOURCE_DIR} STREQUAL ${libkworkspace_SOURCE_DIR}) |
44 |
++ set(PROJECT_VERSION "5.21.5") |
45 |
++ set(PROJECT_VERSION_MAJOR 5) |
46 |
++ |
47 |
++ cmake_minimum_required(VERSION 3.6) |
48 |
++ |
49 |
++ set(QT_MIN_VERSION "5.15.0") |
50 |
++ set(KF5_MIN_VERSION "5.78") |
51 |
++ find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core DBus) |
52 |
++ find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE) |
53 |
++ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) |
54 |
++ |
55 |
++ include(KDEInstallDirs) |
56 |
++ include(KDECMakeSettings) |
57 |
++ include(KDECompilerSettings NO_POLICY_SCOPE) |
58 |
++ include(ECMMarkNonGuiExecutable) |
59 |
++ include(CMakePackageConfigHelpers) |
60 |
++ include(WriteBasicConfigVersionFile) |
61 |
++ include(CheckIncludeFiles) |
62 |
++ include(FeatureSummary) |
63 |
++ include(ECMQtDeclareLoggingCategory) |
64 |
++ include(KDEPackageAppTemplates) |
65 |
++ include(ECMMarkAsTest) |
66 |
++ include(GenerateExportHeader) |
67 |
++ |
68 |
++ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Config CoreAddons I18n Init WindowSystem) |
69 |
++ |
70 |
++ find_package(KWinDBusInterface CONFIG REQUIRED) |
71 |
++ find_package(KScreenLocker 5.13.80 REQUIRED) |
72 |
++ find_package(ScreenSaverDBusInterface CONFIG REQUIRED) |
73 |
++ |
74 |
++ find_package(X11) |
75 |
++ set_package_properties(X11 PROPERTIES DESCRIPTION "X11 libraries" |
76 |
++ URL "http://www.x.org" |
77 |
++ TYPE OPTIONAL |
78 |
++ PURPOSE "Required for X11 support") |
79 |
++ |
80 |
++ if(X11_FOUND) |
81 |
++ find_package(Qt5X11Extras ${QT_MIN_VERSION} CONFIG REQUIRED) |
82 |
++ set(HAVE_X11 1) |
83 |
++ endif() |
84 |
++ |
85 |
++ if(BUILD_TESTING) |
86 |
++ find_package(Qt5Test ${QT_MIN_VERSION} CONFIG REQUIRED) |
87 |
++ endif() |
88 |
++ |
89 |
++ check_include_files(unistd.h HAVE_UNISTD_H) |
90 |
++ |
91 |
++ configure_file(../config-workspace.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-workspace.h) |
92 |
++ configure_file(../config-X11.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-X11.h) |
93 |
++endif() |
94 |
+ |
95 |
+ set(kworkspace_LIB_SRCS kdisplaymanager.cpp |
96 |
+ kworkspace.cpp |
97 |
+@@ -16,9 +69,17 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) |
98 |
+ qt5_add_dbus_interface(kworkspace_LIB_SRCS ${KINIT_DBUS_INTERFACES_DIR}/kf5_org.kde.KLauncher.xml klauncher_interface) |
99 |
+ qt5_add_dbus_interface(kworkspace_LIB_SRCS ${KSCREENLOCKER_DBUS_INTERFACES_DIR}/kf5_org.freedesktop.ScreenSaver.xml screenlocker_interface ) |
100 |
+ qt5_add_dbus_interface(kworkspace_LIB_SRCS ${KSCREENLOCKER_DBUS_INTERFACES_DIR}/org.kde.screensaver.xml kscreenlocker_interface ) |
101 |
++if(${CMAKE_SOURCE_DIR} STREQUAL ${libkworkspace_SOURCE_DIR}) |
102 |
++qt5_add_dbus_interface(kworkspace_LIB_SRCS ../ksmserver/org.kde.LogoutPrompt.xml logoutprompt_interface) |
103 |
++qt5_add_dbus_interface(kworkspace_LIB_SRCS ../startkde/plasma-session/org.kde.Startup.xml startup_interface) |
104 |
++qt5_add_dbus_interface(kworkspace_LIB_SRCS ../startkde/plasma-shutdown/org.kde.Shutdown.xml shutdown_interface) |
105 |
++set(ksmserver_xml ../ksmserver/org.kde.KSMServerInterface.xml) |
106 |
++else() |
107 |
+ qt5_add_dbus_interface(kworkspace_LIB_SRCS ${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.LogoutPrompt.xml logoutprompt_interface) |
108 |
+ qt5_add_dbus_interface(kworkspace_LIB_SRCS ${plasma-workspace_SOURCE_DIR}/startkde/plasma-session/org.kde.Startup.xml startup_interface) |
109 |
+ qt5_add_dbus_interface(kworkspace_LIB_SRCS ${plasma-workspace_SOURCE_DIR}/startkde/plasma-shutdown/org.kde.Shutdown.xml shutdown_interface) |
110 |
++set(ksmserver_xml ${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.KSMServerInterface.xml) |
111 |
++endif() |
112 |
+ |
113 |
+ set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/org.freedesktop.login1.Manager.xml" |
114 |
+ "${CMAKE_SOURCE_DIR}/data/interfaces/org.freedesktop.login1.Seat.xml" |
115 |
+@@ -34,7 +95,6 @@ list(APPEND kworkspace_LIB_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/login1_manager_inte |
116 |
+ qt5_add_dbus_interface(kworkspace_LIB_SRCS "org.freedesktop.UPower.xml" upower_interface) |
117 |
+ qt5_add_dbus_interface(kworkspace_LIB_SRCS "org.freedesktop.ConsoleKit.Manager.xml" consolekit_manager_interface) |
118 |
+ |
119 |
+-set(ksmserver_xml ${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.KSMServerInterface.xml) |
120 |
+ qt5_add_dbus_interface( kworkspace_LIB_SRCS ${ksmserver_xml} ksmserver_interface ) |
121 |
+ |
122 |
+ add_library(kworkspace ${kworkspace_LIB_SRCS}) |
123 |
+@@ -101,3 +161,8 @@ if(BUILD_TESTING) |
124 |
+ add_subdirectory(autotests) |
125 |
+ add_subdirectory(tests) |
126 |
+ endif() |
127 |
++ |
128 |
++if ("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}") |
129 |
++ install( FILES sessionmanagementbackend.h DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kworkspace5 COMPONENT Devel ) |
130 |
++ feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) |
131 |
++endif() |
132 |
+-- |
133 |
+2.31.1 |
134 |
+ |
135 |
|
136 |
diff --git a/kde-plasma/libkworkspace/libkworkspace-5.21.5-r1.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.21.5-r1.ebuild |
137 |
new file mode 100644 |
138 |
index 00000000000..10cabe55d61 |
139 |
--- /dev/null |
140 |
+++ b/kde-plasma/libkworkspace/libkworkspace-5.21.5-r1.ebuild |
141 |
@@ -0,0 +1,54 @@ |
142 |
+# Copyright 1999-2021 Gentoo Authors |
143 |
+# Distributed under the terms of the GNU General Public License v2 |
144 |
+ |
145 |
+EAPI=7 |
146 |
+ |
147 |
+ECM_TEST="true" |
148 |
+KDE_ORG_NAME="plasma-workspace" |
149 |
+KFMIN=5.82.0 |
150 |
+PVCUT=$(ver_cut 1-3) |
151 |
+QTMIN=5.15.2 |
152 |
+inherit ecm kde.org |
153 |
+ |
154 |
+DESCRIPTION="Workspace library to interact with the Plasma session manager" |
155 |
+ |
156 |
+LICENSE="GPL-2" # TODO: CHECK |
157 |
+SLOT="5" |
158 |
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" |
159 |
+IUSE="" |
160 |
+ |
161 |
+RDEPEND=" |
162 |
+ >=dev-qt/qtdbus-${QTMIN}:5 |
163 |
+ >=dev-qt/qtx11extras-${QTMIN}:5 |
164 |
+ >=kde-frameworks/kconfig-${KFMIN}:5 |
165 |
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5 |
166 |
+ >=kde-frameworks/ki18n-${KFMIN}:5 |
167 |
+ >=kde-frameworks/kwindowsystem-${KFMIN}:5 |
168 |
+ >=kde-plasma/kscreenlocker-${PVCUT}:5 |
169 |
+ x11-libs/libICE |
170 |
+ x11-libs/libSM |
171 |
+ x11-libs/libX11 |
172 |
+ x11-libs/libXau |
173 |
+" |
174 |
+DEPEND="${RDEPEND} |
175 |
+ >=kde-frameworks/kinit-${KFMIN}:5 |
176 |
+ >=kde-plasma/kwin-${PVCUT}:5 |
177 |
+" |
178 |
+ |
179 |
+S="${S}/${PN}" |
180 |
+ |
181 |
+src_prepare() { |
182 |
+ # delete colliding libkworkspace translations, let ecm_src_prepare do its magic |
183 |
+ if [[ ${KDE_BUILD_TYPE} = release ]]; then |
184 |
+ find ../po -type f -name "*po" -and -not -name "libkworkspace*" -delete || die |
185 |
+ rm -rf po/*/docs || die |
186 |
+ cp -a ../po ./ || die |
187 |
+ fi |
188 |
+ |
189 |
+ eapply "${FILESDIR}/${P}-standalone.patch" |
190 |
+ cat >> CMakeLists.txt <<- _EOF_ || die |
191 |
+ ki18n_install(po) |
192 |
+ _EOF_ |
193 |
+ |
194 |
+ ecm_src_prepare |
195 |
+} |