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

[Jan Steffens]

    Date: Saturday, May 15, 2021 @ 22:40:24
  Author: heftig
Revision: 415575

1.11.1-1

Modified:
  flatpak/trunk/PKGBUILD

----------+
 PKGBUILD |   28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-05-15 22:38:10 UTC (rev 415574)
+++ PKGBUILD	2021-05-15 22:40:24 UTC (rev 415575)
@@ -1,22 +1,24 @@
-# Maintainer:  Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
+# Contributor: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
 # Contributor: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
 
 pkgname=flatpak
-pkgver=1.10.2
+pkgver=1.11.1
 pkgrel=1
 pkgdesc="Linux application sandboxing and distribution framework (formerly xdg-app)"
 url="https://flatpak.org"
 arch=(x86_64)
-license=(LGPL2.1)
+license=(LGPL)
 depends=(dbus glib2 libsoup polkit libxau ostree json-glib libseccomp libarchive
          python bubblewrap appstream-glib xdg-dbus-proxy)
 makedepends=(intltool systemd gobject-introspection gtk-doc git docbook-xsl xmlto)
 checkdepends=(valgrind socat)
-_commit=c614eb400ed9f9ec516d74a43e7d63783e3fe1fb
+_commit=bcdc073041e0c93e15aa108b94cb7a39a79dcdf3  # tags/1.11.1^0
 source=("git+https://github.com/flatpak/flatpak#commit=$_commit"
-        "git+https://gitlab.gnome.org/GNOME/libglnx.git"
-        "git+https://github.com/projectatomic/bubblewrap"
-        "git+https://github.com/flatpak/xdg-dbus-proxy"
+        git+https://gitlab.gnome.org/GNOME/libglnx.git
+        git+https://github.com/projectatomic/bubblewrap
+        git+https://github.com/flatpak/xdg-dbus-proxy
+        git+https://gitlab.gnome.org/alexl/variant-schema-compiler.git
         https://dl.flathub.org/repo/flathub.flatpakrepo
         flatpak-bindir.sh)
 sha256sums=('SKIP'
@@ -23,6 +25,7 @@
             'SKIP'
             'SKIP'
             'SKIP'
+            'SKIP'
             '3371dd250e61d9e1633630073fefda153cd4426f72f4afa0c3373ae2e8fea03a'
             'cf20e4831bceaaee74e9298b4ad7c4d2d51085d43f62d1c6a2d2977d2f421e00')
 
@@ -33,6 +36,7 @@
   git config --local submodule.bubblewrap.url "$srcdir/bubblewrap"
   git config --local submodule.libglnx.url "$srcdir/libglnx"
   git config --local submodule.dbus-proxy.url "$srcdir/xdg-dbus-proxy"
+  git config --local submodule.variant-schema-compiler.url "$srcdir/variant-schema-compiler"
   git submodule update
 
   # https://github.com/flatpak/flatpak/issues/267
@@ -68,18 +72,16 @@
 
 check() {
   cd $pkgname
-  make -k check || :
+  make -k check
 }
 
 package() {
   depends+=(xdg-desktop-portal)
 
-  cd $pkgname
-  make DESTDIR="$pkgdir" install
-  rm -rf "$pkgdir/usr/share/selinux"
+  make -C $pkgname DESTDIR="$pkgdir" install
 
-  install -Dm644 "$srcdir/flatpak-bindir.sh" "$pkgdir/etc/profile.d/flatpak-bindir.sh"
-  install -Dm644 "$srcdir/flathub.flatpakrepo" "$pkgdir/etc/flatpak/remotes.d/flathub.flatpakrepo"
+  install -Dt "$pkgdir/etc/profile.d" -m644 flatpak-bindir.sh
+  install -Dt "$pkgdir/etc/flatpak/remotes.d" flathub.flatpakrepo
 
   # Fixup mode to match polkit
   install -d -o root -g 102 -m 750 "$pkgdir/usr/share/polkit-1/rules.d"