kiss-flatpak

commit 2120793e779138eef385a96a3805e218505447a2
parent 5ab377fb61c9673e870ab70d43a816deb3a50d01
Author: St John Karp <contact@stjo.hn>
Date:   Sat, 18 Jun 2022 16:43:04 -0400

flatpak: Upgrade and fix the build

I fixed some sed invocations that used the -i flag.
None of the patches applied any longer so I've disabled them
for the time being. I added libcap and xdg-dbus-proxy as
dependencies.

Finally I added some configure options in the build
script that were needed, including --with-system-dbus-proxy as
Flatpak's internal dbus-proxy doesn't build. See this bug:
https://github.com/flatpak/xdg-dbus-proxy/issues/36

Diffstat:
M
flatpak/flatpak/build
 | 
21
++++++++++++++-------
M
flatpak/flatpak/checksums
 | 
2
+-
M
flatpak/flatpak/depends
 | 
2
++
M
flatpak/flatpak/sources
 | 
2
+-
M
flatpak/flatpak/version
 | 
2
+-

5 files changed, 19 insertions(+), 10 deletions(-)
diff --git a/flatpak/flatpak/build b/flatpak/flatpak/build
@@ -1,19 +1,24 @@
 #!/bin/sh -e
 
-for patch in *.patch; do
-    patch -p1 < "$patch"
-done
+#for patch in *.patch; do
+#    patch -p1 < "$patch"
+#done
 
 # Remove libcap dependency (used solely when bwrap is suid
 # root). User namespaces are much better, should be used
 # in place of libcap and are free.
-sed -i 's/as_fn_error.*libcap/: "/g'          configure
-sed -i 's/as_fn_error.*capability\.h/: "/g' configure
+sed -e 's/as_fn_error.*libcap/: "/g' \
+	-e 's/as_fn_error.*capability\.h/: "/g' \
+	configure > _
+mv -f _ configure
 
 # Remove fuse2 dependency (used solely with root "system-helper"
 # daemon for file transfer. Unneeded in our case and drops the
 # old fuse version.
-sed -i 's/as_fn_error.*fuse/: "/g' configure
+sed 's/as_fn_error.*fuse/: "/g' configure > _
+mv -f _ configure
+
+chmod +x configure
 
 # Turn the fuse2 filesystem into a C program which does nothing.
 # This is the easiest way to "turn off" revokefs as there's
@@ -58,7 +63,9 @@ export PYTHONPATH
     --disable-sandboxed-triggers \
     --disable-documentation \
     --disable-introspection \
-    --with-priv-mode=none
+    --with-priv-mode=none \
+    --disable-xauth \
+    --with-system-dbus-proxy
 
 make
 make DESTDIR="$1" install
diff --git a/flatpak/flatpak/checksums b/flatpak/flatpak/checksums
@@ -1,4 +1,4 @@
-db152739d072f8ff299e4e888d8963a1b4538da7b10e0b86525be438f2e1dde4
+6db52a531ce278282ac7ebfb99f66a0bb3eccaf44e864844c2c95c1ee5ba9316
 c203ec8783bf771a155b207279b9bccb8dea02d8f0c9e5f8ead507bc3246ecc1
 1f9f2f55965041953ce0ed4e436e181d73f8decc36457a923c6bc42442718da1
 c2e8b0430715aa8d1a43be79d8279e1cd088a925ba6d375b0707aeda3f5408d2
diff --git a/flatpak/flatpak/depends b/flatpak/flatpak/depends
@@ -8,3 +8,5 @@ libsoup
 libxml2
 ostree
 python
+libcap
+xdg-dbus-proxy
diff --git a/flatpak/flatpak/sources b/flatpak/flatpak/sources
@@ -1,4 +1,4 @@
-https://github.com/flatpak/flatpak/releases/download/1.10.2/flatpak-1.10.2.tar.xz
+https://github.com/flatpak/flatpak/releases/download/VERSION/flatpak-VERSION.tar.xz
 https://github.com/pyparsing/pyparsing/releases/download/pyparsing_2.4.7/pyparsing-2.4.7.tar.gz pyparsing
 patches/bubblewrap-musl.patch
 patches/fix-musl.patch
diff --git a/flatpak/flatpak/version b/flatpak/flatpak/version
@@ -1 +1 @@
-1.10.2 1
+1.12.7 1