[PR PATCH] flatpak-builder: update to 1.1.1.

[PR PATCH] flatpak-builder: update to 1.1.1.

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 1585 bytes --]

There is a new pull request by Johnnynator against master on the void-packages repository

https://github.com/Johnnynator/void-packages flatpak-builder
https://github.com/void-linux/void-packages/pull/32728

flatpak-builder: update to 1.1.1.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/32728.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-flatpak-builder-32728.patch --]
[-- Type: text/x-diff, Size: 4668 bytes --]

From a1351f6a75829be7d3a6bcd22165bc4f28ac4d00 Mon Sep 17 00:00:00 2001
From: John Zimmermann <me@johnnynator.dev>
Date: Fri, 27 Aug 2021 21:22:32 +0200
Subject: [PATCH] flatpak-builder: update to 1.1.1.

---
 .../files/hard-disable-rofiles-fuse.patch     | 29 +++++++++++++++++++
 .../patches/fix-temp-failure-retry.patch      |  2 +-
 srcpkgs/flatpak-builder/template              | 15 ++++++++--
 3 files changed, 42 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/flatpak-builder/files/hard-disable-rofiles-fuse.patch

diff --git a/srcpkgs/flatpak-builder/files/hard-disable-rofiles-fuse.patch b/srcpkgs/flatpak-builder/files/hard-disable-rofiles-fuse.patch
new file mode 100644
index 000000000000..dd6d5a418d91
--- /dev/null
+++ b/srcpkgs/flatpak-builder/files/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 VoidLinux with Musl 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);
diff --git a/srcpkgs/flatpak-builder/patches/fix-temp-failure-retry.patch b/srcpkgs/flatpak-builder/patches/fix-temp-failure-retry.patch
index 995275946382..ae4b1bb55de9 100644
--- a/srcpkgs/flatpak-builder/patches/fix-temp-failure-retry.patch
+++ b/srcpkgs/flatpak-builder/patches/fix-temp-failure-retry.patch
@@ -1,6 +1,6 @@
 index 0000000..878bd82
 --- /dev/null
-+++ b/libglnx/config.h
++++ b/subprojects/libglnx/config.h
 @@ -0,0 +1,9 @@
 +/* taken from glibc unistd.h and fixes musl */
 +#ifndef TEMP_FAILURE_RETRY
diff --git a/srcpkgs/flatpak-builder/template b/srcpkgs/flatpak-builder/template
index 208481c58b25..7b51a18cb491 100644
--- a/srcpkgs/flatpak-builder/template
+++ b/srcpkgs/flatpak-builder/template
@@ -1,20 +1,29 @@
 # Template file for 'flatpak-builder'
 pkgname=flatpak-builder
-version=1.0.12
+version=1.1.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config xmlto"
 makedepends="flatpak-devel json-glib-devel libcap-devel libsoup-devel
- libyaml-devel libcurl-devel"
+ libyaml-devel libcurl-devel elfutils"
 short_desc="Tool to build flatpaks from source"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/flatpak/flatpak-builder"
 distfiles="${homepage}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=4780c1b8e0838ffb64e9639bd7801417964fd818c7c6d5e9afca4d5511ded2c8
+checksum=13c5ccc8765f4724ad286a8eff8aad191a417b73a03eab7c3ae53a2e9eb22140
 # Tests expects a Debian derivate hosts to build a flatpak container from.
 make_check=no
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" flatpak-devel"
 fi
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	makedepends+=" musl-legacy-compat"
+fi
+
+post_patch() {
+	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+		patch -Np1 < $FILESDIR/hard-disable-rofiles-fuse.patch
+	fi
+}

Re: [PR PATCH] [Merged]: flatpak-builder: update to 1.1.1.

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 1418 bytes --]

There's a merged pull request on the void-packages repository

flatpak-builder: update to 1.1.1.
https://github.com/void-linux/void-packages/pull/32728

Description:
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->