commit: b2ade6aa95892c2c765c040e992e27efe5d6ccae Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> AuthorDate: Sat Mar 4 00:13:16 2017 +0000 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> CommitDate: Sat Mar 4 00:13:42 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2ade6aa
media-sound/kid3: add patch to fix bogus dependencies Gentoo-bug: 600816 Package-Manager: Portage-2.3.4, Repoman-2.3.2 media-sound/kid3/files/kid3-3.4.4-deps.patch | 40 ++++++++++++++++++++++++++++ media-sound/kid3/kid3-3.4.4.ebuild | 7 +++-- media-sound/kid3/kid3-3.4.5.ebuild | 5 +++- 3 files changed, 49 insertions(+), 3 deletions(-) diff --git a/media-sound/kid3/files/kid3-3.4.4-deps.patch b/media-sound/kid3/files/kid3-3.4.4-deps.patch new file mode 100644 index 00000000000..333645d11b3 --- /dev/null +++ b/media-sound/kid3/files/kid3-3.4.4-deps.patch @@ -0,0 +1,40 @@ +From 2f66191a82e60a2b46ead8aa2195346084817e91 Mon Sep 17 00:00:00 2001 +From: Michael Palimaka <[email protected]> +Date: Sun, 27 Nov 2016 20:00:37 +1100 +Subject: [PATCH] Improve KF5 dependencies. + +This list was compiled from a cusory include and NEEDED inspection. +--- + src/app/CMakeLists.txt | 2 +- + src/app/kde/CMakeLists.txt | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt +index 516e3f9..7790fde 100644 +--- a/src/app/CMakeLists.txt ++++ b/src/app/CMakeLists.txt +@@ -33,7 +33,7 @@ if (BUILD_KDE_APP) + include(KDECMakeSettings) + include(FeatureSummary) + +- find_package(KF5 REQUIRED COMPONENTS KIO) ++ find_package(KF5 REQUIRED COMPONENTS Config ConfigWidgets CoreAddons WidgetsAddons XmlGui) + + if (BUILD_SHARED_LIBS) + # KDECMakeSettings.cmake will overwrite our RPATH if LIB_INSTALL_DIR is +diff --git a/src/app/kde/CMakeLists.txt b/src/app/kde/CMakeLists.txt +index 2f2867a..8a25b43 100644 +--- a/src/app/kde/CMakeLists.txt ++++ b/src/app/kde/CMakeLists.txt +@@ -13,7 +13,7 @@ if (HAVE_QT5) + + add_executable(kid3 ${kde_SRCS}) + +- target_link_libraries(kid3 kid3-gui KF5::KIOFileWidgets -lstdc++) ++ target_link_libraries(kid3 kid3-gui KF5::ConfigCore KF5::ConfigGui KF5::ConfigWidgets KF5::CoreAddons KF5::WidgetsAddons KF5::XmlGui -lstdc++) + + install(TARGETS kid3 DESTINATION ${BIN_INSTALL_DIR}) + install(FILES ../kid3.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) +-- +2.10.2 + diff --git a/media-sound/kid3/kid3-3.4.4.ebuild b/media-sound/kid3/kid3-3.4.4.ebuild index 0b3b01da896..bf68212703b 100644 --- a/media-sound/kid3/kid3-3.4.4.ebuild +++ b/media-sound/kid3/kid3-3.4.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -57,7 +57,10 @@ DEPEND="${COMMON_DEPEND} $(add_qt_dep linguist-tools) " -PATCHES=( "${FILESDIR}/${PN}-3.3.2-libdir.patch" ) +PATCHES=( + "${FILESDIR}/${PN}-3.3.2-libdir.patch" + "${FILESDIR}/${PN}-3.4.4-deps.patch" +) src_prepare() { # overengineered upstream build system diff --git a/media-sound/kid3/kid3-3.4.5.ebuild b/media-sound/kid3/kid3-3.4.5.ebuild index 185eeebb5fb..3d01c46745d 100644 --- a/media-sound/kid3/kid3-3.4.5.ebuild +++ b/media-sound/kid3/kid3-3.4.5.ebuild @@ -56,7 +56,10 @@ DEPEND="${COMMON_DEPEND} $(add_qt_dep linguist-tools) " -PATCHES=( "${FILESDIR}/${PN}-3.3.2-libdir.patch" ) +PATCHES=( + "${FILESDIR}/${PN}-3.3.2-libdir.patch" + "${FILESDIR}/${PN}-3.4.4-deps.patch" +) src_prepare() { # overengineered upstream build system
