v1.7 (#6)

flathub · May 14, 2023 · 3fb4b69 · 3fb4b69
1 parent 0004fd1
commit 3fb4b69
Show file tree

Hide file tree

Showing 2 changed files with 161 additions and 17 deletions.
diff --git a/build-aux/flatpak/glib-desktopappinfo.patch b/build-aux/flatpak/glib-desktopappinfo.patch
@@ -7,19 +7,21 @@
 # https://gitlab.gnome.org/GNOME/gnome-build-meta/-/blob/master/elements/sdk/glib.bst
 
 diff --git a/gio/gdesktopappinfo.c b/gio/gdesktopappinfo.c
-index 60d6deb..b6e4e7b 100644
+index 30fcb2937..05b6958d5 100644
 --- a/gio/gdesktopappinfo.c
 +++ b/gio/gdesktopappinfo.c
-@@ -1851,51 +1851,11 @@ g_desktop_app_info_load_from_keyfile (GDesktopAppInfo *info,
+@@ -1910,56 +1910,11 @@ g_desktop_app_info_load_from_keyfile (GDesktopAppInfo *info,
                                      G_KEY_FILE_DESKTOP_GROUP,
                                      G_KEY_FILE_DESKTOP_KEY_TRY_EXEC,
                                      NULL);
 -  if (try_exec && try_exec[0] != '\0')
 -    {
 -      char *t;
--      t = g_find_program_in_path (try_exec);
+-      /* Use the desktop file path (if any) as working dir to search program */
+-      t = GLIB_PRIVATE_CALL (g_find_program_for_path) (try_exec, NULL, path);
 -      if (t == NULL)
 -        {
+-          g_free (path);
 -          g_free (try_exec);
 -          return FALSE;
 -        }
@@ -36,6 +38,7 @@ index 60d6deb..b6e4e7b 100644
 -      char **argv;
 -      if (!g_shell_parse_argv (exec, &argc, &argv, NULL))
 -        {
+-          g_free (path);
 -          g_free (exec);
 -          g_free (try_exec);
 -          return FALSE;
@@ -47,11 +50,13 @@ index 60d6deb..b6e4e7b 100644
 -          /* Since @exec is not an empty string, there must be at least one
 -           * argument, so dereferencing argv[0] should return non-NULL. */
 -          g_assert (argc > 0);
--          t = g_find_program_in_path (argv[0]);
+-          /* Use the desktop file path (if any) as working dir to search program */
+-          t = GLIB_PRIVATE_CALL (g_find_program_for_path) (argv[0], NULL, path);
 -          g_strfreev (argv);
 -
 -          if (t == NULL)
 -            {
+-              g_free (path);
 -              g_free (exec);
 -              g_free (try_exec);
 -              return FALSE;

diff --git a/re.sonny.Junction.json b/re.sonny.Junction.json
@@ -1,7 +1,7 @@
 {
-  "app-id": "re.sonny.Junction",
+  "id": "re.sonny.Junction",
   "runtime": "org.gnome.Platform",
-  "runtime-version": "43",
+  "runtime-version": "44",
   "sdk": "org.gnome.Sdk",
   "command": "re.sonny.Junction",
   "finish-args": [
@@ -17,6 +17,18 @@
     "--filesystem=/var/lib/flatpak:ro",
     "--filesystem=/var/lib/snapd/desktop:ro"
   ],
+  "cleanup": [
+    "/include",
+    "/lib/pkgconfig",
+    "/man",
+    "/share/doc",
+    "/share/gtk-doc",
+    "/share/man",
+    "/share/pkgconfig",
+    "/share/installed-tests",
+    "*.la",
+    "*.a"
+  ],
   "modules": [
     {
       "name": "blueprint",
@@ -26,20 +38,23 @@
         {
           "type": "git",
           "url": "https://gitlab.gnome.org/jwestman/blueprint-compiler.git",
-          "tag": "v0.4.0",
-          "commit": "75a6d95988736ec0471d22ceb07579c0cedac2ad"
+          "tag": "v0.8.0",
+          "commit": "36546e48463d52a252acacd462917e16992f3ac9"
         }
       ]
     },
     {
       "name": "glib",
       "buildsystem": "meson",
-      "config-opts": ["-Dselinux=disabled", "-Dtests=false"],
+      "config-opts": [
+        "-Dselinux=disabled",
+        "-Dtests=false"
+      ],
       "sources": [
         {
           "type": "archive",
-          "url": "https://download.gnome.org/sources/glib/2.74/glib-2.74.0.tar.xz",
-          "sha256": "3652c7f072d7b031a6b5edd623f77ebc5dcd2ae698598abcc89ff39ca75add30"
+          "url": "https://download.gnome.org/sources/glib/2.76/glib-2.76.0.tar.xz",
+          "sha256": "525bb703b807142e1aee5ccf222c344e8064b21c0c45677ef594e587874c6797"
         },
         {
           "type": "patch",
@@ -53,15 +68,19 @@
       "sources": [
         {
           "type": "archive",
-          "url": "https://download.gnome.org/sources/glib-networking/2.74/glib-networking-2.74.0.tar.xz",
-          "sha256": "1f185aaef094123f8e25d8fa55661b3fd71020163a0174adb35a37685cda613b"
+          "url": "https://download.gnome.org/sources/glib-networking/2.76/glib-networking-2.76.0.tar.xz",
+          "sha256": "149a05a179e629a538be25662aa324b499d7c4549c5151db5373e780a1bf1b9a"
         }
       ]
     },
     {
       "name": "libportal",
       "buildsystem": "meson",
-      "config-opts": ["-Ddocs=false", "-Dvapi=false", "-Dbackends=gtk4"],
+      "config-opts": [
+        "-Ddocs=false",
+        "-Dvapi=false",
+        "-Dbackends=gtk4"
+      ],
       "sources": [
         {
           "type": "archive",
@@ -70,17 +89,137 @@
         }
       ]
     },
+    {
+      "name": "libadwaita",
+      "buildsystem": "meson",
+      "config-opts": [
+        "-Dintrospection=enabled",
+        "-Dvapi=false",
+        "-Dtests=false",
+        "-Dexamples=false"
+      ],
+      "sources": [
+        {
+          "type": "git",
+          "url": "https://gitlab.gnome.org/GNOME/libadwaita.git",
+          "commit": "421c3cc35bb50fe4ea40b7fb3bce894f7cae7cff"
+        }
+      ],
+      "modules": [
+        {
+          "name": "appstream",
+          "buildsystem": "meson",
+          "config-opts": [
+            "-Dstemming=false",
+            "-Dgir=false",
+            "-Ddocs=false"
+          ],
+          "cleanup": [
+            "/bin/*",
+            "/etc/*",
+            "/share/metainfo"
+          ],
+          "sources": [
+            {
+              "type": "git",
+              "url": "https://github.com/ximion/appstream.git",
+              "commit": "e4a7daefca9dcd600eea895332b8ba598cacd694"
+            }
+          ],
+          "modules": [
+            {
+              "name": "libyaml",
+              "sources": [
+                {
+                  "type": "git",
+                  "url": "https://github.com/yaml/libyaml.git",
+                  "commit": "2c891fc7a770e8ba2fec34fc6b545c672beb37e6"
+                }
+              ]
+            },
+            {
+              "name": "libxmlb",
+              "buildsystem": "meson",
+              "config-opts": [
+                "-Dintrospection=false",
+                "-Dgtkdoc=false",
+                "-Dstemmer=false",
+                "-Dcli=false",
+                "-Dtests=false"
+              ],
+              "sources": [
+                {
+                  "type": "git",
+                  "url": "https://github.com/hughsie/libxmlb.git",
+                  "commit": "a6cac6a715d57c393bbddee4d0381ad943341af9"
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "name": "libsass",
+          "buildsystem": "meson",
+          "cleanup": [
+            "*"
+          ],
+          "sources": [
+            {
+              "type": "git",
+              "url": "https://github.com/lazka/libsass.git",
+              "commit": "302397c0c8ae2d7ab02f45ea461c2c3d768f248e"
+            }
+          ]
+        },
+        {
+          "name": "sassc",
+          "buildsystem": "meson",
+          "cleanup": [
+            "*"
+          ],
+          "sources": [
+            {
+              "type": "git",
+              "url": "https://github.com/lazka/sassc.git",
+              "commit": "82803377c33247265d779af034eceb5949e78354"
+            }
+          ]
+        },
+        {
+          "name": "gtk",
+          "buildsystem": "meson",
+          "config-opts": [
+            "-Dintrospection=disabled",
+            "-Ddemos=false",
+            "-Dbuild-testsuite=false",
+            "-Dbuild-examples=false",
+            "-Dbuild-tests=false"
+          ],
+          "cleanup": [
+            "/bin/*"
+          ],
+          "sources": [
+            {
+              "type": "archive",
+              "url": "https://download.gnome.org/sources/gtk/4.11/gtk-4.11.2.tar.xz",
+              "sha256": "4a481da6b65b6add3f59966b0bb27e8139c381d0699402df662df2ce1c9e6913"
+            }
+          ]
+        }
+      ]
+    },
     {
       "name": "Junction",
       "buildsystem": "meson",
+      "builddir": true,
       "sources": [
         {
           "type": "git",
           "url": "https://github.com/sonnyp/Junction.git",
-          "tag": "v1.6",
-          "commit": "c9da76cae9f8e26957266a4171e7e0212dc63ef5"
+          "tag": "v1.7",
+          "commit": "d4b34d731a6b561e01e2976b4d97337b1c99eefd"
         }
       ]
     }
   ]
-}
+}