1 |
commit: 57100d7e0efd70e09376c532da20d7c5d0adcc6c |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Dec 29 09:51:29 2020 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Dec 29 09:51:29 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=57100d7e |
7 |
|
8 |
kde-apps/libkcddb: Drop unused DEPEND |
9 |
|
10 |
Upstream commit fdddc63be6b5a2b95bd3ff7177b02e58d922bed2 |
11 |
|
12 |
Package-Manager: Portage-3.0.12, Repoman-3.0.2 |
13 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
14 |
|
15 |
.../files/libkcddb-20.12.1-unused-dep.patch | 54 ++++++++++++++++++++++ |
16 |
kde-apps/libkcddb/libkcddb-20.12.49.9999.ebuild | 3 +- |
17 |
kde-apps/libkcddb/libkcddb-9999.ebuild | 1 - |
18 |
3 files changed, 56 insertions(+), 2 deletions(-) |
19 |
|
20 |
diff --git a/kde-apps/libkcddb/files/libkcddb-20.12.1-unused-dep.patch b/kde-apps/libkcddb/files/libkcddb-20.12.1-unused-dep.patch |
21 |
new file mode 100644 |
22 |
index 0000000000..908d8ee939 |
23 |
--- /dev/null |
24 |
+++ b/kde-apps/libkcddb/files/libkcddb-20.12.1-unused-dep.patch |
25 |
@@ -0,0 +1,54 @@ |
26 |
+From fdddc63be6b5a2b95bd3ff7177b02e58d922bed2 Mon Sep 17 00:00:00 2001 |
27 |
+From: "Friedrich W. H. Kossebau" <kossebau@×××.org> |
28 |
+Date: Tue, 29 Dec 2020 09:10:33 +0100 |
29 |
+Subject: [PATCH] Drop unused linkage to KF5::Codecs |
30 |
+ |
31 |
+GIT_SILENT |
32 |
+ |
33 |
+* asturm 2020-12-29: rebased, added relevant include cleanup part from 44a7ec47 |
34 |
+--- |
35 |
+ CMakeLists.txt | 2 +- |
36 |
+ libkcddb/CMakeLists.txt | 1 - |
37 |
+ 2 files changed, 1 insertion(+), 2 deletions(-) |
38 |
+ |
39 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
40 |
+index b9ee121..30a6717 100644 |
41 |
+--- a/CMakeLists.txt |
42 |
++++ b/CMakeLists.txt |
43 |
+@@ -21,7 +21,7 @@ |
44 |
+ set(REQUIRED_QT_VERSION 5.4.0) |
45 |
+ |
46 |
+ find_package(Qt5 ${REQUIRED_QT_VERSION} REQUIRED COMPONENTS Network Widgets) |
47 |
+-find_package(KF5 ${KF5_DEP_VERSION} REQUIRED COMPONENTS Config DocTools Codecs I18n KIO WidgetsAddons) |
48 |
++find_package(KF5 ${KF5_DEP_VERSION} REQUIRED COMPONENTS Config DocTools I18n KIO WidgetsAddons) |
49 |
+ |
50 |
+ ecm_setup_version("5.0.0" |
51 |
+ VARIABLE_PREFIX KCDDB |
52 |
+diff --git a/libkcddb/CMakeLists.txt b/libkcddb/CMakeLists.txt |
53 |
+index e0c0e6a..3b239a9 100644 |
54 |
+--- a/libkcddb/CMakeLists.txt |
55 |
++++ b/libkcddb/CMakeLists.txt |
56 |
+@@ -52,7 +52,6 @@ target_link_libraries(KF5Cddb |
57 |
+ PUBLIC |
58 |
+ KF5::ConfigGui |
59 |
+ PRIVATE |
60 |
+- KF5::Codecs |
61 |
+ KF5::I18n |
62 |
+ KF5::KIOCore |
63 |
+ Qt5::Network) |
64 |
+diff --git a/libkcddb/musicbrainz/musicbrainzlookup.cpp b/libkcddb/musicbrainz/musicbrainzlookup.cpp |
65 |
+index b8e7261..89b89db 100644 |
66 |
+--- a/libkcddb/musicbrainz/musicbrainzlookup.cpp |
67 |
++++ b/libkcddb/musicbrainz/musicbrainzlookup.cpp |
68 |
+@@ -21,8 +21,6 @@ |
69 |
+ #include <musicbrainz5/NameCredit.h> |
70 |
+ #include <musicbrainz5/SecondaryType.h> |
71 |
+ |
72 |
+-#include <KCodecs/KCodecs> |
73 |
+- |
74 |
+ #include <QCryptographicHash> |
75 |
+ #include <QDebug> |
76 |
+ |
77 |
+-- |
78 |
+GitLab |
79 |
+ |
80 |
|
81 |
diff --git a/kde-apps/libkcddb/libkcddb-20.12.49.9999.ebuild b/kde-apps/libkcddb/libkcddb-20.12.49.9999.ebuild |
82 |
index b166cfb87a..43eb73f470 100644 |
83 |
--- a/kde-apps/libkcddb/libkcddb-20.12.49.9999.ebuild |
84 |
+++ b/kde-apps/libkcddb/libkcddb-20.12.49.9999.ebuild |
85 |
@@ -20,7 +20,6 @@ DEPEND=" |
86 |
>=dev-qt/qtgui-${QTMIN}:5 |
87 |
>=dev-qt/qtnetwork-${QTMIN}:5 |
88 |
>=dev-qt/qtwidgets-${QTMIN}:5 |
89 |
- >=kde-frameworks/kcodecs-${KFMIN}:5 |
90 |
>=kde-frameworks/kconfig-${KFMIN}:5 |
91 |
>=kde-frameworks/kconfigwidgets-${KFMIN}:5 |
92 |
>=kde-frameworks/kcoreaddons-${KFMIN}:5 |
93 |
@@ -35,6 +34,8 @@ RDEPEND="${DEPEND}" |
94 |
# bug 280996 |
95 |
RESTRICT+=" test" |
96 |
|
97 |
+PATCHES=( "${FILESDIR}/${PN}-20.12.1-unused-dep.patch" ) |
98 |
+ |
99 |
src_prepare() { |
100 |
ecm_src_prepare |
101 |
|
102 |
|
103 |
diff --git a/kde-apps/libkcddb/libkcddb-9999.ebuild b/kde-apps/libkcddb/libkcddb-9999.ebuild |
104 |
index b166cfb87a..59e885bf55 100644 |
105 |
--- a/kde-apps/libkcddb/libkcddb-9999.ebuild |
106 |
+++ b/kde-apps/libkcddb/libkcddb-9999.ebuild |
107 |
@@ -20,7 +20,6 @@ DEPEND=" |
108 |
>=dev-qt/qtgui-${QTMIN}:5 |
109 |
>=dev-qt/qtnetwork-${QTMIN}:5 |
110 |
>=dev-qt/qtwidgets-${QTMIN}:5 |
111 |
- >=kde-frameworks/kcodecs-${KFMIN}:5 |
112 |
>=kde-frameworks/kconfig-${KFMIN}:5 |
113 |
>=kde-frameworks/kconfigwidgets-${KFMIN}:5 |
114 |
>=kde-frameworks/kcoreaddons-${KFMIN}:5 |