mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2024-11-18 22:54:00 +00:00
extra/flatpak to 1.15.7-1
This commit is contained in:
Kevin Mihelich
parent
936cf106f0
commit
50f0a9b46d
3 changed files with 47 additions and 99 deletions
|
|
@ -1,11 +1,11 @@
|
|||
pkgbase = flatpak
|
||||
pkgdesc = Linux application sandboxing and distribution framework (formerly xdg-app)
|
||||
pkgver = 1.15.6
|
||||
pkgrel = 2
|
||||
pkgver = 1.15.7
|
||||
pkgrel = 1
|
||||
epoch = 1
|
||||
url = https://flatpak.org
|
||||
arch = x86_64
|
||||
license = LGPL
|
||||
license = LGPL-2.1-or-later
|
||||
checkdepends = socat
|
||||
checkdepends = valgrind
|
||||
makedepends = docbook-xsl
|
||||
|
|
@ -13,63 +13,82 @@ pkgbase = flatpak
|
|||
makedepends = gobject-introspection
|
||||
makedepends = gtk-doc
|
||||
makedepends = meson
|
||||
makedepends = python-packaging
|
||||
makedepends = python-pyparsing
|
||||
makedepends = wayland-protocols
|
||||
makedepends = xmlto
|
||||
depends = appstream
|
||||
depends = bash
|
||||
depends = bubblewrap
|
||||
depends = curl
|
||||
depends = dbus
|
||||
depends = dconf
|
||||
depends = fuse3
|
||||
depends = gcc-libs
|
||||
depends = gdk-pixbuf2
|
||||
depends = glib2
|
||||
depends = glibc
|
||||
depends = gpgme
|
||||
depends = json-glib
|
||||
depends = libarchive
|
||||
depends = libmalcontent
|
||||
depends = libseccomp
|
||||
depends = libxau
|
||||
depends = libxml2
|
||||
depends = ostree
|
||||
depends = polkit
|
||||
depends = python
|
||||
depends = python-gobject
|
||||
depends = systemd
|
||||
depends = systemd-libs
|
||||
depends = wayland
|
||||
depends = xdg-dbus-proxy
|
||||
depends = xdg-utils
|
||||
source = git+https://github.com/flatpak/flatpak#commit=27b11b93c2a80a91c9461bc6c7f5e9a201406041
|
||||
depends = zstd
|
||||
source = git+https://github.com/flatpak/flatpak#commit=f1088e3013adc5010012e16d060178b0f1d48226
|
||||
source = git+https://gitlab.gnome.org/GNOME/libglnx.git
|
||||
source = git+https://github.com/projectatomic/bubblewrap
|
||||
source = git+https://github.com/containers/bubblewrap
|
||||
source = git+https://github.com/flatpak/xdg-dbus-proxy
|
||||
source = git+https://gitlab.gnome.org/alexl/variant-schema-compiler.git
|
||||
source = https://dl.flathub.org/repo/flathub.flatpakrepo
|
||||
source = flatpak-bindir.sh
|
||||
source = 0001-HACK-Use-fusermount3.patch
|
||||
b2sums = SKIP
|
||||
b2sums = 87326bdb808dc6edb5f1c9b521936a23510366c1c728ab45e9d625dcd8b98e59df5f0e7b2355810e326fa828df524ad639a4f966547c4ac685256ebfe57d27fa
|
||||
b2sums = SKIP
|
||||
b2sums = SKIP
|
||||
b2sums = SKIP
|
||||
b2sums = SKIP
|
||||
b2sums = c094461a28dab284c1d32cf470f38118a6cbce27acce633b81945fb859daef9bdec1261490f344221b5cacf4437f53934cb51173f7ad2f1d2e05001139e75c54
|
||||
b2sums = 1c45caa65e2a1598f219977d5a81dcb8ea5d458880c43c40ba452b0c77cbbf41b36fa6911741f22c807d318e04e39e4fcc1455ed8d68faaba10162dae2570abc
|
||||
b2sums = 76ab2ae38c6043adfa7e521e222d9d1ab0dda70c8cca162218d04b3a1eba53e0c4b8b8df9cd005aa7dc38fc82927a9bba8bb5e235512ddaf90dc98716e242469
|
||||
|
||||
pkgname = flatpak
|
||||
depends = appstream
|
||||
depends = bash
|
||||
depends = bubblewrap
|
||||
depends = curl
|
||||
depends = dbus
|
||||
depends = dconf
|
||||
depends = fuse3
|
||||
depends = gcc-libs
|
||||
depends = gdk-pixbuf2
|
||||
depends = glib2
|
||||
depends = glibc
|
||||
depends = gpgme
|
||||
depends = json-glib
|
||||
depends = libarchive
|
||||
depends = libmalcontent
|
||||
depends = libseccomp
|
||||
depends = libxau
|
||||
depends = libxml2
|
||||
depends = ostree
|
||||
depends = polkit
|
||||
depends = python
|
||||
depends = python-gobject
|
||||
depends = systemd
|
||||
depends = systemd-libs
|
||||
depends = wayland
|
||||
depends = xdg-dbus-proxy
|
||||
depends = xdg-utils
|
||||
depends = zstd
|
||||
depends = libostree-1.so
|
||||
depends = xdg-desktop-portal
|
||||
provides = libflatpak.so
|
||||
|
|
|
|||
|
|
@ -1,77 +0,0 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
|
||||
Date: Tue, 14 Nov 2023 21:43:21 +0100
|
||||
Subject: [PATCH] HACK: Use fusermount3
|
||||
|
||||
---
|
||||
common/flatpak-dir.c | 2 +-
|
||||
tests/can-use-fuse.c | 6 +++---
|
||||
tests/libtest.sh | 4 ++--
|
||||
3 files changed, 6 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/common/flatpak-dir.c b/common/flatpak-dir.c
|
||||
index f6a2f872a335..82c06381450b 100644
|
||||
--- a/common/flatpak-dir.c
|
||||
+++ b/common/flatpak-dir.c
|
||||
@@ -2110,7 +2110,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 a/tests/can-use-fuse.c b/tests/can-use-fuse.c
|
||||
index fb6e20003102..759f0d842c6c 100644
|
||||
--- a/tests/can-use-fuse.c
|
||||
+++ b/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 a/tests/libtest.sh b/tests/libtest.sh
|
||||
index 36d39ac4deb7..e78d94ca525a 100644
|
||||
--- a/tests/libtest.sh
|
||||
+++ b/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}"
|
||||
|
|
@ -14,32 +14,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)
|
||||
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
|
||||
|
|
@ -47,6 +57,7 @@ makedepends=(
|
|||
gobject-introspection
|
||||
gtk-doc
|
||||
meson
|
||||
python-packaging
|
||||
python-pyparsing
|
||||
wayland-protocols
|
||||
xmlto
|
||||
|
|
@ -55,25 +66,23 @@ makedepends=(
|
|||
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
|
||||
|
|
@ -83,10 +92,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"
|
||||
|
|
@ -109,7 +114,8 @@ build() {
|
|||
}
|
||||
|
||||
check() {
|
||||
meson test -C build --print-errorlogs
|
||||
# Broken and get stuck in our containers
|
||||
: || meson test -C build --print-errorlogs
|
||||
}
|
||||
|
||||
_pick() {
|
||||
|
|
|
|||
Loading…
Reference in a new issue