Make async-std/tokio/futures-lite optional

Author: haecker-felix

Cargo.toml

@@ -28,9 +28,9 @@ targets = [
 ]
 
 [features]
-default = ["rwh_06", "x11", "async-std"]
-async-std = ["ashpd/async-std"]
-tokio = ["ashpd/tokio"]
+default = [ "rwh_06", "x11" ]
+async-std = ["dep:ashpd", "dep:futures-lite", "dep:async-compat", "ashpd/async-std"]
+tokio = ["dep:ashpd", "dep:futures-lite", "dep:async-compat", "ashpd/tokio"]
 serde = ["dep:serde", "dpi/serde"]
 rwh_04 = ["dep:rwh_04"]
 rwh_05 = ["dep:rwh_05"]
@@ -159,6 +159,6 @@ gdkwayland-sys = "0.18.0"
 x11-dl = { version = "2.21", optional = true }
 parking_lot = "0.12"
 dlopen2 = "0.8.0"
-ashpd = { version = "0.12", features = ["async-std"], default-features = false }
-futures-lite = "2.6"
-async-compat = "0.2"
+ashpd = { version = "0.12", default-features = false, optional = true }
+futures-lite = { version = "2.6", optional = true }
+async-compat = { version = "0.2", optional = true }

src/platform_impl/linux/event_loop.rs

@@ -285,12 +285,15 @@ impl<T: 'static> EventLoop<T> {
     let is_wayland = window_target.is_wayland();
 
     // Receive portal events
-    let tx_requests_clone = window_target.window_requests_tx.clone();
-    glib::spawn_future_local(async move {
-      if let Err(e) = super::portal::receive_theme_changed(tx_requests_clone).await {
-        log::debug!("Unable to receive theme changed events: {e}");
-      }
-    });
+    #[cfg(any(feature = "tokio", feature = "async-std"))]
+    {
+      let tx_requests_clone = window_target.window_requests_tx.clone();
+      glib::spawn_future_local(async move {
+        if let Err(e) = super::portal::receive_theme_changed(tx_requests_clone).await {
+          log::debug!("Unable to receive theme changed events: {e}");
+        }
+      });
+    }
 
     // Window Request
     window_requests_rx.attach(Some(&context), move |(id, request)| {

src/platform_impl/linux/mod.rs

@@ -9,6 +9,7 @@ mod icon;
 mod keyboard;
 mod keycode;
 mod monitor;
+#[cfg(any(feature = "tokio", feature = "async-std"))]
 mod portal;
 mod util;
 mod window;

src/platform_impl/linux/window.rs

@@ -194,15 +194,24 @@ impl Window {
     }
 
     // Set initial `preferred_theme` value to current portal color-scheme
-    let ctx = glib::MainContext::default();
-    let portal_theme = ctx.block_on(async { super::portal::theme().await });
-    let preferred_theme = if let Ok(theme) = portal_theme {
-      if let Some(settings) = Settings::default() {
-        settings.set_gtk_application_prefer_dark_theme(theme == Theme::Dark);
+    let preferred_theme = {
+      #[cfg(any(feature = "tokio", feature = "async-std"))]
+      {
+        let ctx = glib::MainContext::default();
+        let portal_theme = ctx.block_on(async { super::portal::theme().await });
+        if let Ok(theme) = portal_theme {
+          if let Some(settings) = Settings::default() {
+            settings.set_gtk_application_prefer_dark_theme(theme == Theme::Dark);
+          }
+          Some(theme)
+        } else {
+          None
+        }
+      }
+      #[cfg(not(any(feature = "tokio", feature = "async-std")))]
+      {
+        None
       }
-      Some(theme)
-    } else {
-      None
     };
 
     if attributes.visible {
@@ -1013,6 +1022,7 @@ impl Window {
       return theme;
     }
 
+    #[cfg(any(feature = "tokio", feature = "async-std"))]
     if let Some(portal_theme) =
       glib::MainContext::default().block_on(async { super::portal::theme().await.ok() })
     {