1 |
commit: 85485b0da132a4c4d25ac81f81c86b5b6cf68a24 |
2 |
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> |
3 |
AuthorDate: Mon Jan 10 17:01:13 2022 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jan 15 14:14:59 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85485b0d |
7 |
|
8 |
kde-plasma/libkworkspace: remove unused patch |
9 |
|
10 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
11 |
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> |
12 |
Closes: https://github.com/gentoo/gentoo/pull/23730 |
13 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
14 |
|
15 |
.../files/libkworkspace-5.21.90-standalone.patch | 108 --------------------- |
16 |
1 file changed, 108 deletions(-) |
17 |
|
18 |
diff --git a/kde-plasma/libkworkspace/files/libkworkspace-5.21.90-standalone.patch b/kde-plasma/libkworkspace/files/libkworkspace-5.21.90-standalone.patch |
19 |
deleted file mode 100644 |
20 |
index 430b98aadcb9..000000000000 |
21 |
--- a/kde-plasma/libkworkspace/files/libkworkspace-5.21.90-standalone.patch |
22 |
+++ /dev/null |
23 |
@@ -1,108 +0,0 @@ |
24 |
-From 2360505a8f6475b6988efa60c3ba746bfbe4c4d0 Mon Sep 17 00:00:00 2001 |
25 |
-From: Andreas Sturmlechner <asturm@g.o> |
26 |
-Date: Sun, 2 Feb 2020 18:29:57 +0100 |
27 |
-Subject: [PATCH] libkworkspace: Allow standalone build |
28 |
- |
29 |
---- |
30 |
- libkworkspace/CMakeLists.txt | 67 +++++++++++++++++++++++++++++++++++- |
31 |
- 1 file changed, 66 insertions(+), 1 deletion(-) |
32 |
- |
33 |
-diff --git a/CMakeLists.txt b/CMakeLists.txt |
34 |
-index 015c5181f..0aa635e11 100644 |
35 |
---- a/CMakeLists.txt |
36 |
-+++ b/CMakeLists.txt |
37 |
-@@ -1,3 +1,56 @@ |
38 |
-+project(libkworkspace) |
39 |
-+ |
40 |
-+if(${CMAKE_SOURCE_DIR} STREQUAL ${libkworkspace_SOURCE_DIR}) |
41 |
-+ set(PROJECT_VERSION "GENTOO_PV") |
42 |
-+ set(PROJECT_VERSION_MAJOR 5) |
43 |
-+ |
44 |
-+ cmake_minimum_required(VERSION 3.16) |
45 |
-+ |
46 |
-+ set(QT_MIN_VERSION "5.15.0") |
47 |
-+ set(KF5_MIN_VERSION "5.82.0") |
48 |
-+ find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core DBus) |
49 |
-+ find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE) |
50 |
-+ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) |
51 |
-+ |
52 |
-+ include(KDEInstallDirs) |
53 |
-+ include(KDECMakeSettings) |
54 |
-+ include(KDECompilerSettings NO_POLICY_SCOPE) |
55 |
-+ include(ECMMarkNonGuiExecutable) |
56 |
-+ include(CMakePackageConfigHelpers) |
57 |
-+ include(WriteBasicConfigVersionFile) |
58 |
-+ include(CheckIncludeFiles) |
59 |
-+ include(FeatureSummary) |
60 |
-+ include(ECMQtDeclareLoggingCategory) |
61 |
-+ include(KDEPackageAppTemplates) |
62 |
-+ include(ECMMarkAsTest) |
63 |
-+ include(GenerateExportHeader) |
64 |
-+ |
65 |
-+ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Config CoreAddons I18n Init WindowSystem) |
66 |
-+ |
67 |
-+ find_package(KWinDBusInterface CONFIG REQUIRED) |
68 |
-+ find_package(KScreenLocker 5.13.80 REQUIRED) |
69 |
-+ find_package(ScreenSaverDBusInterface CONFIG REQUIRED) |
70 |
-+ |
71 |
-+ find_package(X11) |
72 |
-+ set_package_properties(X11 PROPERTIES DESCRIPTION "X11 libraries" |
73 |
-+ URL "http://www.x.org" |
74 |
-+ TYPE OPTIONAL |
75 |
-+ PURPOSE "Required for X11 support") |
76 |
-+ |
77 |
-+ if(X11_FOUND) |
78 |
-+ find_package(Qt5X11Extras ${QT_MIN_VERSION} CONFIG REQUIRED) |
79 |
-+ set(HAVE_X11 1) |
80 |
-+ endif() |
81 |
-+ |
82 |
-+ if(BUILD_TESTING) |
83 |
-+ find_package(Qt5Test ${QT_MIN_VERSION} CONFIG REQUIRED) |
84 |
-+ endif() |
85 |
-+ |
86 |
-+ check_include_files(unistd.h HAVE_UNISTD_H) |
87 |
-+ |
88 |
-+ configure_file(../config-workspace.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-workspace.h) |
89 |
-+ configure_file(../config-X11.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-X11.h) |
90 |
-+endif() |
91 |
- |
92 |
- set(kworkspace_LIB_SRCS kdisplaymanager.cpp |
93 |
- kworkspace.cpp |
94 |
-@@ -12,9 +65,17 @@ add_definitions(-DTRANSLATION_DOMAIN=\"libkworkspace\") |
95 |
- qt5_add_dbus_interface(kworkspace_LIB_SRCS ${KINIT_DBUS_INTERFACES_DIR}/kf5_org.kde.KLauncher.xml klauncher_interface) |
96 |
- qt5_add_dbus_interface(kworkspace_LIB_SRCS ${KSCREENLOCKER_DBUS_INTERFACES_DIR}/kf5_org.freedesktop.ScreenSaver.xml screenlocker_interface ) |
97 |
- qt5_add_dbus_interface(kworkspace_LIB_SRCS ${KSCREENLOCKER_DBUS_INTERFACES_DIR}/org.kde.screensaver.xml kscreenlocker_interface ) |
98 |
-+if(${CMAKE_SOURCE_DIR} STREQUAL ${libkworkspace_SOURCE_DIR}) |
99 |
-+qt5_add_dbus_interface(kworkspace_LIB_SRCS ../ksmserver/org.kde.LogoutPrompt.xml logoutprompt_interface) |
100 |
-+qt5_add_dbus_interface(kworkspace_LIB_SRCS ../startkde/plasma-session/org.kde.Startup.xml startup_interface) |
101 |
-+qt5_add_dbus_interface(kworkspace_LIB_SRCS ../startkde/plasma-shutdown/org.kde.Shutdown.xml shutdown_interface) |
102 |
-+set(ksmserver_xml ../ksmserver/org.kde.KSMServerInterface.xml) |
103 |
-+else() |
104 |
- qt5_add_dbus_interface(kworkspace_LIB_SRCS ${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.LogoutPrompt.xml logoutprompt_interface) |
105 |
- qt5_add_dbus_interface(kworkspace_LIB_SRCS ${plasma-workspace_SOURCE_DIR}/startkde/plasma-session/org.kde.Startup.xml startup_interface) |
106 |
- qt5_add_dbus_interface(kworkspace_LIB_SRCS ${plasma-workspace_SOURCE_DIR}/startkde/plasma-shutdown/org.kde.Shutdown.xml shutdown_interface) |
107 |
-+set(ksmserver_xml ${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.KSMServerInterface.xml) |
108 |
-+endif() |
109 |
- |
110 |
- set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/org.freedesktop.login1.Manager.xml" |
111 |
- "${CMAKE_SOURCE_DIR}/data/interfaces/org.freedesktop.login1.Seat.xml" |
112 |
-@@ -30,7 +91,6 @@ list(APPEND kworkspace_LIB_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/login1_manager_inte |
113 |
- qt5_add_dbus_interface(kworkspace_LIB_SRCS "org.freedesktop.UPower.xml" upower_interface) |
114 |
- qt5_add_dbus_interface(kworkspace_LIB_SRCS "org.freedesktop.ConsoleKit.Manager.xml" consolekit_manager_interface) |
115 |
- |
116 |
--set(ksmserver_xml ${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.KSMServerInterface.xml) |
117 |
- qt5_add_dbus_interface( kworkspace_LIB_SRCS ${ksmserver_xml} ksmserver_interface ) |
118 |
- |
119 |
- add_library(kworkspace ${kworkspace_LIB_SRCS}) |
120 |
-@@ -98,3 +158,8 @@ if(BUILD_TESTING) |
121 |
- add_subdirectory(autotests) |
122 |
- add_subdirectory(tests) |
123 |
- endif() |
124 |
-+ |
125 |
-+if ("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}") |
126 |
-+ install( FILES sessionmanagementbackend.h DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kworkspace5 COMPONENT Devel ) |
127 |
-+ feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) |
128 |
-+endif() |
129 |
--- |
130 |
-2.31.1 |
131 |
- |