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

[Jan Steffens]

    Date: Wednesday, January 12, 2022 @ 19:09:48
  Author: heftig
Revision: 434317

1.12.3-1

Modified:
  flatpak/trunk/PKGBUILD

----------+
 PKGBUILD |   23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-01-12 19:00:40 UTC (rev 434316)
+++ PKGBUILD	2022-01-12 19:09:48 UTC (rev 434317)
@@ -3,7 +3,7 @@
 # Contributor: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
 
 pkgname=flatpak
-pkgver=1.12.2
+pkgver=1.12.3
 pkgrel=1
 pkgdesc="Linux application sandboxing and distribution framework (formerly xdg-app)"
 url="https://flatpak.org"
@@ -13,7 +13,8 @@
          python bubblewrap appstream-glib xdg-dbus-proxy systemd)
 makedepends=(intltool gobject-introspection gtk-doc git docbook-xsl xmlto)
 checkdepends=(valgrind socat)
-_commit=96aafda476c2634941dfcd68a65fe13f582eefcb  # tags/1.12.2^0
+provides=(libflatpak.so)
+_commit=e528dcf196816de5e267d08456d1edd6877f8f73  # tags/1.12.3^0
 source=("git+https://github.com/flatpak/flatpak#commit=$_commit"
         git+https://gitlab.gnome.org/GNOME/libglnx.git
         git+https://github.com/projectatomic/bubblewrap
@@ -29,8 +30,13 @@
             '3371dd250e61d9e1633630073fefda153cd4426f72f4afa0c3373ae2e8fea03a'
             '1824cb4eb1cc88702cb2b9f1c55b6dfdf20fca5eab83f6e8e532099281328745')
 
+pkgver() {
+  cd flatpak
+  git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g'
+}
+
 prepare() {
-  cd $pkgname
+  cd flatpak
 
   git submodule init
   git submodule set-url bubblewrap "$srcdir/bubblewrap"
@@ -45,13 +51,8 @@
   NOCONFIGURE=1 ./autogen.sh
 }
 
-pkgver() {
-  cd $pkgname
-  git describe --tags | sed 's/-/+/g'
-}
-
 build() {
-  cd $pkgname
+  cd flatpak
 
   ./configure \
     --prefix=/usr \
@@ -71,7 +72,7 @@
 }
 
 check() {
-  cd $pkgname
+  cd flatpak
   make -k check
 }
 
@@ -78,7 +79,7 @@
 package() {
   depends+=(xdg-desktop-portal)
 
-  make -C $pkgname DESTDIR="$pkgdir" install
+  make -C flatpak DESTDIR="$pkgdir" install
 
   install -Dt "$pkgdir/etc/profile.d" -m644 flatpak-bindir.sh
   install -Dt "$pkgdir/etc/flatpak/remotes.d" flathub.flatpakrepo