| 1 |
commit: ab9c75048a5b18be5bd5a446b4404c2305792d1b |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Sep 6 19:29:04 2022 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Sep 7 18:12:41 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=ab9c7504 |
| 7 |
|
| 8 |
kde-plasma/discover: Drop unused patch |
| 9 |
|
| 10 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 11 |
|
| 12 |
.../files/discover-5.21.90-tests-optional.patch | 94 ---------------------- |
| 13 |
1 file changed, 94 deletions(-) |
| 14 |
|
| 15 |
diff --git a/kde-plasma/discover/files/discover-5.21.90-tests-optional.patch b/kde-plasma/discover/files/discover-5.21.90-tests-optional.patch |
| 16 |
deleted file mode 100644 |
| 17 |
index 43976d145b..0000000000 |
| 18 |
--- a/kde-plasma/discover/files/discover-5.21.90-tests-optional.patch |
| 19 |
+++ /dev/null |
| 20 |
@@ -1,94 +0,0 @@ |
| 21 |
-From f9e0be7a43665a7020e4bfffde0f48b332ec366b Mon Sep 17 00:00:00 2001 |
| 22 |
-From: Andreas Sturmlechner <asturm@g.o> |
| 23 |
-Date: Fri, 14 May 2021 12:38:57 +0200 |
| 24 |
-Subject: [PATCH] Use BUILD_TESTING to make tests optional |
| 25 |
- |
| 26 |
-Variable is provided by KDECMakeSettings and default enabled. |
| 27 |
- |
| 28 |
-Signed-off-by: Andreas Sturmlechner <asturm@g.o> |
| 29 |
---- |
| 30 |
- CMakeLists.txt | 6 +++++- |
| 31 |
- libdiscover/CMakeLists.txt | 4 +++- |
| 32 |
- libdiscover/backends/DummyBackend/CMakeLists.txt | 4 +++- |
| 33 |
- libdiscover/backends/FlatpakBackend/CMakeLists.txt | 4 +++- |
| 34 |
- libdiscover/backends/KNSBackend/CMakeLists.txt | 4 +++- |
| 35 |
- 5 files changed, 17 insertions(+), 5 deletions(-) |
| 36 |
- |
| 37 |
-diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 38 |
-index 73061dde..7d230317 100644 |
| 39 |
---- a/CMakeLists.txt |
| 40 |
-+++ b/CMakeLists.txt |
| 41 |
-@@ -11,7 +11,7 @@ find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE) |
| 42 |
- |
| 43 |
- set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake") |
| 44 |
- |
| 45 |
--find_package(Qt5 ${QT_MIN_VERSION} REQUIRED CONFIG COMPONENTS Widgets Test Network Xml Concurrent DBus Quick X11Extras) |
| 46 |
-+find_package(Qt5 ${QT_MIN_VERSION} REQUIRED CONFIG COMPONENTS Widgets Network Xml Concurrent DBus Quick X11Extras) |
| 47 |
- include(KDEInstallDirs) |
| 48 |
- include(KDECMakeSettings) |
| 49 |
- include(KDECompilerSettings NO_POLICY_SCOPE) |
| 50 |
-@@ -23,6 +23,10 @@ include(ECMQtDeclareLoggingCategory) |
| 51 |
- include(KDEClangFormat) |
| 52 |
- include(KDEGitCommitHooks) |
| 53 |
- |
| 54 |
-+if(BUILD_TESTING) |
| 55 |
-+ find_package(Qt5Test ${QT_MIN_VERSION} CONFIG REQUIRED) |
| 56 |
-+endif() |
| 57 |
-+ |
| 58 |
- find_package(PkgConfig REQUIRED) |
| 59 |
- |
| 60 |
- find_package(KF5 ${KF5_MIN_VERSION} REQUIRED CoreAddons Config Crash DBusAddons I18n Archive XmlGui ItemModels KIO Declarative KCMUtils IdleTime) |
| 61 |
-diff --git a/libdiscover/CMakeLists.txt b/libdiscover/CMakeLists.txt |
| 62 |
-index 661c371b..56c72008 100644 |
| 63 |
---- a/libdiscover/CMakeLists.txt |
| 64 |
-+++ b/libdiscover/CMakeLists.txt |
| 65 |
-@@ -4,7 +4,9 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config-paths.h.cmake ${CMAKE_CURRENT_ |
| 66 |
- |
| 67 |
- add_subdirectory(backends) |
| 68 |
- add_subdirectory(notifiers) |
| 69 |
--add_subdirectory(tests) |
| 70 |
-+if(BUILD_TESTING) |
| 71 |
-+ add_subdirectory(tests) |
| 72 |
-+endif() |
| 73 |
- |
| 74 |
- set(discovercommon_SRCS |
| 75 |
- Category/Category.cpp |
| 76 |
-diff --git a/libdiscover/backends/DummyBackend/CMakeLists.txt b/libdiscover/backends/DummyBackend/CMakeLists.txt |
| 77 |
-index 5b4aef10..38377d80 100644 |
| 78 |
---- a/libdiscover/backends/DummyBackend/CMakeLists.txt |
| 79 |
-+++ b/libdiscover/backends/DummyBackend/CMakeLists.txt |
| 80 |
-@@ -1,4 +1,6 @@ |
| 81 |
--add_subdirectory(tests) |
| 82 |
-+if(BUILD_TESTING) |
| 83 |
-+ add_subdirectory(tests) |
| 84 |
-+endif() |
| 85 |
- |
| 86 |
- set(dummy-backend_SRCS |
| 87 |
- DummyResource.cpp |
| 88 |
-diff --git a/libdiscover/backends/FlatpakBackend/CMakeLists.txt b/libdiscover/backends/FlatpakBackend/CMakeLists.txt |
| 89 |
-index 2006a829..810238f0 100644 |
| 90 |
---- a/libdiscover/backends/FlatpakBackend/CMakeLists.txt |
| 91 |
-+++ b/libdiscover/backends/FlatpakBackend/CMakeLists.txt |
| 92 |
-@@ -1,4 +1,6 @@ |
| 93 |
--add_subdirectory(tests) |
| 94 |
-+if(BUILD_TESTING) |
| 95 |
-+ add_subdirectory(tests) |
| 96 |
-+endif() |
| 97 |
- |
| 98 |
- set(flatpak-backend_SRCS |
| 99 |
- FlatpakResource.cpp |
| 100 |
-diff --git a/libdiscover/backends/KNSBackend/CMakeLists.txt b/libdiscover/backends/KNSBackend/CMakeLists.txt |
| 101 |
-index e2cb4e52..195cb98a 100644 |
| 102 |
---- a/libdiscover/backends/KNSBackend/CMakeLists.txt |
| 103 |
-+++ b/libdiscover/backends/KNSBackend/CMakeLists.txt |
| 104 |
-@@ -1,4 +1,6 @@ |
| 105 |
--add_subdirectory(tests) |
| 106 |
-+if(BUILD_TESTING) |
| 107 |
-+ add_subdirectory(tests) |
| 108 |
-+endif() |
| 109 |
- |
| 110 |
- add_library(kns-backend MODULE |
| 111 |
- KNSBackend.cpp |
| 112 |
--- |
| 113 |
-2.31.1 |
| 114 |
- |
Archives