Antonio Rojas pushed to branch main at Arch Linux / Packaging / Packages / kid3
Commits:
fca5ed71 by Antonio Rojas at 2024-01-25T23:09:56+01:00
upgpkg: 3.9.4-3: taglib 2 rebuild
- - - - -
3 changed files:
- .SRCINFO
- PKGBUILD
- + taglib-2.patch
Changes:
=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
pkgbase = kid3
pkgdesc = An MP3, Ogg/Vorbis and FLAC tag editor
pkgver = 3.9.4
- pkgrel = 2
+ pkgrel = 3
url = https://kid3.kde.org/
changelog = kid3.changelog
arch = x86_64
@@ -23,9 +23,15 @@ pkgbase = kid3
depends = kio5
source = https://prdownloads.sourceforge.net/kid3/kid3-3.9.4.tar.gz
source = https://prdownloads.sourceforge.net/kid3/kid3-3.9.4.tar.gz.sig
+ source = https://invent.kde.org/multimedia/kid3/-/commit/3ed2e5f7.patch
+ source = https://invent.kde.org/multimedia/kid3/-/commit/98524900.patch
+ source = taglib-2.patch
validpgpkeys = 7D09794C2812F62194B081C14CAD34426E354DD2
sha256sums =
6d67d941604c3d96e42b2bafbe7ec4a60004620b729ccbe2550af211eb59dd7b
sha256sums = SKIP
+ sha256sums =
7f59595a638056a780db5ce3b4266760e7f478e7b11c4c5b703772fddc8bdb5c
+ sha256sums =
6edd2ab211d92c2e4ab6c5c757686bd730f2f54cb26b23e4c513d18cbc341900
+ sha256sums =
11bd60246fe7c8066c5b33b3884b2008f19afbc8b7c0df3a5631e39258642e0c
pkgname = kid3-common
pkgdesc = An MP3, Ogg/Vorbis and FLAC tag editor, CLI version and
common files
=====================================
PKGBUILD
=====================================
@@ -4,7 +4,7 @@
pkgbase=kid3
pkgname=('kid3-common' 'kid3-qt' 'kid3')
pkgver=3.9.4
-pkgrel=2
+pkgrel=3
pkgdesc="An MP3, Ogg/Vorbis and FLAC tag editor"
arch=('x86_64')
url="https://kid3.kde.org/";
@@ -13,10 +13,22 @@ depends=('chromaprint' 'flac' 'id3lib' 'kxmlgui5' 'libmp4v2'
'qt5-declarative' 'qt5-multimedia' 'taglib' 'kio5')
makedepends=('cmake' 'docbook-xsl' 'extra-cmake-modules' 'kdoctools5' 'python'
'qt5-tools')
changelog=$pkgbase.changelog
-source=(https://prdownloads.sourceforge.net/$pkgbase/$pkgbase-$pkgver.tar.gz{,.sig})
+source=(https://prdownloads.sourceforge.net/$pkgbase/$pkgbase-$pkgver.tar.gz{,.sig}
+ https://invent.kde.org/multimedia/kid3/-/commit/3ed2e5f7.patch
+ https://invent.kde.org/multimedia/kid3/-/commit/98524900.patch
+ taglib-2.patch)
validpgpkeys=('7D09794C2812F62194B081C14CAD34426E354DD2') # Urs Fleisch
sha256sums=('6d67d941604c3d96e42b2bafbe7ec4a60004620b729ccbe2550af211eb59dd7b'
- 'SKIP')
+ 'SKIP'
+ '7f59595a638056a780db5ce3b4266760e7f478e7b11c4c5b703772fddc8bdb5c'
+ '6edd2ab211d92c2e4ab6c5c757686bd730f2f54cb26b23e4c513d18cbc341900'
+ '11bd60246fe7c8066c5b33b3884b2008f19afbc8b7c0df3a5631e39258642e0c')
+
+prepare() {
+ patch -d $pkgbase-$pkgver -p1 < 3ed2e5f7.patch
+ patch -d $pkgbase-$pkgver -p1 < 98524900.patch # Fix build with taglib 2
+ patch -d $pkgbase-$pkgver -p1 < taglib-2.patch
+}
build() {
export CXXFLAGS+=' -DNDEBUG' # FS#69904
=====================================
taglib-2.patch
=====================================
@@ -0,0 +1,50 @@
+diff --git a/src/plugins/taglibmetadata/taglibext/dsf/dsfheader.cpp
b/src/plugins/taglibmetadata/taglibext/dsf/dsfheader.cpp
+index 12cf247a..b82cfcac 100644
+--- a/src/plugins/taglibmetadata/taglibext/dsf/dsfheader.cpp
++++ b/src/plugins/taglibmetadata/taglibext/dsf/dsfheader.cpp
+@@ -26,13 +26,12 @@
+ // Kid3: Remove taglib/ from includes
+ #include <tbytevector.h>
+ #include <tstring.h>
+-#include <trefcounter.h>
+ // Kid3: Use debug() instead of std::cerr
+ #include <tdebug.h>
+
+ #include "dsfheader.h"
+
+-class DSFHeader::HeaderPrivate : public TagLib::RefCounter
++class DSFHeader::HeaderPrivate
+ {
+ public:
+ HeaderPrivate()
+@@ -68,16 +67,9 @@ DSFHeader::DSFHeader(const TagLib::ByteVector &data)
+ parse(data);
+ }
+
+-DSFHeader::DSFHeader(const DSFHeader &h) : d(h.d)
+-{
+- d->ref();
+-}
++DSFHeader::DSFHeader(const DSFHeader &h) = default;
+
+-DSFHeader::~DSFHeader()
+-{
+- if (d->deref())
+- delete d;
+-}
++DSFHeader::~DSFHeader() = default;
+
+ bool DSFHeader::isValid() const
+ {
+@@ -129,11 +121,7 @@ DSFHeader &DSFHeader::operator=(const DSFHeader &h)
+ if(&h == this)
+ return *this;
+
+- if(d->deref())
+- delete d;
+-
+ d = h.d;
+- d->ref();
+ return *this;
+ }
+
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/kid3/-/commit/fca5ed71d3eb3747fd44824185b5c2c53aba6cf8
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/kid3/-/commit/fca5ed71d3eb3747fd44824185b5c2c53aba6cf8
You're receiving this email because of your account on gitlab.archlinux.org.
