Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: kde-plasma/kdeplasma-addons/files/
Date: Wed, 22 Dec 2021 11:14:26
Message-Id: 1640171646.ed08eeac3a4a93b5e40646e13ca61dce9ec41627.asturm@gentoo
1 commit: ed08eeac3a4a93b5e40646e13ca61dce9ec41627
2 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
3 AuthorDate: Wed Dec 22 07:07:33 2021 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Wed Dec 22 11:14:06 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed08eeac
7
8 kde-plasma/kdeplasma-addons: remove unused patch(es)
9
10 Package-Manager: Portage-3.0.30, Repoman-3.0.3
11 Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
12 Closes: https://github.com/gentoo/gentoo/pull/23466
13 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
14
15 .../kdeplasma-addons-5.19.3-kross-optional.patch | 65 ----------------------
16 1 file changed, 65 deletions(-)
17
18 diff --git a/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.19.3-kross-optional.patch b/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.19.3-kross-optional.patch
19 deleted file mode 100644
20 index 485acd542a83..000000000000
21 --- a/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.19.3-kross-optional.patch
22 +++ /dev/null
23 @@ -1,65 +0,0 @@
24 -From bbaaa3e2eac712887780c0849f955889e64ff358 Mon Sep 17 00:00:00 2001
25 -From: Andreas Sturmlechner <asturm@g.o>
26 -Date: Tue, 7 Jul 2020 22:22:13 +0200
27 -Subject: [PATCH] Make KF5Kross optional, it is only used for comic applet
28 -
29 ----
30 - CMakeLists.txt | 7 ++++++-
31 - applets/CMakeLists.txt | 4 +++-
32 - dataengines/CMakeLists.txt | 4 +++-
33 - 3 files changed, 12 insertions(+), 3 deletions(-)
34 -
35 -diff --git a/CMakeLists.txt b/CMakeLists.txt
36 -index 9c4697a52..e5d14bc8c 100644
37 ---- a/CMakeLists.txt
38 -+++ b/CMakeLists.txt
39 -@@ -48,7 +48,6 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
40 - IconThemes
41 - KIO
42 - KCMUtils
43 -- Kross
44 - Notifications
45 - Plasma
46 - Runner
47 -@@ -59,6 +58,12 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
48 - NewStuff
49 - )
50 -
51 -+find_package(KF5Kross CONFIG QUIET)
52 -+set_package_properties(KF5Kross PROPERTIES
53 -+ PURPOSE "Needed for Comic applet"
54 -+ TYPE OPTIONAL
55 -+)
56 -+
57 - find_package(KF5Purpose CONFIG QUIET)
58 - set_package_properties(KF5Purpose PROPERTIES
59 - DESCRIPTION "Framework for cross-application services and actions"
60 -diff --git a/applets/CMakeLists.txt b/applets/CMakeLists.txt
61 -index 93b637b1b..6af5ffc67 100644
62 ---- a/applets/CMakeLists.txt
63 -+++ b/applets/CMakeLists.txt
64 -@@ -6,7 +6,9 @@ plasma_install_package(keyboardindicator org.kde.plasma.keyboardindicator)
65 - add_subdirectory(binary-clock)
66 - add_subdirectory(calculator)
67 - add_subdirectory(colorpicker)
68 --add_subdirectory(comic)
69 -+if(KF5Kross_FOUND)
70 -+ add_subdirectory(comic)
71 -+endif()
72 - add_subdirectory(dict)
73 - if(NOT WIN32)
74 - # uses the command line tool 'quota', does not make sense on Windows
75 -diff --git a/dataengines/CMakeLists.txt b/dataengines/CMakeLists.txt
76 -index 8d91dd84f..38f715b11 100644
77 ---- a/dataengines/CMakeLists.txt
78 -+++ b/dataengines/CMakeLists.txt
79 -@@ -1,3 +1,5 @@
80 -- add_subdirectory(comic)
81 -+if(KF5Kross_FOUND)
82 -+ add_subdirectory(comic)
83 -+endif()
84 - add_subdirectory(potd)
85 - add_subdirectory(konsoleprofiles)
86 ---
87 -2.27.0
88 -