From 5c400b20daf353aa4c8045f8ef4fd86b08d7c107 Mon Sep 17 00:00:00 2001 From: Zach Dykstra Date: Mon, 17 Jun 2024 17:04:30 -0500 Subject: [PATCH] kid3: update to 3.9.5. --- srcpkgs/kid3/patches/musl.patch | 11 ----------- srcpkgs/kid3/template | 17 +++++++---------- 2 files changed, 7 insertions(+), 21 deletions(-) delete mode 100644 srcpkgs/kid3/patches/musl.patch diff --git a/srcpkgs/kid3/patches/musl.patch b/srcpkgs/kid3/patches/musl.patch deleted file mode 100644 index 3e24ad17189cde..00000000000000 --- a/srcpkgs/kid3/patches/musl.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/core/model/kid3application.cpp -+++ b/src/core/model/kid3application.cpp -@@ -918,7 +918,7 @@ - taggedFile->closeFileHandle(); - } - } --#if defined Q_OS_LINUX && !defined Q_OS_ANDROID -+#if defined Q_OS_LINUX && defined __GLIBC__ - if (::malloc_trim(0)) { - qDebug("Memory released by malloc_trim()"); - } diff --git a/srcpkgs/kid3/template b/srcpkgs/kid3/template index f32f9decb0e7f6..7dd4f74bba2fa5 100644 --- a/srcpkgs/kid3/template +++ b/srcpkgs/kid3/template @@ -1,15 +1,16 @@ # Template file for 'kid3' pkgname=kid3 -version=3.9.1 -revision=3 +version=3.9.5 +revision=1 build_style=cmake -configure_args="-DWITH_APPS='CLI;$(vopt_if KDE KDE Qt)' +configure_args="-DBUILD_WITH_QT6=ON -DWITH_APPS='CLI;$(vopt_if KDE KDE Qt)' -DWITH_DOCBOOKDIR=/usr/share/xsl/docbook -DWITH_FLAC=$(vopt_if flac ON OFF) -DWITH_ID3LIB=$(vopt_if mp3 ON OFF) -DWITH_MP4V2=$(vopt_if mp4 ON OFF) -DWITH_VORBIS=$(vopt_if vorbis ON OFF) -DWITH_TAGLIB=$(vopt_if taglib ON OFF) -DWITH_CHROMAPRINT=$(vopt_if chromaprint 'ON -DWITH_FFMPEG=ON' OFF)" -hostmakedepends="pkg-config python3 libxslt $(vopt_if KDE extra-cmake-modules)" -makedepends="qt5-declarative-devel qt5-multimedia-devel qt5-tools-devel docbook-xsl +hostmakedepends="pkg-config python3 libxslt $(vopt_if KDE extra-cmake-modules) + qt6-tools qt6-base" +makedepends="qt6-declarative-devel qt6-multimedia-devel qt6-tools-devel docbook-xsl readline-devel $(vopt_if KDE kio-devel) $(vopt_if vorbis libvorbis-devel) $(vopt_if mp4 libmp4v2-devel) $(vopt_if chromaprint 'chromaprint-devel ffmpeg-devel') $(vopt_if mp3 id3lib-devel) $(vopt_if flac libflac-devel) $(vopt_if taglib taglib-devel)" @@ -20,7 +21,7 @@ license="GPL-2.0-only" homepage="https://kid3.kde.org" changelog="https://invent.kde.org/multimedia/kid3/-/raw/master/ChangeLog" distfiles="${SOURCEFORGE_SITE}/kid3/kid3-${version}.tar.gz" -checksum=e5f126697f773dbaa10476a76810ce91c2f3f60025d38688098e075bdb561dca +checksum=d68f6e1d7b794b991b57bf976edb8e22d3457911db654ad1fb9b124cc62057f9 build_options="KDE mp3 mp4 flac vorbis taglib chromaprint" build_options_default="mp3 mp4 flac vorbis taglib chromaprint" @@ -31,7 +32,3 @@ desc_option_mp3="Enable MP3 support" desc_option_mp4="Enable MP4 support" desc_option_taglib="Enable taglib support" desc_option_vorbis="Enable Vorbis support" - -if [ $CROSS_BUILD ]; then - hostmakedepends+=" qt5-qmake qt5-host-tools" -fi