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/drkonqi/files/, kde-plasma/drkonqi/
Date: Sun, 04 Jul 2021 20:51:04
Message-Id: 1625431837.cef695de6e4b84bf158dfdc450a0fe3853c02a39.asturm@gentoo
1 commit: cef695de6e4b84bf158dfdc450a0fe3853c02a39
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jul 4 20:50:37 2021 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sun Jul 4 20:50:37 2021 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=cef695de
7
8 kde-plasma/drkonqi: Drop unused DEPEND
9
10 Upstream commit 59dceeb53196063c568201d0c567bea7887b1cc4
11
12 Package-Manager: Portage-3.0.20, Repoman-3.0.3
13 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
14
15 kde-plasma/drkonqi/drkonqi-5.22.49.9999.ebuild | 3 +-
16 kde-plasma/drkonqi/drkonqi-9999.ebuild | 1 -
17 .../drkonqi/files/drkonqi-5.22.3-unused-dep.patch | 37 ++++++++++++++++++++++
18 3 files changed, 39 insertions(+), 2 deletions(-)
19
20 diff --git a/kde-plasma/drkonqi/drkonqi-5.22.49.9999.ebuild b/kde-plasma/drkonqi/drkonqi-5.22.49.9999.ebuild
21 index 32c20a6429..61f911b5b0 100644
22 --- a/kde-plasma/drkonqi/drkonqi-5.22.49.9999.ebuild
23 +++ b/kde-plasma/drkonqi/drkonqi-5.22.49.9999.ebuild
24 @@ -30,7 +30,6 @@ COMMON_DEPEND="
25 >=kde-frameworks/kio-${KFMIN}:5
26 >=kde-frameworks/kjobwidgets-${KFMIN}:5
27 >=kde-frameworks/knotifications-${KFMIN}:5
28 - >=kde-frameworks/kservice-${KFMIN}:5
29 >=kde-frameworks/kwallet-${KFMIN}:5
30 >=kde-frameworks/kwayland-${KFMIN}:5
31 >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
32 @@ -47,6 +46,8 @@ RDEPEND="${COMMON_DEPEND}
33 )
34 "
35
36 +PATCHES=( "${FILESDIR}/${PN}-5.22.3-unused-dep.patch" )
37 +
38 src_test() {
39 # needs network access, bug #698510
40 local myctestargs=(
41
42 diff --git a/kde-plasma/drkonqi/drkonqi-9999.ebuild b/kde-plasma/drkonqi/drkonqi-9999.ebuild
43 index 02fd02a44f..2ec227a5a3 100644
44 --- a/kde-plasma/drkonqi/drkonqi-9999.ebuild
45 +++ b/kde-plasma/drkonqi/drkonqi-9999.ebuild
46 @@ -30,7 +30,6 @@ COMMON_DEPEND="
47 >=kde-frameworks/kio-${KFMIN}:5
48 >=kde-frameworks/kjobwidgets-${KFMIN}:5
49 >=kde-frameworks/knotifications-${KFMIN}:5
50 - >=kde-frameworks/kservice-${KFMIN}:5
51 >=kde-frameworks/kwallet-${KFMIN}:5
52 >=kde-frameworks/kwayland-${KFMIN}:5
53 >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
54
55 diff --git a/kde-plasma/drkonqi/files/drkonqi-5.22.3-unused-dep.patch b/kde-plasma/drkonqi/files/drkonqi-5.22.3-unused-dep.patch
56 new file mode 100644
57 index 0000000000..d34638be71
58 --- /dev/null
59 +++ b/kde-plasma/drkonqi/files/drkonqi-5.22.3-unused-dep.patch
60 @@ -0,0 +1,37 @@
61 +From 59dceeb53196063c568201d0c567bea7887b1cc4 Mon Sep 17 00:00:00 2001
62 +From: Nicolas Fella <nicolas.fella@×××.de>
63 +Date: Sat, 3 Jul 2021 20:32:11 +0200
64 +Subject: [PATCH] Remove unused KService dep
65 +
66 +---
67 + src/CMakeLists.txt | 1 -
68 + src/statusnotifier.cpp | 1 -
69 + 2 files changed, 2 deletions(-)
70 +
71 +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
72 +index 1c176188..6ec2120e 100644
73 +--- a/src/CMakeLists.txt
74 ++++ b/src/CMakeLists.txt
75 +@@ -96,7 +96,6 @@ target_link_libraries(
76 + DrKonqiInternal
77 + KF5::I18n
78 + KF5::CoreAddons
79 +- KF5::Service
80 + KF5::ConfigWidgets
81 + KF5::JobWidgets
82 + KF5::KIOCore
83 +diff --git a/src/statusnotifier.cpp b/src/statusnotifier.cpp
84 +index 41271874..c5f795c0 100644
85 +--- a/src/statusnotifier.cpp
86 ++++ b/src/statusnotifier.cpp
87 +@@ -17,7 +17,6 @@
88 + #include <KIdleTime>
89 + #include <KLocalizedString>
90 + #include <KNotification>
91 +-#include <KService>
92 + #include <KStatusNotifierItem>
93 +
94 + #include "crashedapplication.h"
95 +--
96 +GitLab
97 +