gentoo auto-resync : 13:02:2025 - 00:12:52

3 files changed, 152 insertions, 0 deletions

diff --git a/media-sound/kid3/Manifest b/media-sound/kid3/Manifest
index 421af7fe538d..ecd216fef0df 100644
--- a/media-sound/kid3/Manifest
+++ b/media-sound/kid3/Manifest
@@ -1,3 +1,5 @@
+AUX kid3-3.9.6-no-ndebug.patch 1684 BLAKE2B 91f52e2ffb86d026ab206978b2d885c0b090e4ad94203af582e09d05b0d166c6c7e8817e85ded4e2a36f53d0408b33906ee84f90ff42bb918e4883f4e62fff47 SHA512 651116c2f1bc5a15611cf421286b073b3d5ae3980c3c28271801f95f6abb74d23aa6a11f43ec34a905fd61fab9cee2e6a3c9dd2cd2b9a913ef1e8011aa1cd011
 DIST kid3-3.9.6.tar.xz 1872012 BLAKE2B 3945ca19f08baf84373ba34bcb9917f58d20f9208479a3a2d1319bdf50aae5cc56b906f5ac2caee5eb3d5c5f042a0ecdeff3e3ac0ecb499e6e3a32db436f2b1d SHA512 1667b3f5d458f9cc54e5b9af839c849e990a333eab3cfaa8d310b4d46b925ca5b57ea0ac9365a023fecc1ac2429f761dd2bfc0b3a3df48f5d4dd351c8741455f
+EBUILD kid3-3.9.6-r1.ebuild 2058 BLAKE2B 815f0a570088d13b432f363dde74f487af1afbcfbba3f45741251cb42fdef0849cd20135db53a2a20e071d3a945b1d0c863a93eb15b096e018e19e64db6ae8db SHA512 f281c8bd6b60d7c22e4a5d2b2c1452563483051c2100c8750f11c498fff284a9b8b96db44f8c177283877038d7696e7cc6261cdcb7a22d6b9d9c53b273924a27
 EBUILD kid3-3.9.6.ebuild 1996 BLAKE2B fac6b3d6d8f5f71e7c1503e315202c7c3cece06e139b260547cfae20267d2a19382773d8918d60141232d08fb2e6cf37c99dff29e45971662f50c70280415191 SHA512 78b38e1e27231e237adf6b13d0ae37855b606953b847ce5f2b32bdc40d83dce7956e9df22b094258c18d77eb81e58d508842b12f6f77e06276505ef97e22ca80
 MISC metadata.xml 650 BLAKE2B a05aeb21a41043f2a4891e07db9fcdb32051fcb306dda9db0e892165e44728607430d3aeaf9f749e6a0b0a88b1935d1768853572661c1437c4b51a79a80acbf9 SHA512 02720f1bfffea6ee6a6f29d7bd2241b0bf425c491b5844f119d1ea9b6512b52d6c75a4eb9052d506905edb4790f5af0f7778d0ce05ddd3b17ba37e9b83cf3a5a
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
new file mode 100644
index 000000000000..8b4966a21509
--- /dev/null
+++ b/media-sound/kid3/files/kid3-3.9.6-no-ndebug.patch
@@ -0,0 +1,54 @@
+From ae25a9642d06997c8896e98fa8a41daa202d6703 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+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 <asturm@gentoo.org>
+---
+ 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/kid3-3.9.6-r1.ebuild b/media-sound/kid3/kid3-3.9.6-r1.ebuild
new file mode 100644
index 000000000000..f41b098ccee3
--- /dev/null
+++ b/media-sound/kid3/kid3-3.9.6-r1.ebuild
@@ -0,0 +1,96 @@
+# 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="flac? ( vorbis )"
+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]
+		media-libs/libvorbis
+	)
+	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
+
+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
+}