kiss-flatpak

commit a619adf021483ef2a880136494b2ac2d1c18919e
parent b3b47ad3e5de78da6d6bb7e6bf4474732bef3a1d
Author: St John Karp <contact@stjo.hn>
Date:   Thu, 14 Jul 2022 03:49:35 -0400

flatpak: Upgrade from 1.12.7 to 1.13.3 (pre-release)

The 1.13 pre-release series has a lot of promising changes that
have made Flatpak a lot easier to package. It supports curl as
an HTTP backend instead of libsoup, so that's one package we can
remove. It incorporates a fix for the following bug so we don't
have to package xdg-dbus-proxy separately:
https://github.com/flatpak/xdg-dbus-proxy/issues/36

It also replaces appstream-glib with appstream.

This upgrade contains a custom patch to remove HTTP2 support because
KISS curl is built without it. In ostree this is done in the build
configuration but Flatpak doesn't support that.

Diffstat:
M
flatpak/flatpak/build
 | 
2
+-
M
flatpak/flatpak/checksums
 | 
3
++-
M
flatpak/flatpak/depends
 | 
5
++---
A
flatpak/flatpak/patches/no-http2.patch
 | 
17
+++++++++++++++++
M
flatpak/flatpak/sources
 | 
1
+
M
flatpak/flatpak/version
 | 
2
+-

6 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/flatpak/flatpak/build b/flatpak/flatpak/build
@@ -65,7 +65,7 @@ export PYTHONPATH
     --disable-introspection \
     --with-priv-mode=none \
     --disable-xauth \
-    --with-system-dbus-proxy
+    --without-system-dbus-proxy
 
 make
 make DESTDIR="$1" install
diff --git a/flatpak/flatpak/checksums b/flatpak/flatpak/checksums
@@ -1,4 +1,5 @@
-6db52a531ce278282ac7ebfb99f66a0bb3eccaf44e864844c2c95c1ee5ba9316
+f696a4f6587f72a03c2770352f610938d073798a9e3fc6df6aff463509dbf804
 c203ec8783bf771a155b207279b9bccb8dea02d8f0c9e5f8ead507bc3246ecc1
 fe31050a17d24ee394074ee710946ebfe28d4665d32a6bf3fad9a1192e9d8ccd
+17f89b5137af0326c77fb9df91cb6172e4f04feeedfe77dc09f14b824d8ec4e8
 33b06b428ccc030bb73104fcec585d86bab26f6b6f05fc05112e26a464293d5d
diff --git a/flatpak/flatpak/depends b/flatpak/flatpak/depends
@@ -1,11 +1,10 @@
-appstream-glib
+appstream
+curl
 gdk-pixbuf
 glib
 gnupg1
 gpgme
 libarchive
-libsoup
 libxml2
 ostree
 python
-xdg-dbus-proxy
diff --git a/flatpak/flatpak/patches/no-http2.patch b/flatpak/flatpak/patches/no-http2.patch
@@ -0,0 +1,17 @@
+diff --git a/common/flatpak-utils-http.c b/common/flatpak-utils-http.c
+index 8bf2e70..3aa9b08 100644
+--- a/common/flatpak-utils-http.c
++++ b/common/flatpak-utils-http.c
+@@ -384,10 +384,10 @@ flatpak_create_http_session (const char *user_agent)
+    * there are numerous HTTP/2 fixes since the original version in
+    * libcurl 7.43.0.
+    */
+-#if CURL_AT_LEAST_VERSION(7, 51, 0)
++/*#if CURL_AT_LEAST_VERSION(7, 51, 0)
+   rc = curl_easy_setopt (curl, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_2_0);
+   g_assert_cmpint (rc, ==, CURLM_OK);
+-#endif
++#endif*/
+   /* https://github.com/curl/curl/blob/curl-7_53_0/docs/examples/http2-download.c */
+ #if (CURLPIPE_MULTIPLEX > 0)
+   /* wait for pipe connection to confirm */
diff --git a/flatpak/flatpak/sources b/flatpak/flatpak/sources
@@ -1,4 +1,5 @@
 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/flatpak-alsa.patch
+patches/no-http2.patch
 patches/no-libcap.patch
diff --git a/flatpak/flatpak/version b/flatpak/flatpak/version
@@ -1 +1 @@
-1.12.7 1
+1.13.3 1