kiss-flatpak

commit a6ed80c988c43493d1819142df8504e313523ec8
parent d38a45b50f59e50be559f7aaad5989a1e35ea836
Author: St John Karp <contact@stjo.hn>
Date:   Sun,  3 Jul 2022 07:42:26 -0400

flatpak: Re-enable patches in the build script

Uncommented the part of the build script that applies the patches.
Removed the old patches from the sources, removed libcap from
the dependencies, and regenerated the checksums.

Diffstat:
M
flatpak/flatpak/build
 | 
6
+++---
M
flatpak/flatpak/checksums
 | 
6
++----
M
flatpak/flatpak/depends
 | 
3
+--
M
flatpak/flatpak/sources
 | 
2
--

4 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/flatpak/flatpak/build b/flatpak/flatpak/build
@@ -1,8 +1,8 @@
 #!/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
diff --git a/flatpak/flatpak/checksums b/flatpak/flatpak/checksums
@@ -1,6 +1,4 @@
 6db52a531ce278282ac7ebfb99f66a0bb3eccaf44e864844c2c95c1ee5ba9316
 c203ec8783bf771a155b207279b9bccb8dea02d8f0c9e5f8ead507bc3246ecc1
-1f9f2f55965041953ce0ed4e436e181d73f8decc36457a923c6bc42442718da1
-c2e8b0430715aa8d1a43be79d8279e1cd088a925ba6d375b0707aeda3f5408d2
-f3e72d0994f3f2ef678e90c14de652fc44e10bdc0dd2d0d7da7d9bab580aa288
-f5c88cbb5597f70f1bad07f6f50332850e8c37aceb7a3d8e5e735b1ae4a40418
+fe31050a17d24ee394074ee710946ebfe28d4665d32a6bf3fad9a1192e9d8ccd
+33b06b428ccc030bb73104fcec585d86bab26f6b6f05fc05112e26a464293d5d
diff --git a/flatpak/flatpak/depends b/flatpak/flatpak/depends
@@ -1,12 +1,11 @@
 appstream-glib
 gdk-pixbuf
 glib
-gpgme
 gnupg1
+gpgme
 libarchive
 libsoup
 libxml2
 ostree
 python
-libcap
 xdg-dbus-proxy
diff --git a/flatpak/flatpak/sources b/flatpak/flatpak/sources
@@ -1,6 +1,4 @@
 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
 patches/flatpak-alsa.patch
 patches/no-libcap.patch