[arch-commits] Commit in sound-juicer/trunk (PKGBUILD fix-docdir.diff)

[Jan Steffens]

    Date: Thursday, February 10, 2022 @ 22:48:39
  Author: heftig
Revision: 436912

3.38.0+r27+g9f97ca1f-1: FS#73517 add libcanberra dep

Modified:
  sound-juicer/trunk/PKGBUILD
Deleted:
  sound-juicer/trunk/fix-docdir.diff

-----------------+
 PKGBUILD        |   18 ++++++++----------
 fix-docdir.diff |   13 -------------
 2 files changed, 8 insertions(+), 23 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-02-10 22:40:03 UTC (rev 436911)
+++ PKGBUILD	2022-02-10 22:48:39 UTC (rev 436912)
@@ -3,28 +3,26 @@
 # Contributor: Ben <contrasutra at myrealbox.com>
 
 pkgname=sound-juicer
-pkgver=3.38.0
+pkgver=3.38.0+r27+g9f97ca1f
 pkgrel=1
 pkgdesc="A lean and friendly audio CD extractor for GNOME"
 url="https://wiki.gnome.org/Apps/SoundJuicer"
 arch=(x86_64)
 license=(GPL)
-depends=(libmusicbrainz5 libdiscid gtk3 gst-plugins-base gst-plugins-good brasero iso-codes)
+depends=(libmusicbrainz5 libdiscid gtk3 gst-plugins-base gst-plugins-good
+         brasero iso-codes libcanberra)
 makedepends=(itstool appstream-glib git meson)
-_commit=97c62e1a97821ea7bd0fb361fdf5d3ab59463a38  # tags/3.38.0^0
-source=("git+https://gitlab.gnome.org/GNOME/sound-juicer.git#commit=$_commit"
-        fix-docdir.diff)
-sha256sums=('SKIP'
-            'f6b11f7bec2cdc602d3ec87b630628d9e5f17d4397932442d27b757dee13cf4c')
+_commit=9f97ca1faca396099f52264a9729aa355f8d122e  # master
+source=("git+https://gitlab.gnome.org/GNOME/sound-juicer.git#commit=$_commit")
+sha256sums=('SKIP')
 
 pkgver() {
   cd $pkgname
-  git describe --tags | sed 's/-/+/g'
+  git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g'
 }
 
 prepare() {
   cd $pkgname
-  git apply -3 ../fix-docdir.diff
 }
 
 build() {
@@ -37,5 +35,5 @@
 }
 
 package() {
-  DESTDIR="$pkgdir" meson install -C build
+  meson install -C build --destdir "$pkgdir"
 }

Deleted: fix-docdir.diff
===================================================================
--- fix-docdir.diff	2022-02-10 22:40:03 UTC (rev 436911)
+++ fix-docdir.diff	2022-02-10 22:48:39 UTC (rev 436912)
@@ -1,13 +0,0 @@
-diff --git i/meson.build w/meson.build
-index 5885b9f4..771adf17 100644
---- i/meson.build
-+++ w/meson.build
-@@ -7,7 +7,7 @@ sound_juicer_libdir = join_paths(sound_juicer_prefix, get_option('libdir'))
- sound_juicer_libexecdir = join_paths(sound_juicer_prefix, get_option('libexecdir'))
- sound_juicer_localedir = join_paths(sound_juicer_prefix, get_option('localedir'))
- 
--sound_juicer_docdir = join_paths(sound_juicer_prefix, 'doc', meson.project_name())
-+sound_juicer_docdir = join_paths(sound_juicer_datadir, 'doc', meson.project_name())
- 
- gnome = import('gnome')
- i18n = import('i18n')