[arch-commits] Commit in gvfs/trunk (PKGBUILD fix-build.diff)

[Jan Steffens]

    Date: Thursday, February 17, 2022 @ 23:54:52
  Author: heftig
Revision: 437639

1.48.1-2: nfs rebuild

Added:
  gvfs/trunk/fix-build.diff
Modified:
  gvfs/trunk/PKGBUILD

----------------+
 PKGBUILD       |   19 ++++++++++++-------
 fix-build.diff |   12 ++++++++++++
 2 files changed, 24 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-02-17 23:54:27 UTC (rev 437638)
+++ PKGBUILD	2022-02-17 23:54:52 UTC (rev 437639)
@@ -4,7 +4,7 @@
 pkgbase=gvfs
 pkgname=(gvfs gvfs-{smb,afc,gphoto2,goa,mtp,nfs,google})
 pkgver=1.48.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Virtual filesystem implementation for GIO"
 url="https://wiki.gnome.org/Projects/gvfs"
 arch=(x86_64)
@@ -17,21 +17,26 @@
 groups=(gnome)
 _commit=a971ec4b5c1ff016e7273f2d390248f8c2d65106  # tags/1.48.1^0
 source=("git+https://gitlab.gnome.org/GNOME/gvfs.git#commit=$_commit"
+        fix-build.diff
         gvfsd.hook)
 sha256sums=('SKIP'
+            'f0a8731fb843e7a952a8b4d66076fdc646e18c22f218ae7da3738a790478fcca'
             'd3b714db35b2ce75d7f6d528044554decbb9149a98425aff119a071ca0a25282')
 
-prepare() {
-  cd $pkgbase
+pkgver() {
+  cd gvfs
+  git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g'
 }
 
-pkgver() {
-  cd $pkgbase
-  git describe --tags | sed 's/-/+/g'
+prepare() {
+  cd gvfs
+
+  # Fix build with Meson 0.61
+  git apply -3 ../fix-build.diff
 }
 
 build() {
-  arch-meson $pkgbase build -D man=true
+  arch-meson gvfs build -D man=true
   meson compile -C build
 }
 

Added: fix-build.diff
===================================================================
--- fix-build.diff	                        (rev 0)
+++ fix-build.diff	2022-02-17 23:54:52 UTC (rev 437639)
@@ -0,0 +1,12 @@
+diff --git i/daemon/meson.build w/daemon/meson.build
+index c89ef407..620391cd 100644
+--- i/daemon/meson.build
++++ w/daemon/meson.build
+@@ -366,7 +366,6 @@ if enable_admin
+   )
+ 
+   i18n.merge_file(
+-    policy,
+     input: policy_in,
+     output: '@BASENAME@',
+     po_dir: po_dir,