Added patch that makes gc compatible with taglib 2.0. Added 'setup' to the meson call in PKGBUILD to fix a warning.

2 files changed, 27 insertions, 5 deletions

diff --git a/PKGBUILD b/PKGBUILD
index a1e6c2977e6a..850c752418b8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,3 +1,4 @@
+# Contributor: Klaus Drechsler <drechsler@gmx.net>
 # Contributor: Jaroslav Lichtblau <svetlemodry@archlinux.org>
 # Contributor: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
@@ -8,7 +9,7 @@
 pkgname=gnome-commander
 pkgver=1.16.1
 _pkgver=1.16
-pkgrel=1
+pkgrel=2
 pkgdesc='Graphical two-pane filemanager for Gnome'
 arch=('i686' 'x86_64')
 url='http://gcmd.github.io/'
@@ -18,13 +19,15 @@ makedepends=('perl-xml-parser' 'itstool' 'yelp-tools' 'meson' 'ninja')
 validpgpkeys=('7627E6FCECF4FC066A03B673F50A89A3ADE4C6E8') # Uwe Scholz
 _validpgpkeys=$(echo $validpgpkeys|tr -d \'|tr -d \( |tr -d \))
 source=("https://download.gnome.org/sources/$pkgname/${_pkgver}/$pkgname-$pkgver.tar.xz"
-	"https://keys.openpgp.org/vks/v1/by-fingerprint/$_validpgpkeys")
-sha256sums=('3f1d00c4a650fe7902167648286b32c9ca4ef86e31a5d8ccca0139f12d10d0b3'
-            'ff9228a02fe02d4e64483021d355a79b6fa76bf7e4be5a3bdc163ce16d6c1177')
+	"https://keys.openpgp.org/vks/v1/by-fingerprint/$_validpgpkeys"
+	gnome-commander-1.16.1.patch)
 
+sha256sums=('3f1d00c4a650fe7902167648286b32c9ca4ef86e31a5d8ccca0139f12d10d0b3'
+            'ae7a69181590aa17f20b0ac964e66f21f429bd5c2e48369e100297798ce87b6f'
+            '91825e18ec8924e74364765cf80e82264968657ce82b4d2fc2948cfa2746b665')
 build() {
   cd "$pkgname-$pkgver"
-   meson --prefix=/usr --buildtype=plain build -Dexiv2=disabled
+   meson setup --prefix=/usr --buildtype=plain build -Dexiv2=disabled
    ninja -C build
 }
 
@@ -32,3 +35,8 @@ package() {
   cd "$pkgname-$pkgver"
   GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" ninja -C build install
 }
+
+prepare() {
+  cd "$pkgname-$pkgver"
+  patch --strip=1 --input=../gnome-commander-1.16.1.patch
+}
diff --git a/gnome-commander-1.16.1.patch b/gnome-commander-1.16.1.patch
new file mode 100644
index 000000000000..68621dae24f1
--- /dev/null
+++ b/gnome-commander-1.16.1.patch
@@ -0,0 +1,14 @@
+diff --unified --recursive --text gnome-commander-1.16.1/src/tags/gnome-cmd-tags-taglib.cc gnome-commander-1.16.1-patched/src/tags/gnome-cmd-tags-taglib.cc
+--- gnome-commander-1.16.1/src/tags/gnome-cmd-tags-taglib.cc	2023-07-08 17:33:10.000000000 +0200
++++ gnome-commander-1.16.1-patched/src/tags/gnome-cmd-tags-taglib.cc	2024-03-04 10:22:55.398983139 +0100
+@@ -150,8 +150,8 @@
+     if (flacProperties)
+     {
+         metadata.add(TAG_AUDIO_CODEC,"FLAC");
+-        if (flacProperties->sampleWidth())
+-            cout << "Audio.FLAC.SampleWidth  " << flacProperties->sampleWidth()<< endl;
++        if (flacProperties->bitsPerSample())
++            cout << "Audio.FLAC.BitsPerSample  " << flacProperties->bitsPerSample()<< endl;
+ 
+         return true;
+     }