Fix appstream-util mirror-screenshots

flathub · Dec 16, 2021 · f6aa83d · f6aa83d
1 parent bc75240
commit f6aa83d
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 5 deletions.
diff --git a/0001-do-not-test-exec.patch → build-aux/flatpak/glib-desktopappinfo.patch b/0001-do-not-test-exec.patch → build-aux/flatpak/glib-desktopappinfo.patch
@@ -1,7 +1,7 @@
 # This is only required for flatpak
 # In the sandbox - the programs in the Exec and Try_Exec keys do not exist
 # it's not a problem when launching the app since we use flatpak-spawn
-# but when listing the apps - GLIb will filter them out
+# but when listing the apps - GLib will filter them out
 
 # https://gitlab.com/freedesktop-sdk/freedesktop-sdk/-/blob/master/elements/components/glib.bst
 # https://gitlab.gnome.org/GNOME/gnome-build-meta/-/blob/master/elements/sdk/glib.bst

diff --git a/re.sonny.Junction.json b/re.sonny.Junction.json
@@ -65,12 +65,12 @@
       "sources": [
         {
           "type": "archive",
-          "url": "https://download.gnome.org/sources/glib/2.70/glib-2.70.0.tar.xz",
-          "sha256": "200d7df811c5ba634afbf109f14bb40ba7fde670e89389885da14e27c0840742"
+          "url": "https://download.gnome.org/sources/glib/2.70/glib-2.70.2.tar.xz",
+          "sha256": "0551459c85cd3da3d58ddc9016fd28be5af503f5e1615a71ba5b512ac945806f"
         },
         {
           "type": "patch",
-          "path": "0001-do-not-test-exec.patch"
+          "path": "build-aux/flatpak/glib-desktopappinfo.patch"
         }
       ]
     },
@@ -91,6 +91,32 @@
         }
       ]
     },
+    // I have no idea why but if I bundle GLib without glib-networking / libsoup
+    // appstream-util mirror-screenshots on flathub.org/builds
+    // fails to download screenshots with "Downloading failed: SSL handshake failed"
+    {
+      "name": "glib-networking",
+      "buildsystem": "meson",
+      "sources": [
+        {
+          "type": "archive",
+          "url": "https://download.gnome.org/sources/glib-networking/2.70/glib-networking-2.70.1.tar.xz",
+          "sha256": "2a16bfc2d271ccd3266e3fb462bc8a4103c02e81bbb339aa92d6fb060592d7bc"
+        }
+      ]
+    },
+    // {
+    //   "name": "libsoup",
+    //   "buildsystem": "meson",
+    //   "config-opts": ["-Dvapi=disabled"],
+    //   "sources": [
+    //     {
+    //       "type": "archive",
+    //       "url": "https://download.gnome.org/sources/libsoup/2.74/libsoup-2.74.2.tar.xz",
+    //       "sha256": "f0a427656e5fe19e1df71c107e88dfa1b2e673c25c547b7823b6018b40d01159"
+    //     }
+    //   ]
+    // },
     {
       "name": "Junction",
       "buildsystem": "meson",
@@ -100,7 +126,7 @@
           "type": "git",
           "url": "https://github.com/sonnyp/Junction.git",
           "tag": "v1.3.0",
-          "commit": "ad1efeccf69b63e915ac3aeefd7494fc453803c0"
+          "commit": "fc8eb631adaae1ea7c155c875e079b2c5575209e"
         }
       ],
       "post-install": [