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