[arch-commits] Commit in flatpak-builder/repos/testing-x86_64 (3 files)

[Jan Steffens]

    Date: Friday, August 19, 2022 @ 18:19:22
  Author: heftig
Revision: 454055

archrelease: copy trunk to testing-x86_64

Added:
  flatpak-builder/repos/testing-x86_64/PKGBUILD
    (from rev 454054, flatpak-builder/trunk/PKGBUILD)
  flatpak-builder/repos/testing-x86_64/fusermount3.diff
    (from rev 454054, flatpak-builder/trunk/fusermount3.diff)
Deleted:
  flatpak-builder/repos/testing-x86_64/PKGBUILD

------------------+
 PKGBUILD         |  135 +++++++++++++++++++++++++++--------------------------
 fusermount3.diff |   35 +++++++++++++
 2 files changed, 106 insertions(+), 64 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2022-08-19 18:18:14 UTC (rev 454054)
+++ PKGBUILD	2022-08-19 18:19:22 UTC (rev 454055)
@@ -1,64 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
-
-pkgname=flatpak-builder
-pkgver=1.2.2
-pkgrel=2
-pkgdesc="Tool to build flatpaks from source"
-url="https://flatpak.org"
-arch=(x86_64)
-license=(LGPL)
-depends=(flatpak binutils elfutils unzip tar git bzr patch rpmextract cpio
-         appstream-glib)
-makedepends=(gobject-introspection git docbook-xsl xmlto)
-checkdepends=(valgrind)
-replaces=('flatpak<0.9.10')
-options=(debug)
-_commit=4e9fb6a3e6c405f10797f12cc5c8c0a6ce99282d  # tags/1.2.2^0
-source=("git+https://github.com/flatpak/flatpak-builder#commit=$_commit"
-        "git+https://gitlab.gnome.org/GNOME/libglnx.git"
-        "git+https://sourceware.org/git/debugedit.git")
-sha256sums=('SKIP'
-            'SKIP'
-            'SKIP')
-
-pkgver() {
-  cd $pkgname
-  git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g'
-}
-
-prepare() {
-  cd $pkgname
-
-  git submodule init
-  git submodule set-url libglnx "$srcdir/libglnx"
-  git submodule set-url debugedit "$srcdir/debugedit"
-  git submodule update
-
-  NOCONFIGURE=1 ./autogen.sh
-}
-
-build() {
-  cd $pkgname
-
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
-    --sbindir=/usr/bin \
-    --libexecdir=/usr/lib \
-    --disable-static
-
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
-  make
-}
-
-check() {
-  cd $pkgname
-  make -k check
-}
-
-package() {
-  cd $pkgname
-  make DESTDIR="$pkgdir" install
-}

Copied: flatpak-builder/repos/testing-x86_64/PKGBUILD (from rev 454054, flatpak-builder/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2022-08-19 18:19:22 UTC (rev 454055)
@@ -0,0 +1,71 @@
+# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
+
+pkgname=flatpak-builder
+pkgver=1.2.2
+pkgrel=3
+pkgdesc="Tool to build flatpaks from source"
+url="https://flatpak.org"
+arch=(x86_64)
+license=(LGPL)
+depends=(flatpak binutils elfutils unzip tar git bzr patch rpmextract cpio
+         appstream-glib fuse3)
+makedepends=(gobject-introspection git docbook-xsl xmlto)
+checkdepends=(valgrind)
+replaces=('flatpak<0.9.10')
+options=(debug)
+_commit=4e9fb6a3e6c405f10797f12cc5c8c0a6ce99282d  # tags/1.2.2^0
+source=(
+  "git+https://github.com/flatpak/flatpak-builder#commit=$_commit"
+  "git+https://gitlab.gnome.org/GNOME/libglnx.git"
+  "git+https://sourceware.org/git/debugedit.git"
+  fusermount3.diff
+)
+sha256sums=('SKIP'
+            'SKIP'
+            'SKIP'
+            '984ea70ac2c5794c758523aba9c1f643dc21fb01db4ed962987935a454d521a7')
+
+pkgver() {
+  cd $pkgname
+  git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g'
+}
+
+prepare() {
+  cd $pkgname
+
+  # https://bugs.archlinux.org/task/75649
+  git apply -3 ../fusermount3.diff
+
+  git submodule init
+  git submodule set-url libglnx "$srcdir/libglnx"
+  git submodule set-url debugedit "$srcdir/debugedit"
+  git submodule update
+
+  NOCONFIGURE=1 ./autogen.sh
+}
+
+build() {
+  cd $pkgname
+
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --localstatedir=/var \
+    --sbindir=/usr/bin \
+    --libexecdir=/usr/lib \
+    --disable-static
+
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
+  make
+}
+
+check() {
+  cd $pkgname
+  make -k check
+}
+
+package() {
+  cd $pkgname
+  make DESTDIR="$pkgdir" install
+}

Copied: flatpak-builder/repos/testing-x86_64/fusermount3.diff (from rev 454054, flatpak-builder/trunk/fusermount3.diff)
===================================================================
--- fusermount3.diff	                        (rev 0)
+++ fusermount3.diff	2022-08-19 18:19:22 UTC (rev 454055)
@@ -0,0 +1,35 @@
+diff --git i/src/builder-context.c w/src/builder-context.c
+index ea4d7fc9..aa094479 100644
+--- i/src/builder-context.c
++++ w/src/builder-context.c
+@@ -792,7 +792,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;
+@@ -929,7 +929,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 0384c499..07ef5f7c 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