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

mufeedali · rafaelmardojai · commit bb20e6695669 · 2025-01-23T23:36:43.000-05:00
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": "../../."
                 }
             ]
         }

Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,10 @@`
`1`	`1`	`{`
`2`		`- "app-id" : "app.drey.Dialect.Devel",`
`3`		`- "runtime" : "org.gnome.Platform",`
`4`		`- "runtime-version" : "master",`
`5`		`- "sdk" : "org.gnome.Sdk",`
`6`		`- "command" : "dialect",`
`7`		`- "finish-args" : [`
	`2`	`+ "id": "app.drey.Dialect.Devel",`
	`3`	`+ "runtime": "org.gnome.Platform",`
	`4`	`+ "runtime-version": "master",`
	`5`	`+ "sdk": "org.gnome.Sdk",`
	`6`	`+ "command": "dialect",`
	`7`	`+ "finish-args": [`
`8`	`8`	`"--share=network",`
`9`	`9`	`"--share=ipc",`
`10`	`10`	`"--device=dri",`
`@@ -13,10 +13,10 @@`
`13`	`13`	`"--socket=pulseaudio",`
`14`	`14`	`"--own-name=app.drey.Dialect.Devel.SearchProvider"`
`15`	`15`	`],`
`16`		`- "cleanup" : [`
	`16`	`+ "cleanup": [`
`17`	`17`	`"blueprint"`
`18`	`18`	`],`
`19`		`- "modules" : [`
	`19`	`+ "modules": [`
`20`	`20`	`"pypi-dependencies.json",`
`21`	`21`	`{`
`22`	`22`	`"name": "blueprint",`
`@@ -25,31 +25,30 @@`
`25`	`25`	`{`
`26`	`26`	`"type": "git",`
`27`	`27`	`"url": "https://gitlab.gnome.org/jwestman/blueprint-compiler",`
`28`		`- "tag": "v0.10.0",`
`29`		`- "commit": "2a39a16391122af2f3d812e478c1c1398c98b972"`
	`28`	`+ "branch": "main"`
`30`	`29`	`}`
`31`	`30`	`]`
`32`	`31`	`},`
`33`	`32`	`{`
`34`		`- "name" : "libspelling",`
`35`		`- "buildsystem" : "meson",`
`36`		`- "sources" : [`
	`33`	`+ "name": "libspelling",`
	`34`	`+ "buildsystem": "meson",`
	`35`	`+ "sources": [`
`37`	`36`	`{`
`38`		`- "type" : "git",`
`39`		`- "url" : "https://gitlab.gnome.org/GNOME/libspelling.git",`
`40`		`- "branch" : "main"`
	`37`	`+ "type": "git",`
	`38`	`+ "url": "https://gitlab.gnome.org/GNOME/libspelling.git",`
	`39`	`+ "branch": "main"`
`41`	`40`	`}`
`42`	`41`	`]`
`43`	`42`	`},`
`44`	`43`	`{`
`45`		`- "name" : "dialect",`
`46`		`- "buildsystem" : "meson",`
	`44`	`+ "name": "dialect",`
	`45`	`+ "buildsystem": "meson",`
`47`	`46`	`"run-tests": true,`
`48`	`47`	`"config-opts": ["-Dprofile=development"],`
`49`		`- "sources" : [`
	`48`	`+ "sources": [`
`50`	`49`	`{`
`51`		`- "type" : "dir",`
`52`		`- "path" : "../../."`
	`50`	`+ "type": "dir",`
	`51`	`+ "path": "../../."`
`53`	`52`	`}`
`54`	`53`	`]`
`55`	`54`	`}`