[arch-commits] Commit in gnome-photos/repos/extra-x86_64 (PKGBUILD PKGBUILD)

[Jan Steffens]

    Date: Wednesday, February 23, 2022 @ 03:15:58
  Author: heftig
Revision: 437979

archrelease: copy trunk to extra-x86_64

Added:
  gnome-photos/repos/extra-x86_64/PKGBUILD
    (from rev 437977, gnome-photos/trunk/PKGBUILD)
Deleted:
  gnome-photos/repos/extra-x86_64/PKGBUILD

----------+
 PKGBUILD |   88 +++++++++++++++++++++++++++++++------------------------------
 1 file changed, 46 insertions(+), 42 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2022-02-23 03:15:55 UTC (rev 437978)
+++ PKGBUILD	2022-02-23 03:15:58 UTC (rev 437979)
@@ -1,42 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
-
-pkgname=gnome-photos
-pkgver=40.0+14+g884b1fd1
-pkgrel=1
-pkgdesc="Access, organize, and share your photos on GNOME"
-arch=(x86_64)
-url="https://wiki.gnome.org/Apps/Photos"
-license=(GPL)
-depends=(exempi gtk3 libexif librsvg babl gegl gsettings-desktop-schemas
-         grilo-plugins lcms2 tracker3-miners geocode-glib grilo gfbgraph libgdata
-         libgexiv2 libraw gnome-online-accounts dleyna-server dleyna-renderer
-         libdazzle libhandy)
-makedepends=(python yelp-tools git meson docbook-xsl)
-groups=(gnome)
-_commit=884b1fd16e6ee505e216f38566c777131321a7ed  # gnome-40
-source=("git+https://gitlab.gnome.org/GNOME/gnome-photos.git#commit=$_commit"
-        "git+https://gitlab.gnome.org/GNOME/libgd.git")
-sha256sums=('SKIP'
-            'SKIP')
-
-pkgver() {
-  cd $pkgname
-  git describe --tags | sed 's/-/+/g'
-}
-
-prepare() {
-  cd $pkgname
-
-  git submodule init
-  git submodule set-url subprojects/libgd "$srcdir/libgd"
-  git submodule update
-}
-
-build() {
-  arch-meson $pkgname build -D manuals=true
-  meson compile -C build
-}
-
-package() {
-  meson install -C build --destdir "$pkgdir"
-}

Copied: gnome-photos/repos/extra-x86_64/PKGBUILD (from rev 437977, gnome-photos/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2022-02-23 03:15:58 UTC (rev 437979)
@@ -0,0 +1,46 @@
+# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
+
+pkgname=gnome-photos
+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"
+license=(GPL)
+depends=(exempi gtk3 libexif librsvg babl gegl gsettings-desktop-schemas
+         grilo-plugins lcms2 tracker3-miners geocode-glib grilo gfbgraph libgdata
+         libgexiv2 libraw gnome-online-accounts dleyna-server dleyna-renderer
+         libdazzle libhandy)
+makedepends=(python yelp-tools git meson docbook-xsl)
+groups=(gnome)
+_commit=884b1fd16e6ee505e216f38566c777131321a7ed  # gnome-40
+source=("git+https://gitlab.gnome.org/GNOME/gnome-photos.git#commit=$_commit"
+        "git+https://gitlab.gnome.org/GNOME/libgd.git")
+sha256sums=('SKIP'
+            'SKIP')
+
+pkgver() {
+  cd $pkgname
+  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
+}
+
+build() {
+  arch-meson $pkgname build -D manuals=true
+  meson compile -C build
+}
+
+package() {
+  meson install -C build --destdir "$pkgdir"
+}