demo: More fixes to meson-less builds

Author: bilelmoussaoui

demo/client/Cargo.toml

@@ -11,16 +11,16 @@ anyhow = "1.0"
 ashpd = {path = "../../client", version = "0.13", default-features = false, features = ["tokio", "gtk4", "tracing", "pipewire"]}
 async-channel = "2.3"
 chrono = {version = "0.4", default-features = false, features = ["clock"]}
-futures-util = { workspace = true }
+futures-util = "0.3"
 gettext-rs = {version = "0.7", features = ["gettext-system"]}
 gst = {package = "gstreamer", version = "0.24"}
 gst4gtk = {package = "gst-plugin-gtk4", version = "0.14", features = ["wayland", "x11egl", "x11glx", "gtk_v4_14"]}
 gtk = {package = "gtk4", version = "0.10", features = ["v4_14"]}
 gvdb-macros = "0.1"
 rusb = "0.9.4"
-serde = { workspace = true }
+serde = { version = "1.0", features = ["derive"] }
 shumate = {version = "0.7", package = "libshumate"}
-tokio = { workspace = true, features = ["io-util", "net", "time", "rt-multi-thread", "macros"] }
-tracing = { workspace = true }
-tracing-subscriber = { workspace = true, features = ["fmt"] }
+tokio = { version = "1.48", default-features = false, features = ["io-util", "net", "time", "rt-multi-thread", "macros"] }
+tracing = "0.1"
+tracing-subscriber = { version = "0.3", features = ["fmt"] }
 url = {version = "2.3", features = ["serde"]}

demo/client/build-aux/com.belmoussaoui.ashpd.demo.Devel.json

@@ -62,14 +62,16 @@
         {
             "name": "ashpd-demo",
             "buildsystem": "meson",
+            "subdir": "demo/client",
             "run-tests": true,
             "config-opts": [
                 "-Dprofile=development"
             ],
             "sources": [
                 {
-                    "type": "dir",
-                    "path": ".."
+                    "type": "git",
+                    "url": "file://../../..",
+                    "branch": "HEAD"
                 }
             ]
         }

demo/client/build.rs

@@ -1,5 +1,6 @@
 fn main() {
     println!("cargo::rustc-check-cfg=cfg(cargo_build)");
+    println!("cargo::rustc-check-cfg=cfg(workspace_build)");
 
     // Poor man's attempt to check if the current build is started by meson
     let meson_build = std::path::Path::new("src/config.rs").exists();
@@ -8,18 +9,14 @@ fn main() {
         println!("cargo:rustc-cfg=cargo_build");
     }
 
-    let mut gresource_path = "data/resources.gresource.xml";
-
     // Detect if we're building from workspace root
     let manifest_dir = std::env::var("CARGO_MANIFEST_DIR").unwrap();
     if let Some(workspace_root) = std::path::Path::new(&manifest_dir)
         .parent()
         .and_then(|p| p.parent())
+        && workspace_root.join("Cargo.toml").exists()
+        && workspace_root.join("client").exists()
     {
-        if workspace_root.join("Cargo.toml").exists() && workspace_root.join("client").exists() {
-            gresource_path = "demo/client/data/resources.gresource.xml";
-        }
+        println!("cargo:rustc-cfg=workspace_build");
     }
-
-    println!("cargo:rustc-env=GRESOURCE_PATH={}", gresource_path);
 }

demo/client/src/main.rs

@@ -20,9 +20,13 @@ use gvdb_macros::include_gresource_from_xml;
 
 use crate::portals::spawn_tokio_blocking;
 
+#[cfg(workspace_build)]
 static GRESOURCE_BYTES: &[u8] =
     include_gresource_from_xml!("demo/client/data/resources.gresource.xml");
 
+#[cfg(not(workspace_build))]
+static GRESOURCE_BYTES: &[u8] = include_gresource_from_xml!("data/resources.gresource.xml");
+
 fn main() -> glib::ExitCode {
     // Initialize logger, debug is carried out via debug!, info!, and warn!.
     tracing_subscriber::fmt::init();