[arch-commits] Commit in gnome-notes/trunk (PKGBUILD)

[Jan Steffens]

    Date: Saturday, April 30, 2022 @ 21:43:10
  Author: heftig
Revision: 444360

40.1-2: FS#74596 fix FTBFS

Modified:
  gnome-notes/trunk/PKGBUILD

----------+
 PKGBUILD |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-04-30 21:28:51 UTC (rev 444359)
+++ PKGBUILD	2022-04-30 21:43:10 UTC (rev 444360)
@@ -2,7 +2,7 @@
 
 pkgname=gnome-notes
 pkgver=40.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Write out notes, every detail matters"
 url="https://wiki.gnome.org/Apps/Notes"
 arch=(x86_64)
@@ -13,6 +13,7 @@
 provides=("bijiben=$pkgver")
 conflicts=(bijiben)
 replaces=(bijiben)
+options=(debug)
 _commit=b5189e213b50cac50f5602945836dc4d85b17959  # tags/BIJIBEN_40_1^0
 source=("git+https://gitlab.gnome.org/GNOME/gnome-notes.git#commit=$_commit")
 sha256sums=('SKIP')
@@ -19,11 +20,14 @@
 
 pkgver() {
   cd $pkgname
-  git describe --tags | sed 's/^BIJIBEN_//;s/_/./g;s/-/+/g'
+  git describe --tags | sed 's/^BIJIBEN_//;s/_/./g;s/[^-]*-g/r&/;s/-/+/g'
 }
 
 prepare() {
   cd $pkgname
+
+  # Fix build with Meson 0.61
+  git cherry-pick -n 994af76ce5144062d55d141129bf6bf5fab002ee
 }
 
 build() {
@@ -36,5 +40,5 @@
 }
 
 package() {
-  DESTDIR="$pkgdir" meson install -C build
+  meson install -C build --destdir "$pkgdir"
 }