diff options
author | Andreas Sturmlechner <asturm@gentoo.org> | 2021-01-07 13:57:39 +0100 |
---|---|---|
committer | Andreas Sturmlechner <asturm@gentoo.org> | 2021-01-07 18:28:25 +0100 |
commit | f14d8891be79be48af0ee69928790842416f6c74 (patch) | |
tree | 301e952c781552378a28e46266a8abcdaf5b0cca /kde-apps/libkcddb | |
parent | kde-apps/kwave: 20.12.1 version bump (diff) | |
download | gentoo-f14d8891be79be48af0ee69928790842416f6c74.tar.gz gentoo-f14d8891be79be48af0ee69928790842416f6c74.tar.bz2 gentoo-f14d8891be79be48af0ee69928790842416f6c74.zip |
kde-apps/libkcddb: 20.12.1 version bump
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'kde-apps/libkcddb')
-rw-r--r-- | kde-apps/libkcddb/Manifest | 1 | ||||
-rw-r--r-- | kde-apps/libkcddb/files/libkcddb-20.12.1-unused-dep.patch | 54 | ||||
-rw-r--r-- | kde-apps/libkcddb/libkcddb-20.12.1.ebuild | 50 |
3 files changed, 105 insertions, 0 deletions
diff --git a/kde-apps/libkcddb/Manifest b/kde-apps/libkcddb/Manifest index 35dbbabe5dc3..dffe3417de70 100644 --- a/kde-apps/libkcddb/Manifest +++ b/kde-apps/libkcddb/Manifest @@ -1,2 +1,3 @@ DIST libkcddb-20.08.3.tar.xz 425284 BLAKE2B 8300846872e4984876a4f872abea71df9a189ad317c2b8fdce386bb21be2e548a3487858944e71eeaea402f8ef81c44e1d3d1ac1e4af460770c370da1d2a66d6 SHA512 9ce75fd66d541b38408ec67810b27dee9b7939f306d6b6b956aab489c5887ef13d41d8ec95802b859f8a4d2605422bb4aa00467dcaeedcd22f149727b84bb1c6 DIST libkcddb-20.12.0.tar.xz 425080 BLAKE2B a65ee00f79d260d8cd0b9e1ca8fdd93b622376af4cefcfab72572576f0c0690e2136c6ccd505139c29ce0a1f206eafc4763778b06c4c3395278a9591250f3fee SHA512 e4358b62a0b1f22177ede4e55b7c83544a58f62c14c023b70e75c9998ed3f3deb9fbefa0b21766e291cd9ae4ff1aff156539284cb0d88bd0b769dfab9c28d258 +DIST libkcddb-20.12.1.tar.xz 425016 BLAKE2B 75c8442fc75c60ed41e7fdc8c9ea4bb762813d50c70d25a9737cc982e147c28add13a5dd106920998650d8d85c5d7fef59c7d2d4936a01c9d5ffc2dd89c258c6 SHA512 62a0251f7766064f9bc994606679c0c86d1c0e413da3e8148e599a6bf7ea4262680bc6fee84a7df368062bfbe8a84974c45f6981fd05f983a994eb3b4472ff2a 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 000000000000..908d8ee93964 --- /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" <kossebau@kde.org> +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.1.ebuild b/kde-apps/libkcddb/libkcddb-20.12.1.ebuild new file mode 100644 index 000000000000..5ad18475ba73 --- /dev/null +++ b/kde-apps/libkcddb/libkcddb-20.12.1.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +ECM_HANDBOOK="forceoptional" +ECM_TEST="true" +KFMIN=5.75.0 +QTMIN=5.15.1 +inherit ecm kde.org + +DESCRIPTION="KDE library for CDDB" + +LICENSE="GPL-2+ handbook? ( FDL-1.2 )" +SLOT="5" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +IUSE="musicbrainz" + +DEPEND=" + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtnetwork-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kconfigwidgets-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kio-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + musicbrainz? ( media-libs/musicbrainz:5 ) +" +RDEPEND="${DEPEND}" + +# tests require network access and compare static data with online data +# bug 280996 +RESTRICT+=" test" + +PATCHES=( "${FILESDIR}/${PN}-20.12.1-unused-dep.patch" ) + +src_prepare() { + ecm_src_prepare + use handbook || cmake_run_in kcmcddb cmake_comment_add_subdirectory doc +} + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package musicbrainz MusicBrainz5) + ) + + ecm_src_configure +} |