[arch-commits] Commit in flatpak-builder/trunk (PKGBUILD fusermount3.diff)

2022-08-19 Thread Jan Steffens via arch-commits 
Date: Friday, August 19, 2022 @ 18:17:13
  Author: heftig
Revision: 454052

1.2.2-3: FS#75649 Use fusermount3

Added:
  flatpak-builder/trunk/fusermount3.diff
Modified:
  flatpak-builder/trunk/PKGBUILD

--+
 PKGBUILD |   19 +--
 fusermount3.diff |   35 +++
 2 files changed, 48 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2022-08-19 16:00:32 UTC (rev 454051)
+++ PKGBUILD2022-08-19 18:17:13 UTC (rev 454052)
@@ -2,24 +2,28 @@
 
 pkgname=flatpak-builder
 pkgver=1.2.2
-pkgrel=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)
+ 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;)
+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')
+'SKIP'
+'984ea70ac2c5794c758523aba9c1f643dc21fb01db4ed962987935a454d521a7')
 
 pkgver() {
   cd $pkgname
@@ -29,6 +33,9 @@
 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"

Added: fusermount3.diff
===
--- fusermount3.diff(rev 0)
+++ fusermount3.diff2022-08-19 18:17:13 UTC (rev 454052)
@@ -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

[arch-commits] Commit in flatpak-builder/trunk (PKGBUILD)

2022-08-17 Thread Jan Steffens via arch-commits 
Date: Wednesday, August 17, 2022 @ 22:11:53
  Author: heftig
Revision: 453071

1.2.2-2: FS#75622 Don't assume fuse2; enable debug

Modified:
  flatpak-builder/trunk/PKGBUILD

--+
 PKGBUILD |   11 ---
 1 file changed, 4 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2022-08-17 22:10:42 UTC (rev 453070)
+++ PKGBUILD2022-08-17 22:11:53 UTC (rev 453071)
@@ -2,16 +2,17 @@
 
 pkgname=flatpak-builder
 pkgver=1.2.2
-pkgrel=1
+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 fuse2)
+ 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;
@@ -33,9 +34,6 @@
   git submodule set-url debugedit "$srcdir/debugedit"
   git submodule update
 
-  # https://github.com/flatpak/flatpak/issues/267
-  sed -i '/locale\/C\./d' tests/make-test-runtime.sh
-
   NOCONFIGURE=1 ./autogen.sh
 }
 
@@ -48,8 +46,7 @@
 --localstatedir=/var \
 --sbindir=/usr/bin \
 --libexecdir=/usr/lib \
---disable-static \
---with-fuse=2
+--disable-static
 
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool

[arch-commits] Commit in flatpak-builder/trunk (PKGBUILD)

2022-01-19 Thread Jan Steffens via arch-commits 
Date: Wednesday, January 19, 2022 @ 20:02:35
  Author: heftig
Revision: 434748

drop libdwarf

Modified:
  flatpak-builder/trunk/PKGBUILD

--+
 PKGBUILD |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2022-01-19 19:50:50 UTC (rev 434747)
+++ PKGBUILD2022-01-19 20:02:35 UTC (rev 434748)
@@ -9,7 +9,7 @@
 license=(LGPL)
 depends=(flatpak binutils elfutils unzip tar git bzr patch rpmextract cpio
  appstream-glib fuse2)
-makedepends=(gobject-introspection git docbook-xsl xmlto libdwarf)
+makedepends=(gobject-introspection git docbook-xsl xmlto)
 checkdepends=(valgrind)
 replaces=('flatpak<0.9.10')
 _commit=4e9fb6a3e6c405f10797f12cc5c8c0a6ce99282d  # tags/1.2.2^0
@@ -49,7 +49,6 @@
 --sbindir=/usr/bin \
 --libexecdir=/usr/lib \
 --disable-static \
---with-dwarf-header=/usr/include/libdwarf \
 --with-fuse=2
 
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool

[arch-commits] Commit in flatpak-builder/trunk (PKGBUILD)

2022-01-19 Thread Jan Steffens via arch-commits 
Date: Wednesday, January 19, 2022 @ 19:50:50
  Author: heftig
Revision: 434747

1.2.2-1

Modified:
  flatpak-builder/trunk/PKGBUILD

--+
 PKGBUILD |9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2022-01-19 19:50:43 UTC (rev 434746)
+++ PKGBUILD2022-01-19 19:50:50 UTC (rev 434747)
@@ -1,7 +1,7 @@
 # Maintainer: Jan Alexander Steffens (heftig) 
 
 pkgname=flatpak-builder
-pkgver=1.2.1
+pkgver=1.2.2
 pkgrel=1
 pkgdesc="Tool to build flatpaks from source"
 url="https://flatpak.org;
@@ -8,11 +8,11 @@
 arch=(x86_64)
 license=(LGPL)
 depends=(flatpak binutils elfutils unzip tar git bzr patch rpmextract cpio
- appstream-glib)
+ appstream-glib fuse2)
 makedepends=(gobject-introspection git docbook-xsl xmlto libdwarf)
 checkdepends=(valgrind)
 replaces=('flatpak<0.9.10')
-_commit=b6027eb3ea4b0113c581e3b66d78e31a735281b0  # tags/1.2.1
+_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;)
@@ -49,7 +49,8 @@
 --sbindir=/usr/bin \
 --libexecdir=/usr/lib \
 --disable-static \
---with-dwarf-header=/usr/include/libdwarf
+--with-dwarf-header=/usr/include/libdwarf \
+--with-fuse=2
 
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool

[arch-commits] Commit in flatpak-builder/trunk (PKGBUILD)

2022-01-08 Thread Jan Steffens via arch-commits 
Date: Sunday, January 9, 2022 @ 02:55:20
  Author: heftig
Revision: 433982

1.2.1-1

Modified:
  flatpak-builder/trunk/PKGBUILD

--+
 PKGBUILD |   14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2022-01-09 02:51:49 UTC (rev 433981)
+++ PKGBUILD2022-01-09 02:55:20 UTC (rev 433982)
@@ -1,7 +1,7 @@
 # Maintainer: Jan Alexander Steffens (heftig) 
 
 pkgname=flatpak-builder
-pkgver=1.2.0
+pkgver=1.2.1
 pkgrel=1
 pkgdesc="Tool to build flatpaks from source"
 url="https://flatpak.org;
@@ -12,7 +12,7 @@
 makedepends=(gobject-introspection git docbook-xsl xmlto libdwarf)
 checkdepends=(valgrind)
 replaces=('flatpak<0.9.10')
-_commit=ade6de21f7379886460b683810628a0a441be924  # tags/1.2.0^0
+_commit=b6027eb3ea4b0113c581e3b66d78e31a735281b0  # tags/1.2.1
 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;)
@@ -20,6 +20,11 @@
 'SKIP'
 'SKIP')
 
+pkgver() {
+  cd $pkgname
+  git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g'
+}
+
 prepare() {
   cd $pkgname
 
@@ -34,11 +39,6 @@
   NOCONFIGURE=1 ./autogen.sh
 }
 
-pkgver() {
-  cd $pkgname
-  git describe --tags | sed 's/-/+/g'
-}
-
 build() {
   cd $pkgname

[arch-commits] Commit in flatpak-builder/trunk (PKGBUILD)

2021-11-24 Thread Jan Steffens via arch-commits 
Date: Wednesday, November 24, 2021 @ 19:44:24
  Author: heftig
Revision: 429067

FS#70526: Drop intltool dep

Modified:
  flatpak-builder/trunk/PKGBUILD

--+
 PKGBUILD |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2021-11-24 19:42:04 UTC (rev 429066)
+++ PKGBUILD2021-11-24 19:44:24 UTC (rev 429067)
@@ -7,8 +7,9 @@
 url="https://flatpak.org;
 arch=(x86_64)
 license=(LGPL)
-depends=(flatpak binutils elfutils unzip tar git bzr patch rpmextract cpio 
appstream-glib)
-makedepends=(intltool gobject-introspection git docbook-xsl xmlto libdwarf)
+depends=(flatpak binutils elfutils unzip tar git bzr patch rpmextract cpio
+ appstream-glib)
+makedepends=(gobject-introspection git docbook-xsl xmlto libdwarf)
 checkdepends=(valgrind)
 replaces=('flatpak<0.9.10')
 _commit=ade6de21f7379886460b683810628a0a441be924  # tags/1.2.0^0

[arch-commits] Commit in flatpak-builder/trunk (PKGBUILD)

2021-10-08 Thread Jan Steffens via arch-commits 
Date: Friday, October 8, 2021 @ 13:55:56
  Author: heftig
Revision: 425474

1.2.0-1

Modified:
  flatpak-builder/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2021-10-08 12:52:45 UTC (rev 425473)
+++ PKGBUILD2021-10-08 13:55:56 UTC (rev 425474)
@@ -1,7 +1,7 @@
 # Maintainer: Jan Alexander Steffens (heftig) 
 
 pkgname=flatpak-builder
-pkgver=1.1.2
+pkgver=1.2.0
 pkgrel=1
 pkgdesc="Tool to build flatpaks from source"
 url="https://flatpak.org;
@@ -11,7 +11,7 @@
 makedepends=(intltool gobject-introspection git docbook-xsl xmlto libdwarf)
 checkdepends=(valgrind)
 replaces=('flatpak<0.9.10')
-_commit=7f8d8ef683cd0babdf8559c93e31fa47f10de95f  # tags/1.1.2^0
+_commit=ade6de21f7379886460b683810628a0a441be924  # tags/1.2.0^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;)

[arch-commits] Commit in flatpak-builder/trunk (PKGBUILD)

2021-10-04 Thread Jan Steffens via arch-commits 
Date: Monday, October 4, 2021 @ 18:35:11
  Author: heftig
Revision: 425091

1.1.2-1

Modified:
  flatpak-builder/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2021-10-04 18:34:48 UTC (rev 425090)
+++ PKGBUILD2021-10-04 18:35:11 UTC (rev 425091)
@@ -1,7 +1,7 @@
 # Maintainer: Jan Alexander Steffens (heftig) 
 
 pkgname=flatpak-builder
-pkgver=1.1.1
+pkgver=1.1.2
 pkgrel=1
 pkgdesc="Tool to build flatpaks from source"
 url="https://flatpak.org;
@@ -11,7 +11,7 @@
 makedepends=(intltool gobject-introspection git docbook-xsl xmlto libdwarf)
 checkdepends=(valgrind)
 replaces=('flatpak<0.9.10')
-_commit=10658573f207effe4c8459f265fc9f111cff7739  # tags/1.1.1^0
+_commit=7f8d8ef683cd0babdf8559c93e31fa47f10de95f  # tags/1.1.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;)

[arch-commits] Commit in flatpak-builder/trunk (PKGBUILD)

2021-08-26 Thread Jan Steffens via arch-commits 
Date: Thursday, August 26, 2021 @ 19:52:05
  Author: heftig
Revision: 422585

1.1.1-1

Modified:
  flatpak-builder/trunk/PKGBUILD

--+
 PKGBUILD |   11 +++
 1 file changed, 7 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2021-08-26 19:49:34 UTC (rev 422584)
+++ PKGBUILD2021-08-26 19:52:05 UTC (rev 422585)
@@ -1,8 +1,8 @@
 # Maintainer: Jan Alexander Steffens (heftig) 
 
 pkgname=flatpak-builder
-pkgver=1.0.14
-pkgrel=2
+pkgver=1.1.1
+pkgrel=1
 pkgdesc="Tool to build flatpaks from source"
 url="https://flatpak.org;
 arch=(x86_64)
@@ -11,10 +11,12 @@
 makedepends=(intltool gobject-introspection git docbook-xsl xmlto libdwarf)
 checkdepends=(valgrind)
 replaces=('flatpak<0.9.10')
-_commit=a5df218bae3a019bb398a99dd8a3897b1849218c  # tags/1.0.14^0
+_commit=10658573f207effe4c8459f265fc9f111cff7739  # tags/1.1.1^0
 source=("git+https://github.com/flatpak/flatpak-builder#commit=$_commit;
-"git+https://gitlab.gnome.org/GNOME/libglnx.git;)
+"git+https://gitlab.gnome.org/GNOME/libglnx.git;
+"git+https://sourceware.org/git/debugedit.git;)
 sha256sums=('SKIP'
+'SKIP'
 'SKIP')
 
 prepare() {
@@ -22,6 +24,7 @@
 
   git submodule init
   git submodule set-url libglnx "$srcdir/libglnx"
+  git submodule set-url debugedit "$srcdir/debugedit"
   git submodule update
 
   # https://github.com/flatpak/flatpak/issues/267

[arch-commits] Commit in flatpak-builder/trunk (PKGBUILD)

2021-08-10 Thread Jan Steffens via arch-commits 
Date: Tuesday, August 10, 2021 @ 18:49:27
  Author: heftig
Revision: 421298

1.0.14-2: drop python2 checkdep

Modified:
  flatpak-builder/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2021-08-10 18:33:38 UTC (rev 421297)
+++ PKGBUILD2021-08-10 18:49:27 UTC (rev 421298)
@@ -2,7 +2,7 @@
 
 pkgname=flatpak-builder
 pkgver=1.0.14
-pkgrel=1
+pkgrel=2
 pkgdesc="Tool to build flatpaks from source"
 url="https://flatpak.org;
 arch=(x86_64)
@@ -9,7 +9,7 @@
 license=(LGPL)
 depends=(flatpak binutils elfutils unzip tar git bzr patch rpmextract cpio 
appstream-glib)
 makedepends=(intltool gobject-introspection git docbook-xsl xmlto libdwarf)
-checkdepends=(python2 valgrind)
+checkdepends=(valgrind)
 replaces=('flatpak<0.9.10')
 _commit=a5df218bae3a019bb398a99dd8a3897b1849218c  # tags/1.0.14^0
 source=("git+https://github.com/flatpak/flatpak-builder#commit=$_commit;

[arch-commits] Commit in flatpak-builder/trunk (PKGBUILD)

2021-06-14 Thread Jan Steffens via arch-commits 
Date: Monday, June 14, 2021 @ 20:25:13
  Author: heftig
Revision: 418244

1.0.14-1

Modified:
  flatpak-builder/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2021-06-14 20:21:00 UTC (rev 418243)
+++ PKGBUILD2021-06-14 20:25:13 UTC (rev 418244)
@@ -1,7 +1,7 @@
-# Maintainer: Jan Alexander Steffens (heftig) 
+# Maintainer: Jan Alexander Steffens (heftig) 
 
 pkgname=flatpak-builder
-pkgver=1.0.12
+pkgver=1.0.14
 pkgrel=1
 pkgdesc="Tool to build flatpaks from source"
 url="https://flatpak.org;
@@ -11,7 +11,7 @@
 makedepends=(intltool gobject-introspection git docbook-xsl xmlto libdwarf)
 checkdepends=(python2 valgrind)
 replaces=('flatpak<0.9.10')
-_commit=2b24480900e7871312b37c358e066c3387494c15  # tags/1.0.12^0
+_commit=a5df218bae3a019bb398a99dd8a3897b1849218c  # tags/1.0.14^0
 source=("git+https://github.com/flatpak/flatpak-builder#commit=$_commit;
 "git+https://gitlab.gnome.org/GNOME/libglnx.git;)
 sha256sums=('SKIP'
@@ -21,7 +21,7 @@
   cd $pkgname
 
   git submodule init
-  git config --local submodule.libglnx.url "$srcdir/libglnx"
+  git submodule set-url libglnx "$srcdir/libglnx"
   git submodule update
 
   # https://github.com/flatpak/flatpak/issues/267

[arch-commits] Commit in flatpak-builder/trunk (PKGBUILD)

2021-05-15 Thread Jan Steffens via arch-commits 
Date: Saturday, May 15, 2021 @ 22:38:10
  Author: heftig
Revision: 415574

1.0.12-1

Modified:
  flatpak-builder/trunk/PKGBUILD

--+
 PKGBUILD |   11 +--
 1 file changed, 5 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2021-05-15 21:55:27 UTC (rev 415573)
+++ PKGBUILD2021-05-15 22:38:10 UTC (rev 415574)
@@ -1,17 +1,17 @@
 # Maintainer: Jan Alexander Steffens (heftig) 
 
 pkgname=flatpak-builder
-pkgver=1.0.11
-pkgrel=2
+pkgver=1.0.12
+pkgrel=1
 pkgdesc="Tool to build flatpaks from source"
 url="https://flatpak.org;
 arch=(x86_64)
-license=(LGPL2.1)
+license=(LGPL)
 depends=(flatpak binutils elfutils unzip tar git bzr patch rpmextract cpio 
appstream-glib)
 makedepends=(intltool gobject-introspection git docbook-xsl xmlto libdwarf)
 checkdepends=(python2 valgrind)
 replaces=('flatpak<0.9.10')
-_commit=c270877985b33ffae189ffd231c9501218db03cc  # tags/1.0.11^0
+_commit=2b24480900e7871312b37c358e066c3387494c15  # tags/1.0.12^0
 source=("git+https://github.com/flatpak/flatpak-builder#commit=$_commit;
 "git+https://gitlab.gnome.org/GNOME/libglnx.git;)
 sha256sums=('SKIP'
@@ -54,8 +54,7 @@
 
 check() {
   cd $pkgname
-  # Xattr tests fail on tmpfs
-  make -k check || :
+  make -k check
 }
 
 package() {

[arch-commits] Commit in flatpak-builder/trunk (PKGBUILD)

2021-05-07 Thread Jelle van der Waa via arch-commits 
Date: Friday, May 7, 2021 @ 18:30:45
  Author: jelle
Revision: 414580

Resign package

Barthalion left as Developer.

Modified:
  flatpak-builder/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2021-05-07 18:05:30 UTC (rev 414579)
+++ PKGBUILD2021-05-07 18:30:45 UTC (rev 414580)
@@ -2,7 +2,7 @@
 
 pkgname=flatpak-builder
 pkgver=1.0.11
-pkgrel=1
+pkgrel=2
 pkgdesc="Tool to build flatpaks from source"
 url="https://flatpak.org;
 arch=(x86_64)