ArchLinux: Update for final R14.1.2.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>

2 files changed, 51 insertions, 3 deletions

diff --git a/arch/tde-extra/tde-amarok/PKGBUILD b/arch/tde-extra/tde-amarok/PKGBUILD
index f5e439c75..ed5197093 100644
--- a/arch/tde-extra/tde-amarok/PKGBUILD
+++ b/arch/tde-extra/tde-amarok/PKGBUILD
@@ -5,7 +5,7 @@ _cat=applications/multimedia/
 _kdemod="${_mod/tde/kde}"
 
 pkgname="tde-${_mod}"
-pkgver=14.1.1
+pkgver=14.1.2
 pkgrel=1
 pkgdesc="TDE Amarok"
 arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le')
@@ -18,12 +18,20 @@ provides=("${_mod}")
 conflicts=("trinity-${_mod}" "kdemod3-${_kdemod}")
 replaces=("trinity-${_mod}")
 options=('staticlibs' 'libtool' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
-md5sums=('ee19572ea67d6336368a30a6c6efeca0')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz"
+        'bp000-add-taglib2-support-part2.diff')
+md5sums=('f2c48a2061d9718cad303279f1e54922'
+         '7fe8fa72bbe23a685a5e4344b804f6c8')
 install=''
 
 [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
 
+prepare() {
+  msg "Apply backported patches"
+  cd ${srcdir}/${pkgname#*-}-trinity-${pkgver} || exit 1
+  patch -p1 < ${srcdir}/bp000-add-taglib2-support-part2.diff
+}
+
 build() {
    msg "Creating out-of-source build directory: ${srcdir}/build"
    mkdir -p ${srcdir}/build
diff --git a/arch/tde-extra/tde-amarok/bp000-add-taglib2-support-part2.diff b/arch/tde-extra/tde-amarok/bp000-add-taglib2-support-part2.diff
new file mode 100644
index 000000000..c92bfae7d
--- /dev/null
+++ b/arch/tde-extra/tde-amarok/bp000-add-taglib2-support-part2.diff
@@ -0,0 +1,40 @@
+commit 4a0485854f175f1aef5332edfe70164beb4e05fd
+Author: Slávek Banko <slavek.banko@axis.cz>
+Date:   Fri Apr 26 11:33:36 2024 +0200
+
+    Add support for taglib 2, part 2.
+    
+    Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
+
+diff --git a/amarok/src/metadata/m4a/mp4file.cpp b/amarok/src/metadata/m4a/mp4file.cpp
+index b210f1ec..a1733a67 100644
+--- a/amarok/src/metadata/m4a/mp4file.cpp
++++ b/amarok/src/metadata/m4a/mp4file.cpp
+@@ -131,12 +131,12 @@ uint MP4::File::readSystemsLen()
+   uint length = 0;
+   uint nbytes = 0;
+   ByteVector   input;
+-  TagLib::uchar tmp_input;
++  uchar        tmp_input;
+ 
+   do
+   {
+     input = readBlock(1);
+-    tmp_input = static_cast<TagLib::uchar>(input[0]);
++    tmp_input = static_cast<uchar>(input[0]);
+     nbytes++;
+     length = (length<<7) | (tmp_input&0x7F);
+   } while( (tmp_input&0x80) && (nbytes<4) );
+diff --git a/amarok/src/metadata/m4a/mp4isofullbox.cpp b/amarok/src/metadata/m4a/mp4isofullbox.cpp
+index c8963ba2..b104681f 100644
+--- a/amarok/src/metadata/m4a/mp4isofullbox.cpp
++++ b/amarok/src/metadata/m4a/mp4isofullbox.cpp
+@@ -55,7 +55,7 @@ void  MP4::Mp4IsoFullBox::parsebox()
+   parse();
+ }
+ 
+-TagLib::uchar MP4::Mp4IsoFullBox::version()
++uchar MP4::Mp4IsoFullBox::version()
+ {
+   return d->version;
+ }