| 1 |
commit: b2ade6aa95892c2c765c040e992e27efe5d6ccae |
| 2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Mar 4 00:13:16 2017 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Mar 4 00:13:42 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2ade6aa |
| 7 |
|
| 8 |
media-sound/kid3: add patch to fix bogus dependencies |
| 9 |
|
| 10 |
Gentoo-bug: 600816 |
| 11 |
Package-Manager: Portage-2.3.4, Repoman-2.3.2 |
| 12 |
|
| 13 |
media-sound/kid3/files/kid3-3.4.4-deps.patch | 40 ++++++++++++++++++++++++++++ |
| 14 |
media-sound/kid3/kid3-3.4.4.ebuild | 7 +++-- |
| 15 |
media-sound/kid3/kid3-3.4.5.ebuild | 5 +++- |
| 16 |
3 files changed, 49 insertions(+), 3 deletions(-) |
| 17 |
|
| 18 |
diff --git a/media-sound/kid3/files/kid3-3.4.4-deps.patch b/media-sound/kid3/files/kid3-3.4.4-deps.patch |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..333645d11b3 |
| 21 |
--- /dev/null |
| 22 |
+++ b/media-sound/kid3/files/kid3-3.4.4-deps.patch |
| 23 |
@@ -0,0 +1,40 @@ |
| 24 |
+From 2f66191a82e60a2b46ead8aa2195346084817e91 Mon Sep 17 00:00:00 2001 |
| 25 |
+From: Michael Palimaka <kensington@g.o> |
| 26 |
+Date: Sun, 27 Nov 2016 20:00:37 +1100 |
| 27 |
+Subject: [PATCH] Improve KF5 dependencies. |
| 28 |
+ |
| 29 |
+This list was compiled from a cusory include and NEEDED inspection. |
| 30 |
+--- |
| 31 |
+ src/app/CMakeLists.txt | 2 +- |
| 32 |
+ src/app/kde/CMakeLists.txt | 2 +- |
| 33 |
+ 2 files changed, 2 insertions(+), 2 deletions(-) |
| 34 |
+ |
| 35 |
+diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt |
| 36 |
+index 516e3f9..7790fde 100644 |
| 37 |
+--- a/src/app/CMakeLists.txt |
| 38 |
++++ b/src/app/CMakeLists.txt |
| 39 |
+@@ -33,7 +33,7 @@ if (BUILD_KDE_APP) |
| 40 |
+ include(KDECMakeSettings) |
| 41 |
+ include(FeatureSummary) |
| 42 |
+ |
| 43 |
+- find_package(KF5 REQUIRED COMPONENTS KIO) |
| 44 |
++ find_package(KF5 REQUIRED COMPONENTS Config ConfigWidgets CoreAddons WidgetsAddons XmlGui) |
| 45 |
+ |
| 46 |
+ if (BUILD_SHARED_LIBS) |
| 47 |
+ # KDECMakeSettings.cmake will overwrite our RPATH if LIB_INSTALL_DIR is |
| 48 |
+diff --git a/src/app/kde/CMakeLists.txt b/src/app/kde/CMakeLists.txt |
| 49 |
+index 2f2867a..8a25b43 100644 |
| 50 |
+--- a/src/app/kde/CMakeLists.txt |
| 51 |
++++ b/src/app/kde/CMakeLists.txt |
| 52 |
+@@ -13,7 +13,7 @@ if (HAVE_QT5) |
| 53 |
+ |
| 54 |
+ add_executable(kid3 ${kde_SRCS}) |
| 55 |
+ |
| 56 |
+- target_link_libraries(kid3 kid3-gui KF5::KIOFileWidgets -lstdc++) |
| 57 |
++ target_link_libraries(kid3 kid3-gui KF5::ConfigCore KF5::ConfigGui KF5::ConfigWidgets KF5::CoreAddons KF5::WidgetsAddons KF5::XmlGui -lstdc++) |
| 58 |
+ |
| 59 |
+ install(TARGETS kid3 DESTINATION ${BIN_INSTALL_DIR}) |
| 60 |
+ install(FILES ../kid3.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) |
| 61 |
+-- |
| 62 |
+2.10.2 |
| 63 |
+ |
| 64 |
|
| 65 |
diff --git a/media-sound/kid3/kid3-3.4.4.ebuild b/media-sound/kid3/kid3-3.4.4.ebuild |
| 66 |
index 0b3b01da896..bf68212703b 100644 |
| 67 |
--- a/media-sound/kid3/kid3-3.4.4.ebuild |
| 68 |
+++ b/media-sound/kid3/kid3-3.4.4.ebuild |
| 69 |
@@ -1,4 +1,4 @@ |
| 70 |
-# Copyright 1999-2016 Gentoo Foundation |
| 71 |
+# Copyright 1999-2017 Gentoo Foundation |
| 72 |
# Distributed under the terms of the GNU General Public License v2 |
| 73 |
|
| 74 |
EAPI=6 |
| 75 |
@@ -57,7 +57,10 @@ DEPEND="${COMMON_DEPEND} |
| 76 |
$(add_qt_dep linguist-tools) |
| 77 |
" |
| 78 |
|
| 79 |
-PATCHES=( "${FILESDIR}/${PN}-3.3.2-libdir.patch" ) |
| 80 |
+PATCHES=( |
| 81 |
+ "${FILESDIR}/${PN}-3.3.2-libdir.patch" |
| 82 |
+ "${FILESDIR}/${PN}-3.4.4-deps.patch" |
| 83 |
+) |
| 84 |
|
| 85 |
src_prepare() { |
| 86 |
# overengineered upstream build system |
| 87 |
|
| 88 |
diff --git a/media-sound/kid3/kid3-3.4.5.ebuild b/media-sound/kid3/kid3-3.4.5.ebuild |
| 89 |
index 185eeebb5fb..3d01c46745d 100644 |
| 90 |
--- a/media-sound/kid3/kid3-3.4.5.ebuild |
| 91 |
+++ b/media-sound/kid3/kid3-3.4.5.ebuild |
| 92 |
@@ -56,7 +56,10 @@ DEPEND="${COMMON_DEPEND} |
| 93 |
$(add_qt_dep linguist-tools) |
| 94 |
" |
| 95 |
|
| 96 |
-PATCHES=( "${FILESDIR}/${PN}-3.3.2-libdir.patch" ) |
| 97 |
+PATCHES=( |
| 98 |
+ "${FILESDIR}/${PN}-3.3.2-libdir.patch" |
| 99 |
+ "${FILESDIR}/${PN}-3.4.4-deps.patch" |
| 100 |
+) |
| 101 |
|
| 102 |
src_prepare() { |
| 103 |
# overengineered upstream build system |
Archives