Merge remote-tracking branch 'freebsd/main' into lf/main

1 files changed, 10 insertions, 8 deletions

diff --git a/x11-wm/cosmic-comp/files/patch-no-systemd b/x11-wm/cosmic-comp/files/patch-no-systemd
index ad3699dbe259..d75d9c713728 100644
--- a/x11-wm/cosmic-comp/files/patch-no-systemd
+++ b/x11-wm/cosmic-comp/files/patch-no-systemd
@@ -12,17 +12,19 @@ Avoid various systemd dependencies
  DesktopNames=pop:COSMIC
  X-GDM-SessionRegisters=false
 \ No newline at end of file
---- src/main.rs.orig	2024-09-23 09:13:21 UTC
+--- src/main.rs.orig	2025-09-19 13:33:10 UTC
 +++ src/main.rs
-@@ -87,6 +87,11 @@ fn main() -> Result<()> {
+@@ -134,6 +134,13 @@ fn main_inner() -> Result<(), Box<dyn Error>> {
      logger::init_logger()?;
      info!("Cosmic starting up!");
  
-+    // Advise xdg-desktop-portal which *-portals.conf to load
-+    std::env::set_var("XDG_CURRENT_DESKTOP", "COSMIC");
-+    // Mimic wlroots, used by https://github.com/qt/qtbase/commit/4b4870a12cd9
-+    std::env::set_var("XDG_SESSION_TYPE", "wayland");
++    unsafe {
++        // Advise xdg-desktop-portal which *-portals.conf to load
++        std::env::set_var("XDG_CURRENT_DESKTOP", "COSMIC");
++        // Mimic wlroots, used by https://github.com/qt/qtbase/commit/4b4870a12cd9
++        std::env::set_var("XDG_SESSION_TYPE", "wayland");
++    }
 +
-     #[cfg(feature = "profile-with-tracy")]
-     profiling::tracy_client::Client::start();
      profiling::register_thread!("Main Thread");
+     #[cfg(feature = "profile-with-tracy")]
+     tracy_client::Client::start();