[arch-commits] Commit in gnome-music/trunk (PKGBUILD loadfix.diff)

[Jan Steffens]

    Date: Friday, October 25, 2019 @ 16:14:02
  Author: heftig
Revision: 365674

3.34.1-1

Modified:
  gnome-music/trunk/PKGBUILD
Deleted:
  gnome-music/trunk/loadfix.diff

--------------+
 PKGBUILD     |   15 +++++----------
 loadfix.diff |   13 -------------
 2 files changed, 5 insertions(+), 23 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-10-25 16:11:24 UTC (rev 365673)
+++ PKGBUILD	2019-10-25 16:14:02 UTC (rev 365674)
@@ -2,8 +2,8 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gnome-music
-pkgver=3.34.0
-pkgrel=2
+pkgver=3.34.1
+pkgrel=1
 epoch=1
 pkgdesc="Music player and management application"
 url="https://wiki.gnome.org/Apps/Music"
@@ -17,15 +17,13 @@
             'gst-plugins-bad: Extra media codecs'
             'gst-libav: Extra media codecs')
 groups=(gnome)
-_commit=7ef36ed4b3a00c5af3f0438e16afa45fb8ec83c7  # tags/3.34.0^0
+_commit=3510127d0f0203d1cff7758a41dbd82bea2a2de6  # tags/3.34.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"
-        loadfix.diff)
+        "git+https://gitlab.gnome.org/mschraal/gfm.git")
 sha256sums=('SKIP'
             'SKIP'
-            'SKIP'
-            'abbae6f46e56efbddc8403530cf10db41f5d4edb3b76b1c667d889014e7351a4')
+            'SKIP')
 
 pkgver() {
   cd $pkgname
@@ -35,9 +33,6 @@
 prepare() {
   cd $pkgname
 
-  # https://bugs.archlinux.org/task/63747
-  git apply -3 ../loadfix.diff
-
   git submodule init
   git config --local submodule.subprojects/libgd.url "$srcdir/libgd"
   git config --local submodule.subprojects/gfm.url "$srcdir/gfm"

Deleted: loadfix.diff
===================================================================
--- loadfix.diff	2019-10-25 16:11:24 UTC (rev 365673)
+++ loadfix.diff	2019-10-25 16:14:02 UTC (rev 365674)
@@ -1,13 +0,0 @@
-diff --git i/meson.build w/meson.build
-index b0261a5e..d43fe512 100644
---- i/meson.build
-+++ w/meson.build
-@@ -85,7 +85,7 @@ bin_config.set('pyexecdir', py_installation.get_path('stdlib'))
- bin_config.set('schemasdir', PKGDATA_DIR)
- # Used for libgd/gfm
- bin_config.set('pkglibdir', PKGLIB_DIR)
--bin_config.set('gfmlibdir', '')
-+bin_config.set('gfmlibdir', PKGLIB_DIR)
- 
- bin_config.set('local_build', 'False')
-