Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: kde-plasma/libkworkspace/files/
Date: Tue, 17 Sep 2019 15:40:38
Message-Id: 1568734774.4cbf9c0eed4462eb08fe0be20d64ea8807075fec.asturm@gentoo
1 commit: 4cbf9c0eed4462eb08fe0be20d64ea8807075fec
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Tue Sep 17 15:39:34 2019 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Tue Sep 17 15:39:34 2019 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=4cbf9c0e
7
8 kde-plasma/libkworkspace: Drop unused patch
9
10 Package-Manager: Portage-2.3.76, Repoman-2.3.17
11 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
12
13 .../files/libkworkspace-5.14.90-standalone.patch | 96 ----------------------
14 1 file changed, 96 deletions(-)
15
16 diff --git a/kde-plasma/libkworkspace/files/libkworkspace-5.14.90-standalone.patch b/kde-plasma/libkworkspace/files/libkworkspace-5.14.90-standalone.patch
17 deleted file mode 100644
18 index 78042c5d16..0000000000
19 --- a/kde-plasma/libkworkspace/files/libkworkspace-5.14.90-standalone.patch
20 +++ /dev/null
21 @@ -1,96 +0,0 @@
22 -From 2e0a1d8f524d3bb645248787eed4532a250540fc Mon Sep 17 00:00:00 2001
23 -From: Andreas Sturmlechner <andreas.sturmlechner@×××××.com>
24 -Date: Mon, 22 Oct 2018 10:35:10 +0200
25 -Subject: [PATCH] libkworkspace: Allow standalone build
26 -
27 ----
28 - libkworkspace/CMakeLists.txt | 64 +++++++++++++++++++++++++++++++++---
29 - 1 file changed, 60 insertions(+), 4 deletions(-)
30 -
31 -diff --git a/libkworkspace/CMakeLists.txt b/libkworkspace/CMakeLists.txt
32 -index f66013f9..4e58bd60 100644
33 ---- a/CMakeLists.txt
34 -+++ b/CMakeLists.txt
35 -@@ -1,3 +1,59 @@
36 -+project(libkworkspace)
37 -+
38 -+if(${CMAKE_SOURCE_DIR} STREQUAL ${libkworkspace_SOURCE_DIR})
39 -+ set(PROJECT_VERSION "GENTOO_PV")
40 -+ set(PROJECT_VERSION_MAJOR 5)
41 -+
42 -+ cmake_minimum_required(VERSION 3.0)
43 -+
44 -+ set(QT_MIN_VERSION "5.11.0")
45 -+ set(KF5_MIN_VERSION "5.54.0")
46 -+ find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core DBus)
47 -+ find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
48 -+ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
49 -+
50 -+ include(KDEInstallDirs)
51 -+ include(KDECMakeSettings)
52 -+ include(KDECompilerSettings NO_POLICY_SCOPE)
53 -+ include(ECMMarkNonGuiExecutable)
54 -+ include(CMakePackageConfigHelpers)
55 -+ include(WriteBasicConfigVersionFile)
56 -+ include(CheckIncludeFiles)
57 -+ include(FeatureSummary)
58 -+ include(ECMQtDeclareLoggingCategory)
59 -+ include(KDEPackageAppTemplates)
60 -+ include(ECMMarkAsTest)
61 -+ include(GenerateExportHeader)
62 -+
63 -+ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS CoreAddons I18n Plasma WindowSystem)
64 -+
65 -+ find_package(KWinDBusInterface CONFIG REQUIRED)
66 -+
67 -+ find_package(X11)
68 -+ set_package_properties(X11 PROPERTIES DESCRIPTION "X11 libraries"
69 -+ URL "http://www.x.org"
70 -+ TYPE OPTIONAL
71 -+ PURPOSE "Required for X11 support")
72 -+
73 -+ if(X11_FOUND)
74 -+ find_package(Qt5X11Extras ${QT_MIN_VERSION} CONFIG REQUIRED)
75 -+ set(HAVE_X11 1)
76 -+ endif()
77 -+
78 -+ if(BUILD_TESTING)
79 -+ find_package(Qt5Test ${QT_MIN_VERSION} CONFIG REQUIRED)
80 -+ endif()
81 -+
82 -+ check_include_files(unistd.h HAVE_UNISTD_H)
83 -+
84 -+ configure_file(../config-workspace.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-workspace.h)
85 -+ configure_file(../config-X11.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-X11.h)
86 -+
87 -+ set(ksmserver_xml ../ksmserver/org.kde.KSMServerInterface.xml)
88 -+else()
89 -+ set(ksmserver_xml ${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.KSMServerInterface.xml)
90 -+ set_source_files_properties(${KWIN_INTERFACE} PROPERTIES INCLUDE "interface_util.h")
91 -+endif()
92 -
93 - set(kworkspace_LIB_SRCS kdisplaymanager.cpp
94 - kworkspace.cpp
95 -@@ -9,11 +65,7 @@ remove_definitions(-DQT_NO_CAST_FROM_BYTEARRAY)
96 - remove_definitions(-DQT_NO_CAST_TO_ASCII)
97 -
98 -
99 --set(ksmserver_xml ${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.KSMServerInterface.xml)
100 - qt5_add_dbus_interface( kworkspace_LIB_SRCS ${ksmserver_xml} ksmserver_interface )
101 --
102 --set_source_files_properties(${KWIN_INTERFACE} PROPERTIES INCLUDE "interface_util.h")
103 --
104 - qt5_add_dbus_interface( kworkspace_LIB_SRCS ${KWIN_INTERFACE} kwin_interface )
105 -
106 -
107 -@@ -77,3 +129,7 @@ install(EXPORT libkworkspaceLibraryTargets
108 - if(BUILD_TESTING)
109 - add_subdirectory(autotests)
110 - endif()
111 -+
112 -+if ("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
113 -+ feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
114 -+endif()
115 ---
116 -2.19.1
117 -