aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRasmus Thomsen <oss@cogitri.dev>2020-03-23 20:59:22 +0000
committerRasmus Thomsen <oss@cogitri.dev>2020-03-24 11:50:03 +0000
commite99b50b707fa117a6a39e4646f14c95a936f008e (patch)
tree2bb96fcfa7004276a4eed472a7915eb9492f9ab4
parent973ce2254f7d5755753d70f463383f366f23c14d (diff)
downloadaports-e99b50b707fa117a6a39e4646f14c95a936f008e.tar.gz
aports-e99b50b707fa117a6a39e4646f14c95a936f008e.tar.bz2
aports-e99b50b707fa117a6a39e4646f14c95a936f008e.tar.xz
community/flatpak-builder: Add patch to always disable rofiles-fuse
rofiles-fuse is currently broken on musl, see https://github.com/flatpak/flatpak-builder/issues/329 for more info.
-rw-r--r--community/flatpak-builder/APKBUILD8
-rw-r--r--community/flatpak-builder/hard-disable-rofiles-fuse.patch29
2 files changed, 34 insertions, 3 deletions
diff --git a/community/flatpak-builder/APKBUILD b/community/flatpak-builder/APKBUILD
index 8475f97576..46e609f248 100644
--- a/community/flatpak-builder/APKBUILD
+++ b/community/flatpak-builder/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: André Klitzing <aklitzing@gmail.com>
pkgname=flatpak-builder
pkgver=1.0.10
-pkgrel=0
+pkgrel=1
pkgdesc="Tool to build flatpaks from source"
options="!check" # Testsuite fails on tests that require FUSE
url="https://flatpak.org"
@@ -15,7 +15,8 @@ makedepends="flatpak-dev glib-dev libsoup-dev json-glib-dev
subpackages="$pkgname-doc"
source="https://github.com/flatpak/flatpak-builder/releases/download/$pkgver/flatpak-builder-$pkgver.tar.xz
modules-load.conf
- musl-fixes.patch"
+ musl-fixes.patch
+ hard-disable-rofiles-fuse.patch"
install="$pkgname.post-install"
build() {
@@ -41,4 +42,5 @@ package() {
sha512sums="711f4b9811a5a7a3a5fea9c875af6bb5cffbf3e422fa29e33d308fb14d10744c081d4deabc87c18784ab7b95af1cd980a7b0e5ea214580d795d44fb9edfa0c02 flatpak-builder-1.0.10.tar.xz
57d23d2778556eafc3035e6be575bf95b4032f123b35f2b1657eff5e7496de253173edc657f90531ee58e25673f4f27a5cd1cc76b14a038edb244f104a231771 modules-load.conf
-9287ed146bf71665aa436a2c2110cc5edc829a7b4a3e3190947580850fe9ecfd2bb6adb015c692af022d425fb5259390fcdcbd402e8b0d12ee5d2c1a1071ed4f musl-fixes.patch"
+9287ed146bf71665aa436a2c2110cc5edc829a7b4a3e3190947580850fe9ecfd2bb6adb015c692af022d425fb5259390fcdcbd402e8b0d12ee5d2c1a1071ed4f musl-fixes.patch
+6b61c8ae3afbe0eb14cb14fb885b4e32ca48f9ca2471fef49a20922fe7580db9b3c7e9aca9511f4a281b6a09d01837a78a42be9da036831d27cd98ad1b0b8731 hard-disable-rofiles-fuse.patch"
diff --git a/community/flatpak-builder/hard-disable-rofiles-fuse.patch b/community/flatpak-builder/hard-disable-rofiles-fuse.patch
new file mode 100644
index 0000000000..53b7e31d83
--- /dev/null
+++ b/community/flatpak-builder/hard-disable-rofiles-fuse.patch
@@ -0,0 +1,29 @@
+Source: Rasmus Thomsen <oss@cogitri.dev>
+Upstream: No, Alpine/Musl specific hack
+Reason: rofiles-fuse is always broken on musl as of now, so
+disable it for know so users don't get (very weird) failures
+when building flatpaks if they forget to specify that opt.
+See https://github.com/flatpak/flatpak-builder/issues/329
+for more info.
+diff --git a/src/builder-main.c b/src/builder-main.c
+index a5f6601..f63c42f 100644
+--- a/src/builder-main.c
++++ b/src/builder-main.c
+@@ -98,7 +98,7 @@ static GOptionEntry entries[] = {
+ { "ccache", 0, 0, G_OPTION_ARG_NONE, &opt_ccache, "Use ccache", NULL },
+ { "disable-cache", 0, 0, G_OPTION_ARG_NONE, &opt_disable_cache, "Disable cache lookups", NULL },
+ { "disable-tests", 0, 0, G_OPTION_ARG_NONE, &opt_disable_tests, "Don't run tests", NULL },
+- { "disable-rofiles-fuse", 0, 0, G_OPTION_ARG_NONE, &opt_disable_rofiles, "Disable rofiles-fuse use", NULL },
++ { "disable-rofiles-fuse", 0, 0, G_OPTION_ARG_NONE, &opt_disable_rofiles, "Disable rofiles-fuse use (Note: This is ALWAYS disabled on Alpine Linux due to https://github.com/flatpak/flatpak-builder/issues/329)", NULL },
+ { "disable-download", 0, 0, G_OPTION_ARG_NONE, &opt_disable_download, "Don't download any new sources", NULL },
+ { "disable-updates", 0, 0, G_OPTION_ARG_NONE, &opt_disable_updates, "Only download missing sources, never update to latest vcs version", NULL },
+ { "download-only", 0, 0, G_OPTION_ARG_NONE, &opt_download_only, "Only download sources, don't build", NULL },
+@@ -508,7 +508,7 @@ main (int argc,
+
+ build_context = builder_context_new (cwd_dir, app_dir, opt_state_dir);
+
+- builder_context_set_use_rofiles (build_context, !opt_disable_rofiles);
++ builder_context_set_use_rofiles (build_context, 0);
+ builder_context_set_run_tests (build_context, !opt_disable_tests);
+ builder_context_set_no_shallow_clone (build_context, opt_no_shallow_clone);
+ builder_context_set_keep_build_dirs (build_context, opt_keep_build_dirs);