Merge pull request #56 from cgueret/55-update-to-gnome-49

cgueret · web-flow · commit 0efa3e6ecdfb · 2025-09-26T08:09:25.000+01:00
Update dependencies for Gnome, meson, lxml and pyyaml
diff --git a/io.github.cgueret.Scriptorium.json b/io.github.cgueret.Scriptorium.json
@@ -1,7 +1,7 @@
 {
 	"id": "io.github.cgueret.Scriptorium",
 	"runtime": "org.gnome.Platform",
-	"runtime-version": "48",
+	"runtime-version": "49",
 	"sdk": "org.gnome.Sdk",
 	"sdk-extensions": [
 	 "org.freedesktop.Sdk.Extension.openjdk21"
@@ -35,7 +35,12 @@
 				{
 					"type": "git",
 					"url": "https://gitlab.gnome.org/GNOME/blueprint-compiler",
-					"tag": "v0.16.0"
+					"tag": "v0.18.0",
+					"commit": "07c9c9df9cd1b6b4454ecba21ee58211e9144a4b",
+					"x-checker-data": {
+						"type": "git",
+						"tag-pattern": "^v([\\d.]+)$"
+					}
 				}
 			]
 		},
@@ -80,6 +85,7 @@
 				}
 			]
 		},
+		"python3-lxml.json",
 		"python3-EbookLib.json",
 		"python3-beautifulsoup4.json",
 		"python3-pyyaml.json",
diff --git a/python3-EbookLib.json b/python3-EbookLib.json
@@ -9,11 +9,6 @@
             "type": "file",
             "url": "https://files.pythonhosted.org/packages/66/59/e63fd0b3410d2ab7a8971b070f40390f1fbeb3c7a85849718c8480313cbf/ebooklib-0.19-py3-none-any.whl",
             "sha256": "a790e280e1d5ef105e350e34cc88b83c9c987fa6bab8a63a7543410c313cfa31"
-        },
-        {
-            "type": "file",
-            "url": "https://files.pythonhosted.org/packages/c5/ed/60eb6fa2923602fba988d9ca7c5cdbd7cf25faa795162ed538b527a35411/lxml-6.0.0.tar.gz",
-            "sha256": "032e65120339d44cdc3efc326c9f660f5f7205f3a535c1fdbf898b29ea01fb72"
         }
     ]
 }
diff --git a/python3-lxml.json b/python3-lxml.json
@@ -0,0 +1,18 @@
+{
+    "name": "python3-lxml",
+    "buildsystem": "simple",
+    "build-commands": [
+        "pip3 install --verbose --exists-action=i --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} \"lxml\" --ignore-installed --no-build-isolation"
+    ],
+    "sources": [
+        {
+            "type": "file",
+            "url": "https://files.pythonhosted.org/packages/aa/88/262177de60548e5a2bfc46ad28232c9e9cbde697bd94132aeb80364675cb/lxml-6.0.2.tar.gz",
+            "sha256": "cd79f3367bd74b317dda655dc8fcfa304d9eb6e4fb06b7168c5cf27f96e0cd62",
+            "x-checker-data": {
+                "type": "pypi",
+                "name": "lxml"
+            }
+        }
+    ]
+}
diff --git a/python3-pyyaml.json b/python3-pyyaml.json
@@ -7,8 +7,12 @@
     "sources": [
         {
             "type": "file",
-            "url": "https://files.pythonhosted.org/packages/54/ed/79a089b6be93607fa5cdaedf301d7dfb23af5f25c398d5ead2525b063e17/pyyaml-6.0.2.tar.gz",
-            "sha256": "d584d9ec91ad65861cc08d42e834324ef890a082e591037abe114850ff7bbc3e"
+            "url": "https://files.pythonhosted.org/packages/05/8e/961c0007c59b8dd7729d542c61a4d537767a59645b82a0b521206e1e25c2/pyyaml-6.0.3.tar.gz",
+            "sha256": "d76623373421df22fb4cf8817020cbb7ef15c725b9d5e45f17e189bfc384190f",
+            "x-checker-data": {
+                "type": "pypi",
+                "name": "pyyaml"
+            }
         }
     ]
 }

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"id": "io.github.cgueret.Scriptorium",`
`3`	`3`	`"runtime": "org.gnome.Platform",`
`4`		`- "runtime-version": "48",`
	`4`	`+ "runtime-version": "49",`
`5`	`5`	`"sdk": "org.gnome.Sdk",`
`6`	`6`	`"sdk-extensions": [`
`7`	`7`	`"org.freedesktop.Sdk.Extension.openjdk21"`
`@@ -35,7 +35,12 @@`
`35`	`35`	`{`
`36`	`36`	`"type": "git",`
`37`	`37`	`"url": "https://gitlab.gnome.org/GNOME/blueprint-compiler",`
`38`		`- "tag": "v0.16.0"`
	`38`	`+ "tag": "v0.18.0",`
	`39`	`+ "commit": "07c9c9df9cd1b6b4454ecba21ee58211e9144a4b",`
	`40`	`+ "x-checker-data": {`
	`41`	`+ "type": "git",`
	`42`	`+ "tag-pattern": "^v([\\d.]+)$"`
	`43`	`+ }`
`39`	`44`	`}`
`40`	`45`	`]`
`41`	`46`	`},`
`@@ -80,6 +85,7 @@`
`80`	`85`	`}`
`81`	`86`	`]`
`82`	`87`	`},`
	`88`	`+ "python3-lxml.json",`
`83`	`89`	`"python3-EbookLib.json",`
`84`	`90`	`"python3-beautifulsoup4.json",`
`85`	`91`	`"python3-pyyaml.json",`
Original file line number	Diff line number	Diff line change
`@@ -9,11 +9,6 @@`
`9`	`9`	`"type": "file",`
`10`	`10`	`"url": "https://files.pythonhosted.org/packages/66/59/e63fd0b3410d2ab7a8971b070f40390f1fbeb3c7a85849718c8480313cbf/ebooklib-0.19-py3-none-any.whl",`
`11`	`11`	`"sha256": "a790e280e1d5ef105e350e34cc88b83c9c987fa6bab8a63a7543410c313cfa31"`
`12`		`- },`
`13`		`- {`
`14`		`- "type": "file",`
`15`		`- "url": "https://files.pythonhosted.org/packages/c5/ed/60eb6fa2923602fba988d9ca7c5cdbd7cf25faa795162ed538b527a35411/lxml-6.0.0.tar.gz",`
`16`		`- "sha256": "032e65120339d44cdc3efc326c9f660f5f7205f3a535c1fdbf898b29ea01fb72"`
`17`	`12`	`}`
`18`	`13`	`]`
`19`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,12 @@`
`7`	`7`	`"sources": [`
`8`	`8`	`{`
`9`	`9`	`"type": "file",`
`10`		`- "url": "https://files.pythonhosted.org/packages/54/ed/79a089b6be93607fa5cdaedf301d7dfb23af5f25c398d5ead2525b063e17/pyyaml-6.0.2.tar.gz",`
`11`		`- "sha256": "d584d9ec91ad65861cc08d42e834324ef890a082e591037abe114850ff7bbc3e"`
	`10`	`+ "url": "https://files.pythonhosted.org/packages/05/8e/961c0007c59b8dd7729d542c61a4d537767a59645b82a0b521206e1e25c2/pyyaml-6.0.3.tar.gz",`
	`11`	`+ "sha256": "d76623373421df22fb4cf8817020cbb7ef15c725b9d5e45f17e189bfc384190f",`
	`12`	`+ "x-checker-data": {`
	`13`	`+ "type": "pypi",`
	`14`	`+ "name": "pyyaml"`
	`15`	`+ }`
`12`	`16`	`}`
`13`	`17`	`]`
`14`	`18`	`}`