fix(flatpak): Update blueprint and add libspelling to non-devel manifest

dialect-app · Jan 24, 2025 · bb20e66 · bb20e66
1 parent 1bed71a
commit bb20e66
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 36 deletions.
diff --git a/build-aux/flatpak/app.drey.Dialect.Devel.json b/build-aux/flatpak/app.drey.Dialect.Devel.json
@@ -1,10 +1,10 @@
 {
-    "app-id" : "app.drey.Dialect.Devel",
-    "runtime" : "org.gnome.Platform",
-    "runtime-version" : "master",
-    "sdk" : "org.gnome.Sdk",
-    "command" : "dialect",
-    "finish-args" : [
+    "id": "app.drey.Dialect.Devel",
+    "runtime": "org.gnome.Platform",
+    "runtime-version": "master",
+    "sdk": "org.gnome.Sdk",
+    "command": "dialect",
+    "finish-args": [
         "--share=network",
         "--share=ipc",
         "--device=dri",
@@ -13,10 +13,10 @@
         "--socket=pulseaudio",
         "--own-name=app.drey.Dialect.Devel.SearchProvider"
     ],
-    "cleanup" : [
+    "cleanup": [
         "*blueprint*"
     ],
-    "modules" : [
+    "modules": [
         "pypi-dependencies.json",
         {
             "name": "blueprint",
@@ -25,31 +25,30 @@
                 {
                     "type": "git",
                     "url": "https://gitlab.gnome.org/jwestman/blueprint-compiler",
-                    "tag": "v0.10.0",
-                    "commit": "2a39a16391122af2f3d812e478c1c1398c98b972"
+                    "branch": "main"
                 }
             ]
         },
         {
-            "name" : "libspelling",
-            "buildsystem" : "meson",
-            "sources" : [
+            "name": "libspelling",
+            "buildsystem": "meson",
+            "sources": [
                 {
-                    "type" : "git",
-                    "url" : "https://gitlab.gnome.org/GNOME/libspelling.git",
-                    "branch" : "main"
+                    "type": "git",
+                    "url": "https://gitlab.gnome.org/GNOME/libspelling.git",
+                    "branch": "main"
                 }
             ]
         },
         {
-            "name" : "dialect",
-            "buildsystem" : "meson",
+            "name": "dialect",
+            "buildsystem": "meson",
             "run-tests": true,
             "config-opts": ["-Dprofile=development"],
-            "sources" : [
+            "sources": [
                 {
-                    "type" : "dir",
-                    "path" : "../../."
+                    "type": "dir",
+                    "path": "../../."
                 }
             ]
         }

diff --git a/build-aux/flatpak/app.drey.Dialect.json b/build-aux/flatpak/app.drey.Dialect.json
@@ -1,18 +1,18 @@
 {
-    "app-id" : "app.drey.Dialect",
-    "runtime" : "org.gnome.Platform",
-    "runtime-version" : "47",
-    "sdk" : "org.gnome.Sdk",
-    "command" : "dialect",
-    "finish-args" : [
+    "id": "app.drey.Dialect",
+    "runtime": "org.gnome.Platform",
+    "runtime-version": "47",
+    "sdk": "org.gnome.Sdk",
+    "command": "dialect",
+    "finish-args": [
         "--share=network",
         "--share=ipc",
         "--device=dri",
         "--socket=fallback-x11",
         "--socket=wayland",
         "--socket=pulseaudio"
     ],
-    "modules" : [
+    "modules": [
         "pypi-dependencies.json",
         {
             "name": "blueprint",
@@ -24,19 +24,31 @@
                 {
                     "type": "git",
                     "url": "https://gitlab.gnome.org/jwestman/blueprint-compiler",
-                    "tag": "v0.10.0",
-                    "commit": "2a39a16391122af2f3d812e478c1c1398c98b972"
+                    "tag": "v0.16.0",
+                    "commit": "04ef0944db56ab01307a29aaa7303df6067cb3c0"
                 }
             ]
         },
         {
-            "name" : "dialect",
-            "builddir" : true,
-            "buildsystem" : "meson",
-            "sources" : [
+            "name": "libspelling",
+            "buildsystem": "meson",
+            "sources": [
+                {
+                    "type": "git",
+                    "url": "https://gitlab.gnome.org/GNOME/libspelling.git",
+                    "tag": "0.4.5",
+                    "commit": "ab64511edd5cf53c8a81a51e2883d6f69e585f64"
+                }
+            ]
+        },
+        {
+            "name": "dialect",
+            "builddir": true,
+            "buildsystem": "meson",
+            "sources": [
                 {
-                    "type" : "dir",
-                    "path" : "../../."
+                    "type": "dir",
+                    "path": "../../."
                 }
             ]
         }