commit: 051651dbbcbde1ccd33f6c7136668b5dc21db113 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Wed Feb 12 20:58:06 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Wed Feb 12 20:58:55 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=051651db
media-sound/kid3: Disable QML debugging Pending MR upstream: https://invent.kde.org/multimedia/kid3/-/merge_requests/32 Closes: https://bugs.gentoo.org/949369 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> media-sound/kid3/files/kid3-3.9.6-no-ndebug.patch | 54 +++++++++++++ media-sound/kid3/kid3-3.9.6-r1.ebuild | 96 +++++++++++++++++++++++ 2 files changed, 150 insertions(+) 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 <[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/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 +}
