flatpak-builder: tell appstream compose to canonicalize URL

Signed-off-by: Hubert Figuière <[email protected]>
flathub · Feb 8, 2024 · ade9a1f · ade9a1f
1 parent d7cfe44
commit ade9a1f
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/org.flatpak.Builder.json b/org.flatpak.Builder.json
@@ -385,13 +385,15 @@
                     "name": "appstream",
                     "buildsystem": "meson",
                     "config-opts": [
+                        "-Dapidocs=false",
+                        "-Dgir=false",
                         "-Dcompose=true"
                     ],
                     "sources": [
                         {
                             "type": "archive",
-                            "url": "https://github.com/ximion/appstream/archive/refs/tags/v0.16.3.tar.gz",
-                            "sha256": "4470a27474dc3cc4938552fbf0394b6a65d8a2055d4f4418df086d65d8f2ba29"
+                            "url": "https://github.com/ximion/appstream/archive/refs/tags/v1.0.1.tar.gz",
+                            "sha256": "3a6877c887627aed515e9802f63ac7bd83fffab4c2cad33c809c692c4bd8da48"
                         }
                     ],
                     "modules": [
@@ -499,7 +501,8 @@
                 {
                     "type": "patch",
                     "paths": [
-                        "patches/flatpak-builder-lfs.patch"
+                        "patches/flatpak-builder-lfs.patch",
+                        "patches/flatpak-builder-appstream-cli-urls.patch"
                     ]
                 }
             ]

diff --git a/patches/flatpak-builder-appstream-cli-urls.patch b/patches/flatpak-builder-appstream-cli-urls.patch
@@ -0,0 +1,12 @@
+diff --git a/src/builder-manifest.c b/src/builder-manifest.c
+index fa2fb6e2..84e54bbd 100644
+--- a/src/builder-manifest.c
++++ b/src/builder-manifest.c
+@@ -3033,6 +3033,7 @@ builder_manifest_cleanup (BuilderManifest *self,
+               g_print ("Running appstreamcli compose\n");
+               g_print ("Saving screenshots in %s\n", flatpak_file_get_path_cached (media_dir));
+               if (!appstreamcli_compose (error,
++                                         "--no-partial-urls",
+                                          "--prefix=/",
+                                          origin,
+                                          arg_base_url,