[arch-commits] Commit in flatpak/repos/testing-x86_64 (5 files)
Jan Steffens
heftig at gemini.archlinux.org
Fri Aug 19 18:19:28 UTC 2022
Date: Friday, August 19, 2022 @ 18:19:27
Author: heftig
Revision: 454057
archrelease: copy trunk to testing-x86_64
Added:
flatpak/repos/testing-x86_64/PKGBUILD
(from rev 454054, flatpak/trunk/PKGBUILD)
flatpak/repos/testing-x86_64/flatpak-bindir.sh
(from rev 454054, flatpak/trunk/flatpak-bindir.sh)
flatpak/repos/testing-x86_64/fusermount3.diff
(from rev 454054, flatpak/trunk/fusermount3.diff)
Deleted:
flatpak/repos/testing-x86_64/PKGBUILD
flatpak/repos/testing-x86_64/flatpak-bindir.sh
-------------------+
PKGBUILD | 189 ++++++++++++++++++++++++++--------------------------
flatpak-bindir.sh | 18 ++--
fusermount3.diff | 66 ++++++++++++++++++
3 files changed, 172 insertions(+), 101 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-08-19 18:19:23 UTC (rev 454056)
+++ PKGBUILD 2022-08-19 18:19:27 UTC (rev 454057)
@@ -1,92 +0,0 @@
-# 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.12.7
-pkgrel=2
-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)
-checkdepends=(valgrind socat)
-provides=(libflatpak.so)
-options=(debug)
-_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)
-sha256sums=('SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- '3371dd250e61d9e1633630073fefda153cd4426f72f4afa0c3373ae2e8fea03a'
- '1824cb4eb1cc88702cb2b9f1c55b6dfdf20fca5eab83f6e8e532099281328745')
-
-pkgver() {
- cd flatpak
- git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g'
-}
-
-prepare() {
- cd flatpak
-
- # Support fuse3
- # https://bugs.archlinux.org/task/75623
- git cherry-pick -n 4018419b15d0376a801ed09d978df409d1c6e46d
-
- git submodule init
- git submodule set-url libglnx "$srcdir/libglnx"
- git submodule set-url bubblewrap "$srcdir/bubblewrap"
- git submodule set-url dbus-proxy "$srcdir/xdg-dbus-proxy"
- git submodule set-url variant-schema-compiler "$srcdir/variant-schema-compiler"
- git submodule update
-
- NOCONFIGURE=1 ./autogen.sh
-}
-
-build() {
- cd flatpak
-
- ./configure \
- --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --sbindir=/usr/bin \
- --libexecdir=/usr/lib \
- --disable-static \
- --enable-gtk-doc \
- --with-system-bubblewrap \
- --with-system-dbus-proxy \
- --with-dbus-config-dir=/usr/share/dbus-1/system.d
-
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
- make
-}
-
-check() {
- cd flatpak
- make -k check
-}
-
-package() {
- depends+=(xdg-desktop-portal)
-
- 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
-
- # Fixup mode to match polkit
- install -d -o root -g 102 -m 750 "$pkgdir/usr/share/polkit-1/rules.d"
-}
Copied: flatpak/repos/testing-x86_64/PKGBUILD (from rev 454054, flatpak/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-08-19 18:19:27 UTC (rev 454057)
@@ -0,0 +1,97 @@
+# 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.12.7
+pkgrel=3
+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)
+checkdepends=(valgrind socat)
+provides=(libflatpak.so)
+options=(debug)
+_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
+ fusermount3.diff
+ flatpak-bindir.sh
+)
+sha256sums=('SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ '3371dd250e61d9e1633630073fefda153cd4426f72f4afa0c3373ae2e8fea03a'
+ '4a2b5a8b13709449e81170e2806b68c8971cb84bf6c52977311c34956115925e'
+ '1824cb4eb1cc88702cb2b9f1c55b6dfdf20fca5eab83f6e8e532099281328745')
+
+pkgver() {
+ cd flatpak
+ git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g'
+}
+
+prepare() {
+ cd flatpak
+
+ # Support fuse3
+ # https://bugs.archlinux.org/task/75623
+ git cherry-pick -n 4018419b15d0376a801ed09d978df409d1c6e46d
+ git apply -3 ../fusermount3.diff
+
+ git submodule init
+ git submodule set-url libglnx "$srcdir/libglnx"
+ git submodule set-url bubblewrap "$srcdir/bubblewrap"
+ git submodule set-url dbus-proxy "$srcdir/xdg-dbus-proxy"
+ git submodule set-url variant-schema-compiler "$srcdir/variant-schema-compiler"
+ git submodule update
+
+ NOCONFIGURE=1 ./autogen.sh
+}
+
+build() {
+ cd flatpak
+
+ ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --sbindir=/usr/bin \
+ --libexecdir=/usr/lib \
+ --disable-static \
+ --enable-gtk-doc \
+ --with-system-bubblewrap \
+ --with-system-dbus-proxy \
+ --with-dbus-config-dir=/usr/share/dbus-1/system.d
+
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
+ make
+}
+
+check() {
+ cd flatpak
+ make -k check
+}
+
+package() {
+ depends+=(xdg-desktop-portal)
+
+ 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
+
+ # Fixup mode to match polkit
+ install -d -o root -g 102 -m 750 "$pkgdir/usr/share/polkit-1/rules.d"
+}
Deleted: flatpak-bindir.sh
===================================================================
--- flatpak-bindir.sh 2022-08-19 18:19:23 UTC (rev 454056)
+++ flatpak-bindir.sh 2022-08-19 18:19:27 UTC (rev 454057)
@@ -1,9 +0,0 @@
-if [ -n "$XDG_DATA_HOME" ] && [ -d "$XDG_DATA_HOME/flatpak/exports/bin" ]; then
- append_path "$XDG_DATA_HOME/flatpak/exports/bin"
-elif [ -n "$HOME" ] && [ -d "$HOME/.local/share/flatpak/exports/bin" ]; then
- append_path "$HOME/.local/share/flatpak/exports/bin"
-fi
-
-if [ -d /var/lib/flatpak/exports/bin ]; then
- append_path /var/lib/flatpak/exports/bin
-fi
Copied: flatpak/repos/testing-x86_64/flatpak-bindir.sh (from rev 454054, flatpak/trunk/flatpak-bindir.sh)
===================================================================
--- flatpak-bindir.sh (rev 0)
+++ flatpak-bindir.sh 2022-08-19 18:19:27 UTC (rev 454057)
@@ -0,0 +1,9 @@
+if [ -n "$XDG_DATA_HOME" ] && [ -d "$XDG_DATA_HOME/flatpak/exports/bin" ]; then
+ append_path "$XDG_DATA_HOME/flatpak/exports/bin"
+elif [ -n "$HOME" ] && [ -d "$HOME/.local/share/flatpak/exports/bin" ]; then
+ append_path "$HOME/.local/share/flatpak/exports/bin"
+fi
+
+if [ -d /var/lib/flatpak/exports/bin ]; then
+ append_path /var/lib/flatpak/exports/bin
+fi
Copied: flatpak/repos/testing-x86_64/fusermount3.diff (from rev 454054, flatpak/trunk/fusermount3.diff)
===================================================================
--- fusermount3.diff (rev 0)
+++ fusermount3.diff 2022-08-19 18:19:27 UTC (rev 454057)
@@ -0,0 +1,66 @@
+diff --git i/common/flatpak-dir.c w/common/flatpak-dir.c
+index 3f8f2567..aeb75c9b 100644
+--- i/common/flatpak-dir.c
++++ w/common/flatpak-dir.c
+@@ -2020,7 +2020,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 25f3936e..83517c89 100644
+--- i/tests/can-use-fuse.c
++++ w/tests/can-use-fuse.c
+@@ -41,23 +41,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 4a9fd481..5921dda5 100644
+--- i/tests/libtest.sh
++++ w/tests/libtest.sh
+@@ -536,7 +536,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"
+@@ -595,7 +595,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 || :
+ kill $(jobs -p) &> /dev/null || true
+ if test -n "${TEST_SKIP_CLEANUP:-}"; then
+ echo "Skipping cleanup of ${TEST_DATA_DIR}"
More information about the arch-commits
mailing list