Date: Thursday, November 17, 2022 @ 22:19:46
  Author: heftig
Revision: 462128

1.15.1-1

Modified:
  flatpak/trunk/PKGBUILD
  flatpak/trunk/fusermount3.diff

------------------+
 PKGBUILD         |   12 ++++--------
 fusermount3.diff |    2 +-
 2 files changed, 5 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2022-11-17 20:32:14 UTC (rev 462127)
+++ PKGBUILD    2022-11-17 22:19:46 UTC (rev 462128)
@@ -4,8 +4,8 @@
 
 pkgbase=flatpak
 pkgname=(flatpak flatpak-docs)
-pkgver=1.15.0
-pkgrel=2
+pkgver=1.15.1
+pkgrel=1
 epoch=1
 pkgdesc="Linux application sandboxing and distribution framework (formerly 
xdg-app)"
 url="https://flatpak.org";
@@ -17,7 +17,7 @@
              python-pyparsing meson)
 checkdepends=(valgrind socat)
 options=(debug)
-_commit=e084a4f14befc27d08094baba8cc8f714d7e417d  # tags/1.15.0^0
+_commit=47ea3934c0e055605b8dff93edad2136141e48ec  # tags/1.15.1^0
 source=(
   "git+https://github.com/flatpak/flatpak#commit=$_commit";
   git+https://gitlab.gnome.org/GNOME/libglnx.git
@@ -34,7 +34,7 @@
             'SKIP'
             'SKIP'
             '3371dd250e61d9e1633630073fefda153cd4426f72f4afa0c3373ae2e8fea03a'
-            '23e01650d60222082ffb67a16d3ea033192cc9e6932027cf0ea0c55ea17863af'
+            '023c2bb5f355095e87357e625ef85119b5e15b3d0a4ad07ce858ed1a8f99a57a'
             '1824cb4eb1cc88702cb2b9f1c55b6dfdf20fca5eab83f6e8e532099281328745')
 
 pkgver() {
@@ -45,10 +45,6 @@
 prepare() {
   cd flatpak
 
-  # Fix meson build
-  # https://github.com/flatpak/flatpak/pull/5165
-  git cherry-pick -n d83b262dedcd51a0443d6d9d13e3a242d15b4d59
-
   # Support fuse3
   # https://bugs.archlinux.org/task/75623
   git apply -3 ../fusermount3.diff

Modified: fusermount3.diff
===================================================================
--- fusermount3.diff    2022-11-17 20:32:14 UTC (rev 462127)
+++ fusermount3.diff    2022-11-17 22:19:46 UTC (rev 462128)
@@ -1,5 +1,5 @@
 diff --git i/common/flatpak-dir.c w/common/flatpak-dir.c
-index ca64902c..22302406 100644
+index 01362a2b..2b17c6f8 100644
 --- i/common/flatpak-dir.c
 +++ w/common/flatpak-dir.c
 @@ -2109,7 +2109,7 @@ flatpak_dir_revokefs_fuse_unmount (OstreeRepo **repo,

Reply via email to