[arch-commits] Commit in gnome-music/repos/extra-x86_64 (3 files)

[Jan Steffens]

    Date: Tuesday, June 8, 2021 @ 19:18:00
  Author: heftig
Revision: 417503

archrelease: copy trunk to extra-x86_64

Added:
  gnome-music/repos/extra-x86_64/PKGBUILD
    (from rev 417502, gnome-music/trunk/PKGBUILD)
  gnome-music/repos/extra-x86_64/fix-build.diff
    (from rev 417502, gnome-music/trunk/fix-build.diff)
Deleted:
  gnome-music/repos/extra-x86_64/PKGBUILD

----------------+
 PKGBUILD       |  118 ++++++++++++++++++++++++++++---------------------------
 fix-build.diff |   12 +++++
 2 files changed, 73 insertions(+), 57 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2021-06-08 19:17:52 UTC (rev 417502)
+++ PKGBUILD	2021-06-08 19:18:00 UTC (rev 417503)
@@ -1,57 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
-# Contributor: Jan de Groot <jgc at archlinux.org>
-
-pkgname=gnome-music
-pkgver=40.0
-pkgrel=1
-epoch=1
-pkgdesc="Music player and management application"
-url="https://wiki.gnome.org/Apps/Music"
-arch=(x86_64)
-license=(GPL)
-depends=(grilo grilo-plugins tracker3-miners libdmapsharing libmediaart gtk3
-         gvfs python-gobject python-cairo gst-plugins-base python-requests
-         libdazzle)
-makedepends=(gobject-introspection git meson yelp-tools appstream-glib)
-optdepends=('gst-plugins-good: Extra media codecs'
-            'gst-plugins-ugly: Extra media codecs'
-            'gst-plugins-bad: Extra media codecs'
-            'gst-libav: Extra media codecs')
-groups=(gnome)
-_commit=1cf0f573067fa4ccb6b044987ea338441f237f80  # tags/40.0^0
-source=("git+https://gitlab.gnome.org/GNOME/gnome-music.git#commit=$_commit"
-        "git+https://gitlab.gnome.org/GNOME/libgd.git"
-        "git+https://gitlab.gnome.org/mschraal/gfm.git")
-sha256sums=('SKIP'
-            'SKIP'
-            'SKIP')
-
-pkgver() {
-  cd $pkgname
-  git describe --tags | sed 's/-/+/g'
-}
-
-prepare() {
-  cd $pkgname
-
-  git submodule init
-  git submodule set-url subprojects/libgd "$srcdir/libgd"
-  git submodule set-url subprojects/gfm "$srcdir/gfm"
-  git submodule update
-}
-
-build() {
-  arch-meson $pkgname build
-  meson compile -C build
-}
-
-check() {
-  meson test -C build --print-errorlogs
-}
-
-package() {
-  DESTDIR="$pkgdir" meson install -C build
-
-  python -m compileall -d /usr/lib "$pkgdir/usr/lib"
-  python -O -m compileall -d /usr/lib "$pkgdir/usr/lib"
-}

Copied: gnome-music/repos/extra-x86_64/PKGBUILD (from rev 417502, gnome-music/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2021-06-08 19:18:00 UTC (rev 417503)
@@ -0,0 +1,61 @@
+# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
+# Contributor: Jan de Groot <jgc at archlinux.org>
+
+pkgname=gnome-music
+pkgver=40.1
+pkgrel=1
+epoch=1
+pkgdesc="Music player and management application"
+url="https://wiki.gnome.org/Apps/Music"
+arch=(x86_64)
+license=(GPL)
+depends=(grilo grilo-plugins tracker3-miners libdmapsharing libmediaart gtk3
+         gvfs python-gobject python-cairo gst-plugins-base python-requests
+         libdazzle)
+makedepends=(gobject-introspection git meson yelp-tools appstream-glib)
+optdepends=('gst-plugins-good: Extra media codecs'
+            'gst-plugins-ugly: Extra media codecs'
+            'gst-plugins-bad: Extra media codecs'
+            'gst-libav: Extra media codecs')
+groups=(gnome)
+_commit=d9571372f3a68d100b314c42201f67600ff1d0e5  # tags/40.1^0
+source=("git+https://gitlab.gnome.org/GNOME/gnome-music.git#commit=$_commit"
+        "git+https://gitlab.gnome.org/GNOME/libgd.git"
+        "git+https://gitlab.gnome.org/mschraal/gfm.git"
+        fix-build.diff)
+sha256sums=('SKIP'
+            'SKIP'
+            'SKIP'
+            '3ca62c6f6ef28057495d8c01c5ca96f82bd3601a9f964ce5ecd8a3fd30b1aff3')
+
+pkgver() {
+  cd $pkgname
+  git describe --tags | sed 's/-/+/g'
+}
+
+prepare() {
+  cd $pkgname
+
+  git apply -3 ../fix-build.diff
+
+  git submodule init
+  git submodule set-url subprojects/libgd "$srcdir/libgd"
+  git submodule set-url subprojects/gfm "$srcdir/gfm"
+  git submodule update
+}
+
+build() {
+  arch-meson $pkgname build
+  meson compile -C build
+}
+
+check() {
+  meson test -C build --print-errorlogs
+}
+
+package() {
+  meson install -C build --destdir="$pkgdir"
+
+  python -m compileall -d /usr/lib "$pkgdir/usr/lib"
+  python -O -m compileall -d /usr/lib "$pkgdir/usr/lib"
+}

Copied: gnome-music/repos/extra-x86_64/fix-build.diff (from rev 417502, gnome-music/trunk/fix-build.diff)
===================================================================
--- fix-build.diff	                        (rev 0)
+++ fix-build.diff	2021-06-08 19:18:00 UTC (rev 417503)
@@ -0,0 +1,12 @@
+diff --git i/data/org.gnome.Music.appdata.xml.in.in w/data/org.gnome.Music.appdata.xml.in.in
+index 633732fd..5b03d990 100644
+--- i/data/org.gnome.Music.appdata.xml.in.in
++++ w/data/org.gnome.Music.appdata.xml.in.in
+@@ -37,7 +37,6 @@
+         <p>This release also updates translations.</p>
+       </description>
+     </release>
+-  <releases>
+     <release version="40.0" date="2021-03-21">
+       <description>
+         <p>