forked from pool/flatpak-builder
Dominique Leuenberger
00aaf41936
- Update to version 1.4.0 + Deprecate SHA1 and MD5 hashes for sources + Remove all usage of libsoup (bumps GLib requirement to 2.66) + Fix errors in included manifests not being fatal + Fix crash on empty manifests or incorrect JSON type + Various updates to the JSON Schema + Add meson buildsystem; + Set the HTTP Referer header on file/archive Sources + Fix no-autodownload in extensions incorrectly setting autodelete + Reduce verbosity of unzip usage + Ignore $schema properties in manifests + Change git usage to be more forgiving about submodules + Add installed_tests option to meson project + Fix libglnx meson subproject when built from autotools dist + Fix tests not running in parallel under meson + Replace appstream-glib with libappstream + Run tests in parallel respecting number of jobs set + Add missing secret-env and secret-opts keys to the JSON schema + Improve parsing of git submodules + Meson build fixes + Add rename-mime-file and rename-mime-icons properties + Re-implement support for data: URIs + Set download speed timeout for HTTP downloads + Enabled compressed HTTP downloads + Use meson setup with meson buildsystem to avoid warning + Fix libappstream not handling ID's ending with .desktop + Fix ostree deployment on 64-bit inode filesystems - remove 0001-builder-Fix-silent-truncation-of-gt-32-bit-inodes.patch - Add patch fusermount3.diff to enforce usage of fuse v3 - Switch to meson build system OBS-URL: https://build.opensuse.org/request/show/1136680 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/flatpak-builder?expand=0&rev=50
36 lines
1.2 KiB
Diff
36 lines
1.2 KiB
Diff
diff --git i/src/builder-context.c w/src/builder-context.c
|
|
index bf699fff..5412166f 100644
|
|
--- i/src/builder-context.c
|
|
+++ w/src/builder-context.c
|
|
@@ -834,7 +834,7 @@ static char *rofiles_unmount_path = NULL;
|
|
static void
|
|
rofiles_umount_handler (int signum)
|
|
{
|
|
- char *argv[] = { "fusermount", "-uz", NULL,
|
|
+ char *argv[] = { "fusermount3", "-uz", NULL,
|
|
NULL };
|
|
|
|
argv[2] = rofiles_unmount_path;
|
|
@@ -974,7 +974,7 @@ gboolean
|
|
builder_context_disable_rofiles (BuilderContext *self,
|
|
GError **error)
|
|
{
|
|
- char *argv[] = { "fusermount", "-u", NULL,
|
|
+ char *argv[] = { "fusermount3", "-u", NULL,
|
|
NULL };
|
|
|
|
if (!self->use_rofiles)
|
|
diff --git i/tests/libtest.sh w/tests/libtest.sh
|
|
index 3536e922..3b148ec4 100644
|
|
--- i/tests/libtest.sh
|
|
+++ w/tests/libtest.sh
|
|
@@ -296,7 +296,7 @@ run_sh () {
|
|
# fuse support is needed (and the kernel module needs to be loaded) for several
|
|
# flatpak-builder tests
|
|
skip_without_fuse () {
|
|
- if [ ! -w /dev/fuse ] || ! command -v fusermount >/dev/null; then
|
|
+ if [ ! -w /dev/fuse ] || ! command -v fusermount3 >/dev/null; then
|
|
echo "1..0 # SKIP this test requires fuse support"
|
|
exit 0
|
|
fi
|