[arch-commits] Commit in flatpak/trunk (PKGBUILD fusermount3.diff)
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 === --- PKGBUILD2022-08-23 22:24:29 UTC (rev 454463) +++ PKGBUILD2022-08-23 22:39:16 UTC (rev 454464) @@ -3,20 +3,20 @@ # Contributor: Jan Alexander Steffens (heftig) 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.diff2022-08-23 22:24:29 UTC (rev 454463) +++ fusermount3.diff2022-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}"
[arch-commits] Commit in flatpak/trunk (PKGBUILD fusermount3.diff)
Date: Friday, August 19, 2022 @ 18:17:44 Author: heftig Revision: 454053 1.12.7-3: FS#75649 Use fusermount3 Added: flatpak/trunk/fusermount3.diff Modified: flatpak/trunk/PKGBUILD --+ PKGBUILD | 21 ++-- fusermount3.diff | 66 + 2 files changed, 79 insertions(+), 8 deletions(-) Modified: PKGBUILD === --- PKGBUILD2022-08-19 18:17:13 UTC (rev 454052) +++ PKGBUILD2022-08-19 18:17:44 UTC (rev 454053) @@ -4,7 +4,7 @@ pkgname=flatpak pkgver=1.12.7 -pkgrel=2 +pkgrel=3 epoch=1 pkgdesc="Linux application sandboxing and distribution framework (formerly xdg-app)" url="https://flatpak.org"; @@ -17,13 +17,16 @@ 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) +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' @@ -30,6 +33,7 @@ 'SKIP' 'SKIP' '3371dd250e61d9e1633630073fefda153cd4426f72f4afa0c3373ae2e8fea03a' +'4a2b5a8b13709449e81170e2806b68c8971cb84bf6c52977311c34956115925e' '1824cb4eb1cc88702cb2b9f1c55b6dfdf20fca5eab83f6e8e532099281328745') pkgver() { @@ -43,6 +47,7 @@ # 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" Added: fusermount3.diff === --- fusermount3.diff(rev 0) +++ fusermount3.diff2022-08-19 18:17:44 UTC (rev 454053) @@ -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}"
[arch-commits] Commit in flatpak/trunk (PKGBUILD)
Date: Wednesday, August 17, 2022 @ 22:10:42 Author: heftig Revision: 453070 1.12.7-2: FS#75623 Use fuse3; enable debug Modified: flatpak/trunk/PKGBUILD --+ PKGBUILD |9 +++-- 1 file changed, 7 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2022-08-17 22:10:00 UTC (rev 453069) +++ PKGBUILD2022-08-17 22:10:42 UTC (rev 453070) @@ -4,7 +4,7 @@ pkgname=flatpak pkgver=1.12.7 -pkgrel=1 +pkgrel=2 epoch=1 pkgdesc="Linux application sandboxing and distribution framework (formerly xdg-app)" url="https://flatpak.org"; @@ -11,10 +11,11 @@ arch=(x86_64) license=(LGPL) depends=(dbus glib2 libsoup polkit libxau ostree json-glib libseccomp libarchive - python bubblewrap appstream-glib xdg-dbus-proxy systemd) + 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 @@ -39,6 +40,10 @@ 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"
[arch-commits] Commit in flatpak/trunk (PKGBUILD)
Date: Tuesday, July 26, 2022 @ 18:28:05 Author: heftig Revision: 451668 Drop workaround for no-longer-missing C.UTF-8 locale Modified: flatpak/trunk/PKGBUILD --+ PKGBUILD |3 --- 1 file changed, 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2022-07-26 17:00:06 UTC (rev 451667) +++ PKGBUILD2022-07-26 18:28:05 UTC (rev 451668) @@ -46,9 +46,6 @@ 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 }
[arch-commits] Commit in flatpak/trunk (PKGBUILD)
Date: Monday, March 14, 2022 @ 21:05:37 Author: heftig Revision: 439687 1.12.7-1 Modified: flatpak/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2022-03-14 20:46:01 UTC (rev 439686) +++ PKGBUILD2022-03-14 21:05:37 UTC (rev 439687) @@ -3,7 +3,7 @@ # Contributor: Jan Alexander Steffens (heftig) pkgname=flatpak -pkgver=1.12.6 +pkgver=1.12.7 pkgrel=1 epoch=1 pkgdesc="Linux application sandboxing and distribution framework (formerly xdg-app)" @@ -15,7 +15,7 @@ makedepends=(intltool gobject-introspection gtk-doc git docbook-xsl xmlto) checkdepends=(valgrind socat) provides=(libflatpak.so) -_commit=e49f5289bcff0bdfabb668a27f9a1ed5e775d71c # tags/1.12.6^0 +_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
[arch-commits] Commit in flatpak/trunk (PKGBUILD)
Date: Monday, March 7, 2022 @ 18:25:22 Author: heftig Revision: 439267 1.12.6-1: FS#74048 return to 1.12 Modified: flatpak/trunk/PKGBUILD --+ PKGBUILD |7 --- 1 file changed, 4 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2022-03-07 18:20:18 UTC (rev 439266) +++ PKGBUILD2022-03-07 18:25:22 UTC (rev 439267) @@ -3,18 +3,19 @@ # Contributor: Jan Alexander Steffens (heftig) pkgname=flatpak -pkgver=1.13.1 +pkgver=1.12.6 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 appstream xdg-dbus-proxy systemd) + python bubblewrap appstream-glib xdg-dbus-proxy systemd) makedepends=(intltool gobject-introspection gtk-doc git docbook-xsl xmlto) checkdepends=(valgrind socat) provides=(libflatpak.so) -_commit=00c36185bd6e89267fe97b7e2fcd8c36bc3ae0b9 # tags/1.13.1^0 +_commit=e49f5289bcff0bdfabb668a27f9a1ed5e775d71c # tags/1.12.6^0 source=("git+https://github.com/flatpak/flatpak#commit=$_commit"; git+https://gitlab.gnome.org/GNOME/libglnx.git git+https://github.com/projectatomic/bubblewrap
[arch-commits] Commit in flatpak/trunk (PKGBUILD)
Date: Friday, March 4, 2022 @ 15:30:23 Author: heftig Revision: 438885 1.13.1-1 Modified: flatpak/trunk/PKGBUILD --+ PKGBUILD |8 1 file changed, 4 insertions(+), 4 deletions(-) Modified: PKGBUILD === --- PKGBUILD2022-03-04 15:29:37 UTC (rev 438884) +++ PKGBUILD2022-03-04 15:30:23 UTC (rev 438885) @@ -3,7 +3,7 @@ # Contributor: Jan Alexander Steffens (heftig) pkgname=flatpak -pkgver=1.12.6 +pkgver=1.13.1 pkgrel=1 pkgdesc="Linux application sandboxing and distribution framework (formerly xdg-app)" url="https://flatpak.org"; @@ -10,11 +10,11 @@ arch=(x86_64) license=(LGPL) depends=(dbus glib2 libsoup polkit libxau ostree json-glib libseccomp libarchive - python bubblewrap appstream-glib xdg-dbus-proxy systemd) + python bubblewrap appstream-glib appstream xdg-dbus-proxy systemd) makedepends=(intltool gobject-introspection gtk-doc git docbook-xsl xmlto) checkdepends=(valgrind socat) provides=(libflatpak.so) -_commit=e49f5289bcff0bdfabb668a27f9a1ed5e775d71c # tags/1.12.6^0 +_commit=00c36185bd6e89267fe97b7e2fcd8c36bc3ae0b9 # tags/1.13.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 @@ -39,8 +39,8 @@ cd flatpak git submodule init + git submodule set-url libglnx "$srcdir/libglnx" git submodule set-url bubblewrap "$srcdir/bubblewrap" - git submodule set-url libglnx "$srcdir/libglnx" git submodule set-url dbus-proxy "$srcdir/xdg-dbus-proxy" git submodule set-url variant-schema-compiler "$srcdir/variant-schema-compiler" git submodule update
[arch-commits] Commit in flatpak/trunk (PKGBUILD)
Date: Wednesday, February 23, 2022 @ 03:29:39 Author: heftig Revision: 437981 1.12.6-1 Modified: flatpak/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2022-02-23 03:25:05 UTC (rev 437980) +++ PKGBUILD2022-02-23 03:29:39 UTC (rev 437981) @@ -3,7 +3,7 @@ # Contributor: Jan Alexander Steffens (heftig) pkgname=flatpak -pkgver=1.12.5 +pkgver=1.12.6 pkgrel=1 pkgdesc="Linux application sandboxing and distribution framework (formerly xdg-app)" url="https://flatpak.org"; @@ -14,7 +14,7 @@ makedepends=(intltool gobject-introspection gtk-doc git docbook-xsl xmlto) checkdepends=(valgrind socat) provides=(libflatpak.so) -_commit=42b9bb578fb73b94ab601ddf35b8028a6f7496f3 # tags/1.12.5^0 +_commit=e49f5289bcff0bdfabb668a27f9a1ed5e775d71c # tags/1.12.6^0 source=("git+https://github.com/flatpak/flatpak#commit=$_commit"; git+https://gitlab.gnome.org/GNOME/libglnx.git git+https://github.com/projectatomic/bubblewrap
[arch-commits] Commit in flatpak/trunk (PKGBUILD)
Date: Saturday, February 12, 2022 @ 00:18:31 Author: heftig Revision: 436975 1.12.5-1 Modified: flatpak/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2022-02-12 00:13:42 UTC (rev 436974) +++ PKGBUILD2022-02-12 00:18:31 UTC (rev 436975) @@ -3,7 +3,7 @@ # Contributor: Jan Alexander Steffens (heftig) pkgname=flatpak -pkgver=1.12.4 +pkgver=1.12.5 pkgrel=1 pkgdesc="Linux application sandboxing and distribution framework (formerly xdg-app)" url="https://flatpak.org"; @@ -14,7 +14,7 @@ makedepends=(intltool gobject-introspection gtk-doc git docbook-xsl xmlto) checkdepends=(valgrind socat) provides=(libflatpak.so) -_commit=103ed5c02c8453580fac19e5122d150f44f6774f # tags/1.12.4^0 +_commit=42b9bb578fb73b94ab601ddf35b8028a6f7496f3 # tags/1.12.5^0 source=("git+https://github.com/flatpak/flatpak#commit=$_commit"; git+https://gitlab.gnome.org/GNOME/libglnx.git git+https://github.com/projectatomic/bubblewrap
[arch-commits] Commit in flatpak/trunk (PKGBUILD)
Date: Wednesday, January 19, 2022 @ 19:50:43 Author: heftig Revision: 434746 1.12.4-1 Modified: flatpak/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2022-01-19 19:48:11 UTC (rev 434745) +++ PKGBUILD2022-01-19 19:50:43 UTC (rev 434746) @@ -3,7 +3,7 @@ # Contributor: Jan Alexander Steffens (heftig) pkgname=flatpak -pkgver=1.12.3 +pkgver=1.12.4 pkgrel=1 pkgdesc="Linux application sandboxing and distribution framework (formerly xdg-app)" url="https://flatpak.org"; @@ -14,7 +14,7 @@ makedepends=(intltool gobject-introspection gtk-doc git docbook-xsl xmlto) checkdepends=(valgrind socat) provides=(libflatpak.so) -_commit=e528dcf196816de5e267d08456d1edd6877f8f73 # tags/1.12.3^0 +_commit=103ed5c02c8453580fac19e5122d150f44f6774f # tags/1.12.4^0 source=("git+https://github.com/flatpak/flatpak#commit=$_commit"; git+https://gitlab.gnome.org/GNOME/libglnx.git git+https://github.com/projectatomic/bubblewrap
[arch-commits] Commit in flatpak/trunk (PKGBUILD)
Date: Wednesday, January 12, 2022 @ 19:09:48 Author: heftig Revision: 434317 1.12.3-1 Modified: flatpak/trunk/PKGBUILD --+ PKGBUILD | 23 --- 1 file changed, 12 insertions(+), 11 deletions(-) Modified: PKGBUILD === --- PKGBUILD2022-01-12 19:00:40 UTC (rev 434316) +++ PKGBUILD2022-01-12 19:09:48 UTC (rev 434317) @@ -3,7 +3,7 @@ # Contributor: Jan Alexander Steffens (heftig) pkgname=flatpak -pkgver=1.12.2 +pkgver=1.12.3 pkgrel=1 pkgdesc="Linux application sandboxing and distribution framework (formerly xdg-app)" url="https://flatpak.org"; @@ -13,7 +13,8 @@ python bubblewrap appstream-glib xdg-dbus-proxy systemd) makedepends=(intltool gobject-introspection gtk-doc git docbook-xsl xmlto) checkdepends=(valgrind socat) -_commit=96aafda476c2634941dfcd68a65fe13f582eefcb # tags/1.12.2^0 +provides=(libflatpak.so) +_commit=e528dcf196816de5e267d08456d1edd6877f8f73 # tags/1.12.3^0 source=("git+https://github.com/flatpak/flatpak#commit=$_commit"; git+https://gitlab.gnome.org/GNOME/libglnx.git git+https://github.com/projectatomic/bubblewrap @@ -29,8 +30,13 @@ '3371dd250e61d9e1633630073fefda153cd4426f72f4afa0c3373ae2e8fea03a' '1824cb4eb1cc88702cb2b9f1c55b6dfdf20fca5eab83f6e8e532099281328745') +pkgver() { + cd flatpak + git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g' +} + prepare() { - cd $pkgname + cd flatpak git submodule init git submodule set-url bubblewrap "$srcdir/bubblewrap" @@ -45,13 +51,8 @@ NOCONFIGURE=1 ./autogen.sh } -pkgver() { - cd $pkgname - git describe --tags | sed 's/-/+/g' -} - build() { - cd $pkgname + cd flatpak ./configure \ --prefix=/usr \ @@ -71,7 +72,7 @@ } check() { - cd $pkgname + cd flatpak make -k check } @@ -78,7 +79,7 @@ package() { depends+=(xdg-desktop-portal) - make -C $pkgname DESTDIR="$pkgdir" install + 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
[arch-commits] Commit in flatpak/trunk (PKGBUILD)
Date: Monday, November 15, 2021 @ 20:27:47 Author: heftig Revision: 428545 FS#72681: make systemd a depend Modified: flatpak/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2021-11-15 20:24:29 UTC (rev 428544) +++ PKGBUILD2021-11-15 20:27:47 UTC (rev 428545) @@ -10,8 +10,8 @@ arch=(x86_64) 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) + python bubblewrap appstream-glib xdg-dbus-proxy systemd) +makedepends=(intltool gobject-introspection gtk-doc git docbook-xsl xmlto) checkdepends=(valgrind socat) _commit=96aafda476c2634941dfcd68a65fe13f582eefcb # tags/1.12.2^0 source=("git+https://github.com/flatpak/flatpak#commit=$_commit";
[arch-commits] Commit in flatpak/trunk (PKGBUILD)
Date: Wednesday, October 13, 2021 @ 19:48:22 Author: heftig Revision: 425873 1.12.2-1 Modified: flatpak/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2021-10-13 19:48:19 UTC (rev 425872) +++ PKGBUILD2021-10-13 19:48:22 UTC (rev 425873) @@ -3,7 +3,7 @@ # Contributor: Jan Alexander Steffens (heftig) pkgname=flatpak -pkgver=1.12.1 +pkgver=1.12.2 pkgrel=1 pkgdesc="Linux application sandboxing and distribution framework (formerly xdg-app)" url="https://flatpak.org"; @@ -13,7 +13,7 @@ python bubblewrap appstream-glib xdg-dbus-proxy) makedepends=(intltool systemd gobject-introspection gtk-doc git docbook-xsl xmlto) checkdepends=(valgrind socat) -_commit=afb3575d3113a8491af25af3bbc7bcf1cb5b9b33 # tags/1.12.1^0 +_commit=96aafda476c2634941dfcd68a65fe13f582eefcb # tags/1.12.2^0 source=("git+https://github.com/flatpak/flatpak#commit=$_commit"; git+https://gitlab.gnome.org/GNOME/libglnx.git git+https://github.com/projectatomic/bubblewrap
[arch-commits] Commit in flatpak/trunk (PKGBUILD)
Date: Friday, October 8, 2021 @ 22:51:06 Author: heftig Revision: 425494 1.12.1-1 Modified: flatpak/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2021-10-08 22:49:51 UTC (rev 425493) +++ PKGBUILD2021-10-08 22:51:06 UTC (rev 425494) @@ -3,7 +3,7 @@ # Contributor: Jan Alexander Steffens (heftig) pkgname=flatpak -pkgver=1.12.0 +pkgver=1.12.1 pkgrel=1 pkgdesc="Linux application sandboxing and distribution framework (formerly xdg-app)" url="https://flatpak.org"; @@ -13,7 +13,7 @@ python bubblewrap appstream-glib xdg-dbus-proxy) makedepends=(intltool systemd gobject-introspection gtk-doc git docbook-xsl xmlto) checkdepends=(valgrind socat) -_commit=0cfd72442dd7301b0699725e25eb0552da3b5e98 # tags/1.12.0^0 +_commit=afb3575d3113a8491af25af3bbc7bcf1cb5b9b33 # tags/1.12.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
[arch-commits] Commit in flatpak/trunk (PKGBUILD)
Date: Friday, October 8, 2021 @ 12:52:45 Author: heftig Revision: 425473 1.12.0-1 Modified: flatpak/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2021-10-08 09:17:58 UTC (rev 425472) +++ PKGBUILD2021-10-08 12:52:45 UTC (rev 425473) @@ -3,7 +3,7 @@ # Contributor: Jan Alexander Steffens (heftig) pkgname=flatpak -pkgver=1.11.3 +pkgver=1.12.0 pkgrel=1 pkgdesc="Linux application sandboxing and distribution framework (formerly xdg-app)" url="https://flatpak.org"; @@ -13,7 +13,7 @@ python bubblewrap appstream-glib xdg-dbus-proxy) makedepends=(intltool systemd gobject-introspection gtk-doc git docbook-xsl xmlto) checkdepends=(valgrind socat) -_commit=dd6b99d0d30129c1beab8fe61ba4f1beb15930c5 # tags/1.11.3^0 +_commit=0cfd72442dd7301b0699725e25eb0552da3b5e98 # tags/1.12.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
[arch-commits] Commit in flatpak/trunk (PKGBUILD)
Date: Thursday, August 26, 2021 @ 19:48:05 Author: heftig Revision: 422581 1.11.3-1 Modified: flatpak/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2021-08-26 19:38:10 UTC (rev 422580) +++ PKGBUILD2021-08-26 19:48:05 UTC (rev 422581) @@ -3,7 +3,7 @@ # Contributor: Jan Alexander Steffens (heftig) pkgname=flatpak -pkgver=1.11.2 +pkgver=1.11.3 pkgrel=1 pkgdesc="Linux application sandboxing and distribution framework (formerly xdg-app)" url="https://flatpak.org"; @@ -13,7 +13,7 @@ python bubblewrap appstream-glib xdg-dbus-proxy) makedepends=(intltool systemd gobject-introspection gtk-doc git docbook-xsl xmlto) checkdepends=(valgrind socat) -_commit=6ebe33117c90194d6ed776cf33d8e8399a50fbf5 # tags/1.11.2^0 +_commit=dd6b99d0d30129c1beab8fe61ba4f1beb15930c5 # tags/1.11.3^0 source=("git+https://github.com/flatpak/flatpak#commit=$_commit"; git+https://gitlab.gnome.org/GNOME/libglnx.git git+https://github.com/projectatomic/bubblewrap
[arch-commits] Commit in flatpak/trunk (PKGBUILD)
Date: Thursday, June 17, 2021 @ 21:31:15 Author: heftig Revision: 418408 1.11.2-1 Modified: flatpak/trunk/PKGBUILD --+ PKGBUILD |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2021-06-17 21:17:49 UTC (rev 418407) +++ PKGBUILD2021-06-17 21:31:15 UTC (rev 418408) @@ -3,8 +3,8 @@ # Contributor: Jan Alexander Steffens (heftig) pkgname=flatpak -pkgver=1.11.1 -pkgrel=2 +pkgver=1.11.2 +pkgrel=1 pkgdesc="Linux application sandboxing and distribution framework (formerly xdg-app)" url="https://flatpak.org"; arch=(x86_64) @@ -13,7 +13,7 @@ python bubblewrap appstream-glib xdg-dbus-proxy) makedepends=(intltool systemd gobject-introspection gtk-doc git docbook-xsl xmlto) checkdepends=(valgrind socat) -_commit=bcdc073041e0c93e15aa108b94cb7a39a79dcdf3 # tags/1.11.1^0 +_commit=6ebe33117c90194d6ed776cf33d8e8399a50fbf5 # tags/1.11.2^0 source=("git+https://github.com/flatpak/flatpak#commit=$_commit"; git+https://gitlab.gnome.org/GNOME/libglnx.git git+https://github.com/projectatomic/bubblewrap
[arch-commits] Commit in flatpak/trunk (PKGBUILD)
Date: Monday, June 14, 2021 @ 20:21:00 Author: heftig Revision: 418243 submodule set-url Modified: flatpak/trunk/PKGBUILD --+ PKGBUILD |8 1 file changed, 4 insertions(+), 4 deletions(-) Modified: PKGBUILD === --- PKGBUILD2021-06-14 20:18:36 UTC (rev 418242) +++ PKGBUILD2021-06-14 20:21:00 UTC (rev 418243) @@ -33,10 +33,10 @@ cd $pkgname git submodule init - 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 set-url bubblewrap "$srcdir/bubblewrap" + git submodule set-url libglnx "$srcdir/libglnx" + git submodule set-url dbus-proxy "$srcdir/xdg-dbus-proxy" + git submodule set-url variant-schema-compiler "$srcdir/variant-schema-compiler" git submodule update # https://github.com/flatpak/flatpak/issues/267
[arch-commits] Commit in flatpak/trunk (PKGBUILD flatpak-bindir.sh)
Date: Thursday, June 3, 2021 @ 12:15:28 Author: heftig Revision: 417045 1.11.1-2: Use append_path in bindir script and check XDG_DATA_HOME Modified: flatpak/trunk/PKGBUILD flatpak/trunk/flatpak-bindir.sh ---+ PKGBUILD |4 ++-- flatpak-bindir.sh |8 +--- 2 files changed, 7 insertions(+), 5 deletions(-) Modified: PKGBUILD === --- PKGBUILD2021-06-03 12:11:43 UTC (rev 417044) +++ PKGBUILD2021-06-03 12:15:28 UTC (rev 417045) @@ -4,7 +4,7 @@ pkgname=flatpak pkgver=1.11.1 -pkgrel=1 +pkgrel=2 pkgdesc="Linux application sandboxing and distribution framework (formerly xdg-app)" url="https://flatpak.org"; arch=(x86_64) @@ -27,7 +27,7 @@ 'SKIP' 'SKIP' '3371dd250e61d9e1633630073fefda153cd4426f72f4afa0c3373ae2e8fea03a' -'cf20e4831bceaaee74e9298b4ad7c4d2d51085d43f62d1c6a2d2977d2f421e00') +'1824cb4eb1cc88702cb2b9f1c55b6dfdf20fca5eab83f6e8e532099281328745') prepare() { cd $pkgname Modified: flatpak-bindir.sh === --- flatpak-bindir.sh 2021-06-03 12:11:43 UTC (rev 417044) +++ flatpak-bindir.sh 2021-06-03 12:15:28 UTC (rev 417045) @@ -1,7 +1,9 @@ -if [ -d "$HOME" ] && [ -d "$HOME/.local/share/flatpak/exports/bin" ]; then - PATH="$PATH:$HOME/.local/share/flatpak/exports/bin" +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 - PATH="$PATH:/var/lib/flatpak/exports/bin" + append_path /var/lib/flatpak/exports/bin fi
[arch-commits] Commit in flatpak/trunk (PKGBUILD)
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 === --- PKGBUILD2021-05-15 22:38:10 UTC (rev 415574) +++ PKGBUILD2021-05-15 22:40:24 UTC (rev 415575) @@ -1,22 +1,24 @@ -# Maintainer: Bartłomiej Piotrowski +# Maintainer: Jan Alexander Steffens (heftig) +# Contributor: Bartłomiej Piotrowski # Contributor: Jan Alexander Steffens (heftig) 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"
[arch-commits] Commit in flatpak/trunk (PKGBUILD)
Date: Thursday, March 11, 2021 @ 11:46:13 Author: arojas Revision: 409610 Update to 1.10.2 Modified: flatpak/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2021-03-11 07:51:00 UTC (rev 409609) +++ PKGBUILD2021-03-11 11:46:13 UTC (rev 409610) @@ -2,7 +2,7 @@ # Contributor: Jan Alexander Steffens (heftig) pkgname=flatpak -pkgver=1.10.1 +pkgver=1.10.2 pkgrel=1 pkgdesc="Linux application sandboxing and distribution framework (formerly xdg-app)" url="https://flatpak.org"; @@ -12,7 +12,7 @@ python bubblewrap appstream-glib xdg-dbus-proxy) makedepends=(intltool systemd gobject-introspection gtk-doc git docbook-xsl xmlto) checkdepends=(valgrind socat) -_commit=acb2a190b32bab35e23962715dbe7c9812333fc8 +_commit=c614eb400ed9f9ec516d74a43e7d63783e3fe1fb source=("git+https://github.com/flatpak/flatpak#commit=$_commit"; "git+https://gitlab.gnome.org/GNOME/libglnx.git"; "git+https://github.com/projectatomic/bubblewrap";
[arch-commits] Commit in flatpak/trunk (PKGBUILD)
Date: Thursday, February 4, 2021 @ 15:45:56 Author: arojas Revision: 407469 Update to 1.10.1 Modified: flatpak/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2021-02-04 15:36:30 UTC (rev 407468) +++ PKGBUILD2021-02-04 15:45:56 UTC (rev 407469) @@ -2,7 +2,7 @@ # Contributor: Jan Alexander Steffens (heftig) pkgname=flatpak -pkgver=1.10.0 +pkgver=1.10.1 pkgrel=1 pkgdesc="Linux application sandboxing and distribution framework (formerly xdg-app)" url="https://flatpak.org"; @@ -12,7 +12,7 @@ python bubblewrap appstream-glib xdg-dbus-proxy) makedepends=(intltool systemd gobject-introspection gtk-doc git docbook-xsl xmlto) checkdepends=(valgrind socat) -_commit=649ad5fe49945b834da0d616a24400c41666048c # tags/1.10.0^0 +_commit=acb2a190b32bab35e23962715dbe7c9812333fc8 source=("git+https://github.com/flatpak/flatpak#commit=$_commit"; "git+https://gitlab.gnome.org/GNOME/libglnx.git"; "git+https://github.com/projectatomic/bubblewrap";
[arch-commits] Commit in flatpak/trunk (PKGBUILD)
Date: Thursday, January 14, 2021 @ 10:18:50 Author: bpiotrowski Revision: 406230 1.10.0-1 Modified: flatpak/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2021-01-14 07:35:55 UTC (rev 406229) +++ PKGBUILD2021-01-14 10:18:50 UTC (rev 406230) @@ -2,7 +2,7 @@ # Contributor: Jan Alexander Steffens (heftig) pkgname=flatpak -pkgver=1.9.2 +pkgver=1.10.0 pkgrel=1 pkgdesc="Linux application sandboxing and distribution framework (formerly xdg-app)" url="https://flatpak.org"; @@ -12,7 +12,7 @@ python bubblewrap appstream-glib xdg-dbus-proxy) makedepends=(intltool systemd gobject-introspection gtk-doc git docbook-xsl xmlto) checkdepends=(valgrind socat) -_commit=aafe1f632c6bfa762b82c5a00a2382b7ea82bd38 # tags/1.9.2^0 +_commit=649ad5fe49945b834da0d616a24400c41666048c # tags/1.10.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";