commit: 57100d7e0efd70e09376c532da20d7c5d0adcc6c Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Tue Dec 29 09:51:29 2020 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Tue Dec 29 09:51:29 2020 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=57100d7e
kde-apps/libkcddb: Drop unused DEPEND Upstream commit fdddc63be6b5a2b95bd3ff7177b02e58d922bed2 Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../files/libkcddb-20.12.1-unused-dep.patch | 54 ++++++++++++++++++++++ kde-apps/libkcddb/libkcddb-20.12.49.9999.ebuild | 3 +- kde-apps/libkcddb/libkcddb-9999.ebuild | 1 - 3 files changed, 56 insertions(+), 2 deletions(-) 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 new file mode 100644 index 0000000000..908d8ee939 --- /dev/null +++ b/kde-apps/libkcddb/files/libkcddb-20.12.1-unused-dep.patch @@ -0,0 +1,54 @@ +From fdddc63be6b5a2b95bd3ff7177b02e58d922bed2 Mon Sep 17 00:00:00 2001 +From: "Friedrich W. H. Kossebau" <[email protected]> +Date: Tue, 29 Dec 2020 09:10:33 +0100 +Subject: [PATCH] Drop unused linkage to KF5::Codecs + +GIT_SILENT + +* asturm 2020-12-29: rebased, added relevant include cleanup part from 44a7ec47 +--- + CMakeLists.txt | 2 +- + libkcddb/CMakeLists.txt | 1 - + 2 files changed, 1 insertion(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b9ee121..30a6717 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -21,7 +21,7 @@ + set(REQUIRED_QT_VERSION 5.4.0) + + find_package(Qt5 ${REQUIRED_QT_VERSION} REQUIRED COMPONENTS Network Widgets) +-find_package(KF5 ${KF5_DEP_VERSION} REQUIRED COMPONENTS Config DocTools Codecs I18n KIO WidgetsAddons) ++find_package(KF5 ${KF5_DEP_VERSION} REQUIRED COMPONENTS Config DocTools I18n KIO WidgetsAddons) + + ecm_setup_version("5.0.0" + VARIABLE_PREFIX KCDDB +diff --git a/libkcddb/CMakeLists.txt b/libkcddb/CMakeLists.txt +index e0c0e6a..3b239a9 100644 +--- a/libkcddb/CMakeLists.txt ++++ b/libkcddb/CMakeLists.txt +@@ -52,7 +52,6 @@ target_link_libraries(KF5Cddb + PUBLIC + KF5::ConfigGui + PRIVATE +- KF5::Codecs + KF5::I18n + KF5::KIOCore + Qt5::Network) +diff --git a/libkcddb/musicbrainz/musicbrainzlookup.cpp b/libkcddb/musicbrainz/musicbrainzlookup.cpp +index b8e7261..89b89db 100644 +--- a/libkcddb/musicbrainz/musicbrainzlookup.cpp ++++ b/libkcddb/musicbrainz/musicbrainzlookup.cpp +@@ -21,8 +21,6 @@ + #include <musicbrainz5/NameCredit.h> + #include <musicbrainz5/SecondaryType.h> + +-#include <KCodecs/KCodecs> +- + #include <QCryptographicHash> + #include <QDebug> + +-- +GitLab + diff --git a/kde-apps/libkcddb/libkcddb-20.12.49.9999.ebuild b/kde-apps/libkcddb/libkcddb-20.12.49.9999.ebuild index b166cfb87a..43eb73f470 100644 --- a/kde-apps/libkcddb/libkcddb-20.12.49.9999.ebuild +++ b/kde-apps/libkcddb/libkcddb-20.12.49.9999.ebuild @@ -20,7 +20,6 @@ DEPEND=" >=dev-qt/qtgui-${QTMIN}:5 >=dev-qt/qtnetwork-${QTMIN}:5 >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/kcodecs-${KFMIN}:5 >=kde-frameworks/kconfig-${KFMIN}:5 >=kde-frameworks/kconfigwidgets-${KFMIN}:5 >=kde-frameworks/kcoreaddons-${KFMIN}:5 @@ -35,6 +34,8 @@ RDEPEND="${DEPEND}" # bug 280996 RESTRICT+=" test" +PATCHES=( "${FILESDIR}/${PN}-20.12.1-unused-dep.patch" ) + src_prepare() { ecm_src_prepare diff --git a/kde-apps/libkcddb/libkcddb-9999.ebuild b/kde-apps/libkcddb/libkcddb-9999.ebuild index b166cfb87a..59e885bf55 100644 --- a/kde-apps/libkcddb/libkcddb-9999.ebuild +++ b/kde-apps/libkcddb/libkcddb-9999.ebuild @@ -20,7 +20,6 @@ DEPEND=" >=dev-qt/qtgui-${QTMIN}:5 >=dev-qt/qtnetwork-${QTMIN}:5 >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/kcodecs-${KFMIN}:5 >=kde-frameworks/kconfig-${KFMIN}:5 >=kde-frameworks/kconfigwidgets-${KFMIN}:5 >=kde-frameworks/kcoreaddons-${KFMIN}:5
