[arch-commits] Commit in flatpak/trunk (PKGBUILD fusermount3.diff)
Jan Steffens
heftig at gemini.archlinux.org
Tue Aug 23 22:39:17 UTC 2022
Date: Tuesday, August 23, 2022 @ 22:39:16
Author: heftig
Revision: 454464
1.14.0-1
Modified:
flatpak/trunk/PKGBUILD
flatpak/trunk/fusermount3.diff
------------------+
PKGBUILD | 15 +++++++--------
fusermount3.diff | 22 +++++++++++-----------
2 files changed, 18 insertions(+), 19 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2022-08-23 22:24:29 UTC (rev 454463)
+++ PKGBUILD 2022-08-23 22:39:16 UTC (rev 454464)
@@ -3,20 +3,20 @@
# Contributor: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
pkgname=flatpak
-pkgver=1.12.7
-pkgrel=3
+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)
license=(LGPL)
-depends=(dbus glib2 libsoup polkit libxau ostree json-glib libseccomp libarchive
- python bubblewrap appstream-glib xdg-dbus-proxy systemd fuse3)
-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)
checkdepends=(valgrind socat)
provides=(libflatpak.so)
options=(debug)
-_commit=9a6b71b62662f761046b868b798dcef9224739db # tags/1.12.7^0
+_commit=488038eed44c7edf334d1e28085975d96ce2bdcc # tags/1.14.0^0
source=(
"git+https://github.com/flatpak/flatpak#commit=$_commit"
git+https://gitlab.gnome.org/GNOME/libglnx.git
@@ -33,7 +33,7 @@
'SKIP'
'SKIP'
'3371dd250e61d9e1633630073fefda153cd4426f72f4afa0c3373ae2e8fea03a'
- '4a2b5a8b13709449e81170e2806b68c8971cb84bf6c52977311c34956115925e'
+ '23e01650d60222082ffb67a16d3ea033192cc9e6932027cf0ea0c55ea17863af'
'1824cb4eb1cc88702cb2b9f1c55b6dfdf20fca5eab83f6e8e532099281328745')
pkgver() {
@@ -46,7 +46,6 @@
# Support fuse3
# https://bugs.archlinux.org/task/75623
- git cherry-pick -n 4018419b15d0376a801ed09d978df409d1c6e46d
git apply -3 ../fusermount3.diff
git submodule init
Modified: fusermount3.diff
===================================================================
--- fusermount3.diff 2022-08-23 22:24:29 UTC (rev 454463)
+++ fusermount3.diff 2022-08-23 22:39:16 UTC (rev 454464)
@@ -1,8 +1,8 @@
diff --git i/common/flatpak-dir.c w/common/flatpak-dir.c
-index 3f8f2567..aeb75c9b 100644
+index ca64902c..22302406 100644
--- i/common/flatpak-dir.c
+++ w/common/flatpak-dir.c
-@@ -2020,7 +2020,7 @@ flatpak_dir_revokefs_fuse_unmount (OstreeRepo **repo,
+@@ -2109,7 +2109,7 @@ flatpak_dir_revokefs_fuse_unmount (OstreeRepo **repo,
fusermount = g_subprocess_new (G_SUBPROCESS_FLAGS_NONE,
error,
@@ -12,10 +12,10 @@
if (g_subprocess_wait_check (fusermount, NULL, error))
{
diff --git i/tests/can-use-fuse.c w/tests/can-use-fuse.c
-index 25f3936e..83517c89 100644
+index fb6e2000..759f0d84 100644
--- i/tests/can-use-fuse.c
+++ w/tests/can-use-fuse.c
-@@ -41,23 +41,23 @@ check_fuse (void)
+@@ -53,23 +53,23 @@ check_fuse (void)
return FALSE;
}
@@ -43,10 +43,10 @@
}
diff --git i/tests/libtest.sh w/tests/libtest.sh
-index 4a9fd481..5921dda5 100644
+index 36d39ac4..e78d94ca 100644
--- i/tests/libtest.sh
+++ w/tests/libtest.sh
-@@ -536,7 +536,7 @@ skip_one_without_bwrap () {
+@@ -542,7 +542,7 @@ skip_one_without_bwrap () {
}
skip_without_fuse () {
@@ -55,12 +55,12 @@
capsh --print | grep -q 'Bounding set.*[^a-z]cap_sys_admin' || \
skip "No cap_sys_admin in bounding set, can't use FUSE"
-@@ -595,7 +595,7 @@ commit_to_path () {
+@@ -608,7 +608,7 @@ commit_to_path () {
cleanup () {
/bin/kill -9 $DBUS_SESSION_BUS_PID
- gpg-connect-agent --homedir "${FL_GPG_HOMEDIR}" killagent /bye || true
-- fusermount -u $XDG_RUNTIME_DIR/doc || :
-+ fusermount3 -u $XDG_RUNTIME_DIR/doc || :
+ 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}"
+ echo "# Skipping cleanup of ${TEST_DATA_DIR}"
More information about the arch-commits
mailing list