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

[Jan Steffens]

    Date: Wednesday, February 23, 2022 @ 03:15:25
  Author: heftig
Revision: 437976

40.0+r14+g884b1fd1-1: FS#73920

Modified:
  gnome-photos/trunk/PKGBUILD

----------+
 PKGBUILD |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-02-23 01:05:14 UTC (rev 437975)
+++ PKGBUILD	2022-02-23 03:15:25 UTC (rev 437976)
@@ -1,8 +1,9 @@
 # Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
 
 pkgname=gnome-photos
-pkgver=40.0+14+g884b1fd1
+pkgver=40.0+r14+g884b1fd1
 pkgrel=1
+epoch=1
 pkgdesc="Access, organize, and share your photos on GNOME"
 arch=(x86_64)
 url="https://wiki.gnome.org/Apps/Photos"
@@ -21,12 +22,15 @@
 
 pkgver() {
   cd $pkgname
-  git describe --tags | sed 's/-/+/g'
+  git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g'
 }
 
 prepare() {
   cd $pkgname
 
+  # Fix build with Meson 0.61
+  git cherry-pick -n a0ac868a19d55dc52100e54fe4b2d29041bc6752
+
   git submodule init
   git submodule set-url subprojects/libgd "$srcdir/libgd"
   git submodule update