commit: 6fb093cfe378711ce8b8829defe6456e58ec4915 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Fri Oct 10 11:22:20 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Fri Oct 10 11:25:44 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fb093cf
media-sound/kid3: drop 3.9.6-r3 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> media-sound/kid3/Manifest | 1 - media-sound/kid3/files/kid3-3.9.6-no-ndebug.patch | 54 --------- .../kid3-3.9.6-oggflacmetadata-buildfix.patch | 134 --------------------- media-sound/kid3/kid3-3.9.6-r3.ebuild | 97 --------------- 4 files changed, 286 deletions(-) diff --git a/media-sound/kid3/Manifest b/media-sound/kid3/Manifest index a0eed1dbe4a9..93e5492d6356 100644 --- a/media-sound/kid3/Manifest +++ b/media-sound/kid3/Manifest @@ -1,2 +1 @@ -DIST kid3-3.9.6.tar.xz 1872012 BLAKE2B 3945ca19f08baf84373ba34bcb9917f58d20f9208479a3a2d1319bdf50aae5cc56b906f5ac2caee5eb3d5c5f042a0ecdeff3e3ac0ecb499e6e3a32db436f2b1d SHA512 1667b3f5d458f9cc54e5b9af839c849e990a333eab3cfaa8d310b4d46b925ca5b57ea0ac9365a023fecc1ac2429f761dd2bfc0b3a3df48f5d4dd351c8741455f DIST kid3-3.9.7.tar.xz 1910860 BLAKE2B ba607bd2090ef8d977bc6d38142362bc9319d325cdcafe717d62caa06bb949867789807262e2c1168ea6b7ca117f840a480383a815e99752f385731ed022a7f8 SHA512 4559e33af6f49226e6fdbc0af9ab937b99fd639c7c62d2a9efbc5b97926c1f0cacdffa66c81938a1a039ada5be5156728fa3e319fbbfa45d1959a4f72f6c9093 diff --git a/media-sound/kid3/files/kid3-3.9.6-no-ndebug.patch b/media-sound/kid3/files/kid3-3.9.6-no-ndebug.patch deleted file mode 100644 index 8b4966a21509..000000000000 --- a/media-sound/kid3/files/kid3-3.9.6-no-ndebug.patch +++ /dev/null @@ -1,54 +0,0 @@ -From ae25a9642d06997c8896e98fa8a41daa202d6703 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <[email protected]> -Date: Wed, 12 Feb 2025 21:48:01 +0100 -Subject: [PATCH] Replace NDEBUG with QT_NO_DEBUG (as in src/core) - -See also: -https://bugs.gentoo.org/949369 -https://bugs.archlinux.org/task/69904 -https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=909148 - -Signed-off-by: Andreas Sturmlechner <[email protected]> ---- - src/app/qml/mainqml.cpp | 4 ++-- - src/plugins/qmlcommand/qmlcommandplugin.cpp | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/app/qml/mainqml.cpp b/src/app/qml/mainqml.cpp -index 09ebea31..ec8adfe0 100644 ---- a/src/app/qml/mainqml.cpp -+++ b/src/app/qml/mainqml.cpp -@@ -29,7 +29,7 @@ - #include <QTranslator> - #include <QDir> - #include <QSettings> --#if !defined NDEBUG && !defined QT_QML_DEBUG -+#ifndef QT_NO_DEBUG && !defined QT_QML_DEBUG - #define QT_QML_DEBUG - #endif - #include <QQmlApplicationEngine> -@@ -170,7 +170,7 @@ int main(int argc, char* argv[]) - #endif - - QStringList qmlDirs; --#if !defined NDEBUG && defined CFG_QMLSRCDIR -+#ifndef QT_NO_DEBUG && defined CFG_QMLSRCDIR - qmlDirs.append(QLatin1String(CFG_QMLSRCDIR)); - #endif - #ifdef CFG_QMLDIR -diff --git a/src/plugins/qmlcommand/qmlcommandplugin.cpp b/src/plugins/qmlcommand/qmlcommandplugin.cpp -index 504b0a4a..3a690b4d 100644 ---- a/src/plugins/qmlcommand/qmlcommandplugin.cpp -+++ b/src/plugins/qmlcommand/qmlcommandplugin.cpp -@@ -26,7 +26,7 @@ - - #include "qmlcommandplugin.h" - #include <QDir> --#if !defined NDEBUG && !defined QT_QML_DEBUG -+#ifndef QT_NO_DEBUG && !defined QT_QML_DEBUG - #define QT_QML_DEBUG - #endif - #include <QQuickView> --- -2.48.1 - diff --git a/media-sound/kid3/files/kid3-3.9.6-oggflacmetadata-buildfix.patch b/media-sound/kid3/files/kid3-3.9.6-oggflacmetadata-buildfix.patch deleted file mode 100644 index ec4a64486afb..000000000000 --- a/media-sound/kid3/files/kid3-3.9.6-oggflacmetadata-buildfix.patch +++ /dev/null @@ -1,134 +0,0 @@ -From 711b6a839523ced7453be89d3a4333b408b90b30 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <[email protected]> -Date: Mon, 17 Mar 2025 22:54:16 +0100 -Subject: [PATCH 1/2] CMake: Restore WITH_FLAC lever and oggflacmetadata option - w/o WITH_VORBIS - -Make explicit and properly conditionalise both WITH_FLAC and WITH_VORBIS. - -Follow-up to 365af1eb613f879d25d6aad8565e24259ad90e9f -Fixes https://invent.kde.org/multimedia/kid3/-/issues/581 - -Signed-off-by: Andreas Sturmlechner <[email protected]> ---- - src/plugins/oggflacmetadata/CMakeLists.txt | 32 ++++++++++++++-------- - 1 file changed, 20 insertions(+), 12 deletions(-) - -diff --git a/src/plugins/oggflacmetadata/CMakeLists.txt b/src/plugins/oggflacmetadata/CMakeLists.txt -index c3365ea5..91d9c690 100644 ---- a/src/plugins/oggflacmetadata/CMakeLists.txt -+++ b/src/plugins/oggflacmetadata/CMakeLists.txt -@@ -1,24 +1,25 @@ --if(WITH_VORBIS) -- set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules) -+set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules) - -+if(WITH_VORBIS) - find_package(Vorbis REQUIRED) -- find_package(FLAC) -+endif() -+if(WITH_FLAC) -+ find_package(FLAC REQUIRED) -+endif() - -+if(WITH_VORBIS OR WITH_FLAC) - configure_file(oggflacconfig.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/oggflacconfig.h) - - set(plugin_NAME OggFlacMetadata) - - string(TOLOWER ${plugin_NAME} plugin_TARGET) - -- add_library(${plugin_TARGET} -- oggflacmetadataplugin.cpp -- oggfile.cpp -- vcedit.c -- ) -+ add_library(${plugin_TARGET} oggflacmetadataplugin.cpp) -+ if(HAVE_VORBIS) -+ target_sources(${plugin_TARGET} PRIVATE oggfile.cpp vcedit.c) -+ endif() - if(HAVE_FLAC) -- target_sources(${plugin_TARGET} PRIVATE -- flacfile.cpp -- ) -+ target_sources(${plugin_TARGET} PRIVATE flacfile.cpp) - endif() - qt_wrap_cpp(plugin_GEN_MOC_SRCS - oggflacmetadataplugin.h -@@ -28,7 +29,14 @@ if(WITH_VORBIS) - - target_include_directories(${plugin_TARGET} PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) - -- target_link_libraries(${plugin_TARGET} kid3-core VorbisFile::VorbisFile FLACPP::FLACPP Kid3Plugin) -+ target_link_libraries(${plugin_TARGET} kid3-core Kid3Plugin) -+ -+ if(HAVE_VORBIS) -+ target_link_libraries(${plugin_TARGET} VorbisFile::VorbisFile) -+ endif() -+ if(HAVE_FLAC) -+ target_link_libraries(${plugin_TARGET} FLACPP::FLACPP) -+ endif() - - target_compile_definitions(${plugin_TARGET} PRIVATE HAVE_CONFIG_H) - --- -2.49.0 - - -From 7503e693d1ff9a90832b757cd5cd854aefe3cfa3 Mon Sep 17 00:00:00 2001 -From: Urs Fleisch <[email protected]> -Date: Sat, 22 Mar 2025 06:11:53 +0100 -Subject: [PATCH 2/2] Support configuration WITH_VORBIS=OFF, WITH_FLAC=ON - ---- - src/plugins/oggflacmetadata/CMakeLists.txt | 4 ++-- - src/plugins/oggflacmetadata/oggfile.cpp | 3 +++ - 2 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/src/plugins/oggflacmetadata/CMakeLists.txt b/src/plugins/oggflacmetadata/CMakeLists.txt -index 91d9c690..fcffe83f 100644 ---- a/src/plugins/oggflacmetadata/CMakeLists.txt -+++ b/src/plugins/oggflacmetadata/CMakeLists.txt -@@ -14,9 +14,9 @@ if(WITH_VORBIS OR WITH_FLAC) - - string(TOLOWER ${plugin_NAME} plugin_TARGET) - -- add_library(${plugin_TARGET} oggflacmetadataplugin.cpp) -+ add_library(${plugin_TARGET} oggflacmetadataplugin.cpp oggfile.cpp) - if(HAVE_VORBIS) -- target_sources(${plugin_TARGET} PRIVATE oggfile.cpp vcedit.c) -+ target_sources(${plugin_TARGET} PRIVATE vcedit.c) - endif() - if(HAVE_FLAC) - target_sources(${plugin_TARGET} PRIVATE flacfile.cpp) -diff --git a/src/plugins/oggflacmetadata/oggfile.cpp b/src/plugins/oggflacmetadata/oggfile.cpp -index 3b7ba695..a0c9b772 100644 ---- a/src/plugins/oggflacmetadata/oggfile.cpp -+++ b/src/plugins/oggflacmetadata/oggfile.cpp -@@ -39,6 +39,7 @@ - #include "tagconfig.h" - #include "taggedfilesystemmodel.h" - -+#ifdef HAVE_VORBIS - namespace { - - /* -@@ -136,6 +137,7 @@ long oggtell(void* stream) - } - - } -+#endif // HAVE_VORBIS - - /** - * Constructor. -@@ -345,6 +347,7 @@ void OggFile::clearTags(bool force) - notifyModelDataChanged(priorIsTagInformationRead); - } - #else // HAVE_VORBIS -+int OggFile::taggedFileFeatures() const { return 0; } - void OggFile::readTags(bool) {} - bool OggFile::writeTags(bool, bool*, bool) { return false; } - void OggFile::clearTags(bool) {} --- -2.49.0 - diff --git a/media-sound/kid3/kid3-3.9.6-r3.ebuild b/media-sound/kid3/kid3-3.9.6-r3.ebuild deleted file mode 100644 index e54f3c5ec2fc..000000000000 --- a/media-sound/kid3/kid3-3.9.6-r3.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..13} ) -inherit cmake kde.org python-any-r1 xdg - -DESCRIPTION="Simple tag editor based on Qt" -HOMEPAGE="https://kid3.kde.org/"; - -if [[ ${KDE_BUILD_TYPE} != live ]]; then - SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" - KEYWORDS="amd64 ~x86" -fi - -LICENSE="GPL-2+" -SLOT="0" -IUSE="acoustid flac kde mp3 mp4 +mpris +taglib test vorbis" - -REQUIRED_USE="test? ( flac mp3 mp4 taglib vorbis )" # bug 926747 -RESTRICT="!test? ( test )" - -DEPEND=" - dev-qt/qtbase:6[gui,network,widgets,xml] - dev-qt/qtdeclarative:6 - dev-qt/qtmultimedia:6 - sys-libs/readline:= - acoustid? ( - media-libs/chromaprint:= - media-video/ffmpeg:= - ) - flac? ( media-libs/flac:=[cxx] ) - kde? ( - kde-frameworks/kconfig:6 - kde-frameworks/kconfigwidgets:6 - kde-frameworks/kcoreaddons:6 - kde-frameworks/kio:6 - kde-frameworks/kwidgetsaddons:6 - kde-frameworks/kxmlgui:6 - ) - mp3? ( media-libs/id3lib ) - mp4? ( media-libs/libmp4v2 ) - mpris? ( dev-qt/qtbase:6[dbus] ) - taglib? ( >=media-libs/taglib-1.9.1:= ) - vorbis? ( - media-libs/libogg - media-libs/libvorbis - ) -" -RDEPEND="${DEPEND} - !media-sound/kid3:5 -" -BDEPEND="${PYTHON_DEPS} - dev-qt/qttools:6[linguist] - kde? ( kde-frameworks/extra-cmake-modules:0 ) -" - -PATCHES=( - "${FILESDIR}/${P}-no-ndebug.patch" # bug 949369 - # https://invent.kde.org/multimedia/kid3/-/merge_requests/34 - "${FILESDIR}/${P}-oggflacmetadata-buildfix.patch" # bug 917038 -) - -pkg_setup() { - use test && python-any-r1_pkg_setup -} - -src_prepare() { - # overengineered upstream build system - cmake_src_prepare - # applies broken python hacks, bug #614950 - cmake_comment_add_subdirectory doc -} - -src_configure() { - local mycmakeargs=( - -DBUILD_WITH_QT6=ON - -DWITH_QAUDIODECODER=ON # bug 855281 - -DWITH_CHROMAPRINT=$(usex acoustid) - -DWITH_DBUS=$(usex mpris) - -DWITH_FLAC=$(usex flac) - -DWITH_ID3LIB=$(usex mp3) - -DWITH_MP4V2=$(usex mp4) - -DWITH_TAGLIB=$(usex taglib) - -DBUILD_TESTING=$(usex test) - -DWITH_VORBIS=$(usex vorbis) - ) - - if use kde ; then - mycmakeargs+=( "-DWITH_APPS=KDE;CLI" ) - else - mycmakeargs+=( "-DWITH_APPS=Qt;CLI" ) - fi - - cmake_src_configure -}
