1 |
commit: 6be3f31e14f6df74b7c843d1d5535d3971620feb |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Feb 2 17:38:56 2020 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Feb 2 18:04:56 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=6be3f31e |
7 |
|
8 |
kde-plasma/libkworkspace: Rebase standalone-patch on top of HEAD |
9 |
|
10 |
Reported-by: Duncan <1i5t5.duncan <AT> cox.net> |
11 |
Closes: https://bugs.gentoo.org/707670 |
12 |
Package-Manager: Portage-2.3.87, Repoman-2.3.20 |
13 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
14 |
|
15 |
.../files/libkworkspace-5.18.80-standalone.patch | 112 +++++++++++++++++++++ |
16 |
kde-plasma/libkworkspace/libkworkspace-9999.ebuild | 2 +- |
17 |
2 files changed, 113 insertions(+), 1 deletion(-) |
18 |
|
19 |
diff --git a/kde-plasma/libkworkspace/files/libkworkspace-5.18.80-standalone.patch b/kde-plasma/libkworkspace/files/libkworkspace-5.18.80-standalone.patch |
20 |
new file mode 100644 |
21 |
index 0000000000..79c039afd5 |
22 |
--- /dev/null |
23 |
+++ b/kde-plasma/libkworkspace/files/libkworkspace-5.18.80-standalone.patch |
24 |
@@ -0,0 +1,112 @@ |
25 |
+From 04f6a5fed3df9b1443159befd8e17ac6cd797916 Mon Sep 17 00:00:00 2001 |
26 |
+From: Andreas Sturmlechner <asturm@g.o> |
27 |
+Date: Sun, 2 Feb 2020 18:29:57 +0100 |
28 |
+Subject: [PATCH] libkworkspace: Allow standalone build |
29 |
+ |
30 |
+--- |
31 |
+ CMakeLists.txt | 70 +++++++++++++++++++++++++++++++++--- |
32 |
+ 1 file changed, 66 insertions(+), 4 deletions(-) |
33 |
+ |
34 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
35 |
+index a1869fae2..c7768ce17 100644 |
36 |
+--- a/CMakeLists.txt |
37 |
++++ b/CMakeLists.txt |
38 |
+@@ -1,3 +1,56 @@ |
39 |
++project(libkworkspace) |
40 |
++ |
41 |
++if(${CMAKE_SOURCE_DIR} STREQUAL ${libkworkspace_SOURCE_DIR}) |
42 |
++ set(PROJECT_VERSION "GENTOO_PV") |
43 |
++ set(PROJECT_VERSION_MAJOR 5) |
44 |
++ |
45 |
++ cmake_minimum_required(VERSION 3.0) |
46 |
++ |
47 |
++ set(QT_MIN_VERSION "5.12.0") |
48 |
++ set(KF5_MIN_VERSION "5.58.0") |
49 |
++ find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core DBus) |
50 |
++ find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE) |
51 |
++ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) |
52 |
++ |
53 |
++ include(KDEInstallDirs) |
54 |
++ include(KDECMakeSettings) |
55 |
++ include(KDECompilerSettings NO_POLICY_SCOPE) |
56 |
++ include(ECMMarkNonGuiExecutable) |
57 |
++ include(CMakePackageConfigHelpers) |
58 |
++ include(WriteBasicConfigVersionFile) |
59 |
++ include(CheckIncludeFiles) |
60 |
++ include(FeatureSummary) |
61 |
++ include(ECMQtDeclareLoggingCategory) |
62 |
++ include(KDEPackageAppTemplates) |
63 |
++ include(ECMMarkAsTest) |
64 |
++ include(GenerateExportHeader) |
65 |
++ |
66 |
++ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS CoreAddons I18n Plasma WindowSystem) |
67 |
++ |
68 |
++ find_package(KWinDBusInterface CONFIG REQUIRED) |
69 |
++ find_package(KScreenLocker 5.13.80 REQUIRED) |
70 |
++ find_package(ScreenSaverDBusInterface CONFIG REQUIRED) |
71 |
++ |
72 |
++ find_package(X11) |
73 |
++ set_package_properties(X11 PROPERTIES DESCRIPTION "X11 libraries" |
74 |
++ URL "http://www.x.org" |
75 |
++ TYPE OPTIONAL |
76 |
++ PURPOSE "Required for X11 support") |
77 |
++ |
78 |
++ if(X11_FOUND) |
79 |
++ find_package(Qt5X11Extras ${QT_MIN_VERSION} CONFIG REQUIRED) |
80 |
++ set(HAVE_X11 1) |
81 |
++ endif() |
82 |
++ |
83 |
++ if(BUILD_TESTING) |
84 |
++ find_package(Qt5Test ${QT_MIN_VERSION} CONFIG REQUIRED) |
85 |
++ endif() |
86 |
++ |
87 |
++ check_include_files(unistd.h HAVE_UNISTD_H) |
88 |
++ |
89 |
++ configure_file(../config-workspace.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-workspace.h) |
90 |
++ configure_file(../config-X11.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-X11.h) |
91 |
++endif() |
92 |
+ |
93 |
+ set(kworkspace_LIB_SRCS kdisplaymanager.cpp |
94 |
+ kworkspace.cpp |
95 |
+@@ -16,9 +69,17 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) |
96 |
+ qt5_add_dbus_interface(kworkspace_LIB_SRCS ${KINIT_DBUS_INTERFACES_DIR}/kf5_org.kde.KLauncher.xml klauncher_interface) |
97 |
+ qt5_add_dbus_interface(kworkspace_LIB_SRCS ${KSCREENLOCKER_DBUS_INTERFACES_DIR}/kf5_org.freedesktop.ScreenSaver.xml screenlocker_interface ) |
98 |
+ qt5_add_dbus_interface(kworkspace_LIB_SRCS ${KSCREENLOCKER_DBUS_INTERFACES_DIR}/org.kde.screensaver.xml kscreenlocker_interface ) |
99 |
++if(${CMAKE_SOURCE_DIR} STREQUAL ${libkworkspace_SOURCE_DIR}) |
100 |
++qt5_add_dbus_interface(kworkspace_LIB_SRCS ../ksmserver/org.kde.LogoutPrompt.xml logoutprompt_interface) |
101 |
++qt5_add_dbus_interface(kworkspace_LIB_SRCS ../startkde/plasma-session/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-session/org.kde.Shutdown.xml shutdown_interface) |
107 |
++set(ksmserver_xml ${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.KSMServerInterface.xml) |
108 |
++set_source_files_properties(${KWIN_INTERFACE} PROPERTIES INCLUDE "interface_util.h") |
109 |
++endif() |
110 |
+ |
111 |
+ set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/org.freedesktop.login1.Manager.xml" |
112 |
+ "${CMAKE_SOURCE_DIR}/data/interfaces/org.freedesktop.login1.Seat.xml" |
113 |
+@@ -34,11 +95,7 @@ list(APPEND kworkspace_LIB_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/login1_manager_inte |
114 |
+ qt5_add_dbus_interface(kworkspace_LIB_SRCS "org.freedesktop.UPower.xml" upower_interface) |
115 |
+ qt5_add_dbus_interface(kworkspace_LIB_SRCS "org.freedesktop.ConsoleKit.Manager.xml" consolekit_manager_interface) |
116 |
+ |
117 |
+-set(ksmserver_xml ${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.KSMServerInterface.xml) |
118 |
+ qt5_add_dbus_interface( kworkspace_LIB_SRCS ${ksmserver_xml} ksmserver_interface ) |
119 |
+- |
120 |
+-set_source_files_properties(${KWIN_INTERFACE} PROPERTIES INCLUDE "interface_util.h") |
121 |
+- |
122 |
+ qt5_add_dbus_interface( kworkspace_LIB_SRCS ${KWIN_INTERFACE} kwin_interface ) |
123 |
+ |
124 |
+ |
125 |
+@@ -105,3 +162,8 @@ if(BUILD_TESTING) |
126 |
+ add_subdirectory(autotests) |
127 |
+ add_subdirectory(tests) |
128 |
+ endif() |
129 |
++ |
130 |
++if ("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}") |
131 |
++ install( FILES sessionmanagementbackend.h DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kworkspace5 COMPONENT Devel ) |
132 |
++ feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) |
133 |
++endif() |
134 |
+-- |
135 |
+2.25.0 |
136 |
+ |
137 |
|
138 |
diff --git a/kde-plasma/libkworkspace/libkworkspace-9999.ebuild b/kde-plasma/libkworkspace/libkworkspace-9999.ebuild |
139 |
index 560ffb8402..b7b8b72673 100644 |
140 |
--- a/kde-plasma/libkworkspace/libkworkspace-9999.ebuild |
141 |
+++ b/kde-plasma/libkworkspace/libkworkspace-9999.ebuild |
142 |
@@ -39,7 +39,7 @@ RDEPEND="${COMMON_DEPEND} |
143 |
|
144 |
S="${S}/${PN}" |
145 |
|
146 |
-PATCHES=( "${FILESDIR}/${PN}-5.16.80-standalone.patch" ) |
147 |
+PATCHES=( "${FILESDIR}/${PN}-5.18.80-standalone.patch" ) |
148 |
|
149 |
src_prepare() { |
150 |
# delete colliding libkworkspace translations, let ecm_src_prepare do its magic |