Disable compressed downloads in flatpak-builder

Revert to the old behaviour, disable-http-decompression will not do anything in the manifest. The property is still kept to prevent warnings
flathub · Sep 19, 2024 · 927977b · 927977b
1 parent f359641
commit 927977b
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/org.flatpak.Builder.json b/org.flatpak.Builder.json
@@ -134,7 +134,8 @@
                     "type": "patch",
                     "paths": [
                         "patches/flatpak-builder-lfs.patch",
-                        "patches/flatpak-builder-appstream-cli-urls.patch"
+                        "patches/flatpak-builder-appstream-cli-urls.patch",
+                        "patches/flatpak-builder-disable-compressed-downloads.patch"
                     ]
                 }
             ]

diff --git a/patches/flatpak-builder-disable-compressed-downloads.patch b/patches/flatpak-builder-disable-compressed-downloads.patch
@@ -0,0 +1,14 @@
+diff --git a/src/builder-utils.c b/src/builder-utils.c
+index 7c838170..55c4ab62 100644
+--- a/src/builder-utils.c
++++ b/src/builder-utils.c
+@@ -1114,9 +1114,6 @@ builder_download_uri_buffer (GUri           *uri,
+   curl_easy_setopt (session, CURLOPT_WRITEDATA, &write_data);
+   curl_easy_setopt (session, CURLOPT_ERRORBUFFER, error_buffer);
+
+-  if (!disable_http_decompression)
+-    curl_easy_setopt (session, CURLOPT_ACCEPT_ENCODING, "");
+-
+   write_data.out = out;
+   write_data.checksums = checksums;
+   write_data.n_checksums = n_checksums;