diff --git a/flatpak/PKGBUILD b/flatpak/PKGBUILD index 3104a787fc..97d269f364 100644 --- a/flatpak/PKGBUILD +++ b/flatpak/PKGBUILD @@ -11,32 +11,42 @@ pkgname=( flatpak flatpak-docs ) -pkgver=1.15.6 -pkgrel=2 +pkgver=1.15.7 +pkgrel=1 epoch=1 pkgdesc="Linux application sandboxing and distribution framework (formerly xdg-app)" url="https://flatpak.org" arch=(x86_64 powerpc64le powerpc64 powerpc riscv64) -license=(LGPL) +license=(LGPL-2.1-or-later) depends=( appstream + bash bubblewrap curl dbus + dconf fuse3 + gcc-libs + gdk-pixbuf2 glib2 + glibc + gpgme json-glib libarchive libmalcontent libseccomp libxau + libxml2 ostree polkit python + python-gobject systemd + systemd-libs wayland xdg-dbus-proxy xdg-utils + zstd ) makedepends=( docbook-xsl @@ -44,33 +54,32 @@ makedepends=( gobject-introspection gtk-doc meson + python-packaging python-pyparsing + socat wayland-protocols xmlto - socat ) checkdepends=( valgrind ) -_commit=27b11b93c2a80a91c9461bc6c7f5e9a201406041 # tags/1.15.6^0 +_commit=f1088e3013adc5010012e16d060178b0f1d48226 # tags/1.15.7^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/containers/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 - 0001-HACK-Use-fusermount3.patch ) -b2sums=('SKIP' +b2sums=('87326bdb808dc6edb5f1c9b521936a23510366c1c728ab45e9d625dcd8b98e59df5f0e7b2355810e326fa828df524ad639a4f966547c4ac685256ebfe57d27fa' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'c094461a28dab284c1d32cf470f38118a6cbce27acce633b81945fb859daef9bdec1261490f344221b5cacf4437f53934cb51173f7ad2f1d2e05001139e75c54' - '1c45caa65e2a1598f219977d5a81dcb8ea5d458880c43c40ba452b0c77cbbf41b36fa6911741f22c807d318e04e39e4fcc1455ed8d68faaba10162dae2570abc' - '76ab2ae38c6043adfa7e521e222d9d1ab0dda70c8cca162218d04b3a1eba53e0c4b8b8df9cd005aa7dc38fc82927a9bba8bb5e235512ddaf90dc98716e242469') + '1c45caa65e2a1598f219977d5a81dcb8ea5d458880c43c40ba452b0c77cbbf41b36fa6911741f22c807d318e04e39e4fcc1455ed8d68faaba10162dae2570abc') pkgver() { cd flatpak @@ -80,10 +89,6 @@ pkgver() { prepare() { cd flatpak - # Support fuse3 - # https://bugs.archlinux.org/task/75623 - git apply -3 ../0001-HACK-Use-fusermount3.patch - git submodule init git submodule set-url subprojects/libglnx "$srcdir/libglnx" git submodule set-url subprojects/bubblewrap "$srcdir/bubblewrap" @@ -105,7 +110,8 @@ build() { } check() { - meson test -C build --print-errorlogs + # Broken and get stuck in our containers + : || meson test -C build --print-errorlogs } _pick() {