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

[Jan Steffens]

    Date: Saturday, September 14, 2019 @ 09:52:23
  Author: heftig
Revision: 362656

3.34.0-2

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

--------------+
 PKGBUILD     |   11 ++++++++---
 loadfix.diff |   13 +++++++++++++
 2 files changed, 21 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-09-14 09:04:34 UTC (rev 362655)
+++ PKGBUILD	2019-09-14 09:52:23 UTC (rev 362656)
@@ -3,7 +3,7 @@
 
 pkgname=gnome-music
 pkgver=3.34.0
-pkgrel=1
+pkgrel=2
 epoch=1
 pkgdesc="Music player and management application"
 url="https://wiki.gnome.org/Apps/Music"
@@ -20,10 +20,12 @@
 _commit=7ef36ed4b3a00c5af3f0438e16afa45fb8ec83c7  # tags/3.34.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")
+        "git+https://gitlab.gnome.org/mschraal/gfm.git"
+        loadfix.diff)
 sha256sums=('SKIP'
             'SKIP'
-            'SKIP')
+            'SKIP'
+            'abbae6f46e56efbddc8403530cf10db41f5d4edb3b76b1c667d889014e7351a4')
 
 pkgver() {
   cd $pkgname
@@ -33,6 +35,9 @@
 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"

Added: loadfix.diff
===================================================================
--- loadfix.diff	                        (rev 0)
+++ loadfix.diff	2019-09-14 09:52:23 UTC (rev 362656)
@@ -0,0 +1,13 @@
+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')
+