Merge pull request #15 from flathub/gnome-48

yakushabb · web-flow · commit cff838020178 · 2025-12-16T23:32:55.000+03:00
Health: update to org.gnome.Sdk//48
diff --git a/dev.Cogitri.Health.json b/dev.Cogitri.Health.json
@@ -1,11 +1,11 @@
 {
     "app-id": "dev.Cogitri.Health",
     "runtime": "org.gnome.Platform",
-    "runtime-version": "47",
+    "runtime-version": "48",
     "sdk": "org.gnome.Sdk",
     "sdk-extensions": [
         "org.freedesktop.Sdk.Extension.rust-stable",
-        "org.freedesktop.Sdk.Extension.llvm19"
+        "org.freedesktop.Sdk.Extension.llvm20"
     ],
     "command": "dev.Cogitri.Health",
     "finish-args": [
@@ -32,7 +32,7 @@
         "/bin/sassc"
     ],
     "build-options": {
-        "append-path": "/usr/lib/sdk/rust-stable/bin:/usr/lib/sdk/llvm19/bin",
+        "append-path": "/usr/lib/sdk/rust-stable/bin:/usr/lib/sdk/llvm20/bin",
         "env": {
             "CARGO_REGISTRIES_CRATES_IO_PROTOCOL": "sparse",
             "CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_LINKER": "clang",
@@ -53,8 +53,8 @@
             "sources": [
                 {
                     "type": "git",
-                    "url": "https://gitlab.gnome.org/jwestman/blueprint-compiler",
-                    "commit": "2a39a16391122af2f3d812e478c1c1398c98b972"
+                    "url": "https://gitlab.gnome.org/GNOME/blueprint-compiler",
+                    "commit": "04ef0944db56ab01307a29aaa7303df6067cb3c0"
                 }
             ]
         },
@@ -70,6 +70,10 @@
                 {
                     "type": "patch",
                     "path": "fix_appdata.patch"
+                },
+                {
+                    "type": "patch",
+                    "path": "fix_tracker_db_update.patch"
                 }
             ]
         }
diff --git a/fix_tracker_db_update.patch b/fix_tracker_db_update.patch
@@ -0,0 +1,22 @@
+diff --git a/src/core/database.rs b/src/core/database.rs
+index a82b755..f81f6e7 100644
+--- a/src/core/database.rs
++++ b/src/core/database.rs
+@@ -890,7 +890,7 @@ impl Database {
+     /// An error if querying the DB goes wrong.
+     pub async fn update_version(&self) -> Result<()> {
+         let connection = self.imp().connection.get().unwrap();
+-        let resource = tracker::Resource::new(Some("health"));
++        let resource = tracker::Resource::new(Some("health:Version"));
+         resource.set_int64("health:version", DB_VERSION);
+         let v = connection.update_resource(None, &resource, None::<&gio::Cancellable>);
+         if let Err(e) = v {
+@@ -922,7 +922,7 @@ impl Database {
+     /// An error if querying the DB goes wrong.
+     pub async fn create_version(&self) -> Result<()> {
+         let imp = self.imp();
+-        let resource = tracker::Resource::new(Some("health"));
++        let resource = tracker::Resource::new(Some("health:Version"));
+         resource.set_uri("rdf:type", "health:Version");
+         resource.set_int64("health:version", DB_VERSION);
+         let connection = imp.connection.get().unwrap();

Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,11 @@`
`1`	`1`	`{`
`2`	`2`	`"app-id": "dev.Cogitri.Health",`
`3`	`3`	`"runtime": "org.gnome.Platform",`
`4`		`- "runtime-version": "47",`
	`4`	`+ "runtime-version": "48",`
`5`	`5`	`"sdk": "org.gnome.Sdk",`
`6`	`6`	`"sdk-extensions": [`
`7`	`7`	`"org.freedesktop.Sdk.Extension.rust-stable",`
`8`		`- "org.freedesktop.Sdk.Extension.llvm19"`
	`8`	`+ "org.freedesktop.Sdk.Extension.llvm20"`
`9`	`9`	`],`
`10`	`10`	`"command": "dev.Cogitri.Health",`
`11`	`11`	`"finish-args": [`
`@@ -32,7 +32,7 @@`
`32`	`32`	`"/bin/sassc"`
`33`	`33`	`],`
`34`	`34`	`"build-options": {`
`35`		`- "append-path": "/usr/lib/sdk/rust-stable/bin:/usr/lib/sdk/llvm19/bin",`
	`35`	`+ "append-path": "/usr/lib/sdk/rust-stable/bin:/usr/lib/sdk/llvm20/bin",`
`36`	`36`	`"env": {`
`37`	`37`	`"CARGO_REGISTRIES_CRATES_IO_PROTOCOL": "sparse",`
`38`	`38`	`"CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_LINKER": "clang",`
`@@ -53,8 +53,8 @@`
`53`	`53`	`"sources": [`
`54`	`54`	`{`
`55`	`55`	`"type": "git",`
`56`		`- "url": "https://gitlab.gnome.org/jwestman/blueprint-compiler",`
`57`		`- "commit": "2a39a16391122af2f3d812e478c1c1398c98b972"`
	`56`	`+ "url": "https://gitlab.gnome.org/GNOME/blueprint-compiler",`
	`57`	`+ "commit": "04ef0944db56ab01307a29aaa7303df6067cb3c0"`
`58`	`58`	`}`
`59`	`59`	`]`
`60`	`60`	`},`
`@@ -70,6 +70,10 @@`
`70`	`70`	`{`
`71`	`71`	`"type": "patch",`
`72`	`72`	`"path": "fix_appdata.patch"`
	`73`	`+ },`
	`74`	`+ {`
	`75`	`+ "type": "patch",`
	`76`	`+ "path": "fix_tracker_db_update.patch"`
`73`	`77`	`}`
`74`	`78`	`]`
`75`	`79`	`}`