* update flatpak to 1:1.14.0-1
This commit is contained in:
parent
f41e99e39c
commit
f311750f91
@ -4,32 +4,37 @@
|
||||
# Contributor: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
|
||||
|
||||
pkgname=flatpak
|
||||
pkgver=1.12.7
|
||||
pkgver=1.14.0
|
||||
pkgrel=1
|
||||
epoch=1
|
||||
pkgdesc="Linux application sandboxing and distribution framework (formerly xdg-app)"
|
||||
url="https://flatpak.org"
|
||||
arch=(x86_64 powerpc64le powerpc riscv64)
|
||||
license=(LGPL)
|
||||
depends=(dbus glib2 libsoup polkit libxau ostree json-glib libseccomp libarchive
|
||||
python bubblewrap appstream-glib xdg-dbus-proxy systemd)
|
||||
makedepends=(intltool gobject-introspection gtk-doc git docbook-xsl xmlto)
|
||||
depends=(dbus glib2 curl polkit libxau ostree json-glib libseccomp libarchive
|
||||
python bubblewrap appstream xdg-dbus-proxy systemd fuse3 libmalcontent)
|
||||
makedepends=(gobject-introspection gtk-doc git docbook-xsl xmlto python-pyparsing)
|
||||
checkdepends=(valgrind socat)
|
||||
provides=(libflatpak.so)
|
||||
_commit=9a6b71b62662f761046b868b798dcef9224739db # tags/1.12.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/flatpak/xdg-dbus-proxy
|
||||
git+https://gitlab.gnome.org/alexl/variant-schema-compiler.git
|
||||
https://dl.flathub.org/repo/flathub.flatpakrepo
|
||||
flatpak-bindir.sh)
|
||||
options=(debug)
|
||||
_commit=488038eed44c7edf334d1e28085975d96ce2bdcc # tags/1.14.0^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/alexl/variant-schema-compiler.git
|
||||
https://dl.flathub.org/repo/flathub.flatpakrepo
|
||||
fusermount3.diff
|
||||
flatpak-bindir.sh
|
||||
)
|
||||
sha256sums=('SKIP'
|
||||
'SKIP'
|
||||
'SKIP'
|
||||
'SKIP'
|
||||
'SKIP'
|
||||
'3371dd250e61d9e1633630073fefda153cd4426f72f4afa0c3373ae2e8fea03a'
|
||||
'23e01650d60222082ffb67a16d3ea033192cc9e6932027cf0ea0c55ea17863af'
|
||||
'1824cb4eb1cc88702cb2b9f1c55b6dfdf20fca5eab83f6e8e532099281328745')
|
||||
|
||||
pkgver() {
|
||||
@ -40,6 +45,10 @@ pkgver() {
|
||||
prepare() {
|
||||
cd flatpak
|
||||
|
||||
# Support fuse3
|
||||
# https://bugs.archlinux.org/task/75623
|
||||
git apply -3 ../fusermount3.diff
|
||||
|
||||
git submodule init
|
||||
git submodule set-url libglnx "$srcdir/libglnx"
|
||||
git submodule set-url bubblewrap "$srcdir/bubblewrap"
|
||||
@ -47,9 +56,6 @@ prepare() {
|
||||
git submodule set-url variant-schema-compiler "$srcdir/variant-schema-compiler"
|
||||
git submodule update
|
||||
|
||||
# https://github.com/flatpak/flatpak/issues/267
|
||||
sed -i '/locale\/C\./d' tests/make-test-runtime.sh
|
||||
|
||||
NOCONFIGURE=1 ./autogen.sh
|
||||
}
|
||||
|
||||
|
||||
66
flatpak/fusermount3.diff
Normal file
66
flatpak/fusermount3.diff
Normal file
@ -0,0 +1,66 @@
|
||||
diff --git i/common/flatpak-dir.c w/common/flatpak-dir.c
|
||||
index ca64902c..22302406 100644
|
||||
--- i/common/flatpak-dir.c
|
||||
+++ w/common/flatpak-dir.c
|
||||
@@ -2109,7 +2109,7 @@ flatpak_dir_revokefs_fuse_unmount (OstreeRepo **repo,
|
||||
|
||||
fusermount = g_subprocess_new (G_SUBPROCESS_FLAGS_NONE,
|
||||
error,
|
||||
- "fusermount", "-u", "-z", mnt_dir,
|
||||
+ "fusermount3", "-u", "-z", mnt_dir,
|
||||
NULL);
|
||||
if (g_subprocess_wait_check (fusermount, NULL, error))
|
||||
{
|
||||
diff --git i/tests/can-use-fuse.c w/tests/can-use-fuse.c
|
||||
index fb6e2000..759f0d84 100644
|
||||
--- i/tests/can-use-fuse.c
|
||||
+++ w/tests/can-use-fuse.c
|
||||
@@ -53,23 +53,23 @@ check_fuse (void)
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
- fusermount = g_find_program_in_path ("fusermount");
|
||||
+ fusermount = g_find_program_in_path ("fusermount3");
|
||||
|
||||
if (fusermount == NULL)
|
||||
{
|
||||
- cannot_use_fuse = g_strdup ("fusermount not found in PATH");
|
||||
+ cannot_use_fuse = g_strdup ("fusermount3 not found in PATH");
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
if (!g_file_test (fusermount, G_FILE_TEST_IS_EXECUTABLE))
|
||||
{
|
||||
cannot_use_fuse = g_strdup_printf ("%s not executable", fusermount);
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
if (!g_file_test ("/etc/mtab", G_FILE_TEST_EXISTS))
|
||||
{
|
||||
- cannot_use_fuse = g_strdup ("fusermount won't work without /etc/mtab");
|
||||
+ cannot_use_fuse = g_strdup ("fusermount3 won't work without /etc/mtab");
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
diff --git i/tests/libtest.sh w/tests/libtest.sh
|
||||
index 36d39ac4..e78d94ca 100644
|
||||
--- i/tests/libtest.sh
|
||||
+++ w/tests/libtest.sh
|
||||
@@ -542,7 +542,7 @@ skip_one_without_bwrap () {
|
||||
}
|
||||
|
||||
skip_without_fuse () {
|
||||
- fusermount --version >/dev/null 2>&1 || skip "no fusermount"
|
||||
+ fusermount3 --version >/dev/null 2>&1 || skip "no fusermount3"
|
||||
|
||||
capsh --print | grep -q 'Bounding set.*[^a-z]cap_sys_admin' || \
|
||||
skip "No cap_sys_admin in bounding set, can't use FUSE"
|
||||
@@ -608,7 +608,7 @@ commit_to_path () {
|
||||
cleanup () {
|
||||
/bin/kill -9 $DBUS_SESSION_BUS_PID
|
||||
gpg-connect-agent --homedir "${FL_GPG_HOMEDIR}" killagent /bye >&2 || true
|
||||
- fusermount -u $XDG_RUNTIME_DIR/doc >&2 || :
|
||||
+ fusermount3 -u $XDG_RUNTIME_DIR/doc >&2 || :
|
||||
kill $(jobs -p) &> /dev/null || true
|
||||
if test -n "${TEST_SKIP_CLEANUP:-}"; then
|
||||
echo "# Skipping cleanup of ${TEST_DATA_DIR}"
|
||||
Loading…
x
Reference in New Issue
Block a user