[arch-commits] Commit in sound-juicer/repos/extra-x86_64 (3 files)

[Jan Steffens]

    Date: Thursday, February 10, 2022 @ 22:48:52
  Author: heftig
Revision: 436913

archrelease: copy trunk to extra-x86_64

Added:
  sound-juicer/repos/extra-x86_64/PKGBUILD
    (from rev 436912, sound-juicer/trunk/PKGBUILD)
Deleted:
  sound-juicer/repos/extra-x86_64/PKGBUILD
  sound-juicer/repos/extra-x86_64/fix-docdir.diff

-----------------+
 PKGBUILD        |   80 ++++++++++++++++++++++++++----------------------------
 fix-docdir.diff |   13 --------
 2 files changed, 39 insertions(+), 54 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2022-02-10 22:48:39 UTC (rev 436912)
+++ PKGBUILD	2022-02-10 22:48:52 UTC (rev 436913)
@@ -1,41 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
-# Contributor: Jan de Groot <jgc at archlinux.org>
-# Contributor: Ben <contrasutra at myrealbox.com>
-
-pkgname=sound-juicer
-pkgver=3.38.0
-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)
-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')
-
-pkgver() {
-  cd $pkgname
-  git describe --tags | sed 's/-/+/g'
-}
-
-prepare() {
-  cd $pkgname
-  git apply -3 ../fix-docdir.diff
-}
-
-build() {
-  arch-meson $pkgname build
-  meson compile -C build
-}
-
-check() {
-  meson test -C build --print-errorlogs
-}
-
-package() {
-  DESTDIR="$pkgdir" meson install -C build
-}

Copied: sound-juicer/repos/extra-x86_64/PKGBUILD (from rev 436912, sound-juicer/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2022-02-10 22:48:52 UTC (rev 436913)
@@ -0,0 +1,39 @@
+# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
+# Contributor: Jan de Groot <jgc at archlinux.org>
+# Contributor: Ben <contrasutra at myrealbox.com>
+
+pkgname=sound-juicer
+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 libcanberra)
+makedepends=(itstool appstream-glib git meson)
+_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/r&/;s/-/+/g'
+}
+
+prepare() {
+  cd $pkgname
+}
+
+build() {
+  arch-meson $pkgname build
+  meson compile -C build
+}
+
+check() {
+  meson test -C build --print-errorlogs
+}
+
+package() {
+  meson install -C build --destdir "$pkgdir"
+}

Deleted: fix-docdir.diff
===================================================================
--- fix-docdir.diff	2022-02-10 22:48:39 UTC (rev 436912)
+++ fix-docdir.diff	2022-02-10 22:48:52 UTC (rev 436913)
@@ -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')