diff options
Diffstat (limited to 'x11-wm/cosmic-comp/files')
| -rw-r--r-- | x11-wm/cosmic-comp/files/patch-libdisplay-info-0.3 | 54 | ||||
| -rw-r--r-- | x11-wm/cosmic-comp/files/patch-no-systemd | 18 |
2 files changed, 41 insertions, 31 deletions
diff --git a/x11-wm/cosmic-comp/files/patch-libdisplay-info-0.3 b/x11-wm/cosmic-comp/files/patch-libdisplay-info-0.3 index 679912dccc17..fb2f1a87c873 100644 --- a/x11-wm/cosmic-comp/files/patch-libdisplay-info-0.3 +++ b/x11-wm/cosmic-comp/files/patch-libdisplay-info-0.3 @@ -2,51 +2,59 @@ https://github.com/Smithay/libdisplay-info-rs/pull/17 --- Cargo.lock.orig 2025-04-24 10:45:50 UTC +++ Cargo.lock -@@ -2900,9 +2900,8 @@ name = "libdisplay-info" +@@ -2900,9 +2900,9 @@ name = "libdisplay-info" [[package]] name = "libdisplay-info" -version = "0.2.2" --source = "registry+https://github.com/rust-lang/crates.io-index" ++version = "0.3.0" + source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4210cfe93a0dc37228e08105e3c13171e5af816f7bd39e00e3d3adcf2b487a2b" -+version = "0.2.3" -+source = "git+https://github.com/Smithay/libdisplay-info-rs?branch=feature%2F0.3.0#5b706d544d87f1bcae4c5ba97b281a8ab16754ed" ++checksum = "59fd96dbb2381ff31f314f07accbdf8550febdcc5cd8761ecaf7c1763361c359" dependencies = [ "bitflags 2.8.0", "libc", -@@ -2913,9 +2912,8 @@ name = "libdisplay-info-derive" +@@ -2913,9 +2913,9 @@ name = "libdisplay-info-derive" [[package]] name = "libdisplay-info-derive" -version = "0.1.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "ea1cd31036b732a546d845f9485c56b1b606b5e476b0821c680dd66c8cd6fcee" +version = "0.1.1" -+source = "git+https://github.com/Smithay/libdisplay-info-rs?branch=feature%2F0.3.0#5b706d544d87f1bcae4c5ba97b281a8ab16754ed" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ea1cd31036b732a546d845f9485c56b1b606b5e476b0821c680dd66c8cd6fcee" ++checksum = "8dc2c710cf5819e91220a446d9e64acc6814386cc22c509c3f0df83c0b874a98" dependencies = [ "proc-macro2", "quote", -@@ -2924,9 +2922,8 @@ name = "libdisplay-info-sys" +@@ -2924,9 +2924,9 @@ name = "libdisplay-info-sys" [[package]] name = "libdisplay-info-sys" -version = "0.2.2" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7f4f9264ece23c37ffa023ae635f48d588e1786745dad06dff10c9fb99dc646c" +version = "0.3.0" -+source = "git+https://github.com/Smithay/libdisplay-info-rs?branch=feature%2F0.3.0#5b706d544d87f1bcae4c5ba97b281a8ab16754ed" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7f4f9264ece23c37ffa023ae635f48d588e1786745dad06dff10c9fb99dc646c" ++checksum = "26590d55b8819f9c6b0d95d9d12dc9edbfd1f2413e88814a33b631ac049bb51f" dependencies = [ "semver", "system-deps", ---- Cargo.toml.orig 2025-04-24 10:45:50 UTC +--- Cargo.toml.orig 2025-09-19 13:33:10 UTC +++ Cargo.toml -@@ -118,6 +118,9 @@ lto = "fat" - [profile.release] - lto = "fat" - -+[ patch.crates-io] -+libdisplay-info = { git = "https://github.com/Smithay/libdisplay-info-rs", branch = "feature/0.3.0" } -+ - [patch."https://github.com/pop-os/cosmic-protocols"] - cosmic-protocols = { git = "https://github.com/pop-os//cosmic-protocols", branch = "main" } - cosmic-client-toolkit = { git = "https://github.com/pop-os//cosmic-protocols", branch = "main" } +@@ -32,7 +32,7 @@ cosmic-text = { git = "https://github.com/pop-os/cosmi + cosmic-text = { git = "https://github.com/pop-os/cosmic-text.git", features = [ + "shape-run-cache", + ] } +-libdisplay-info = "0.2.2" ++libdisplay-info = "0.3.0" + egui = { version = "0.31.0", optional = true } + egui_plot = { version = "0.31.0", optional = true } + i18n-embed = { version = "0.16", features = [ +--- cosmic-comp-config/Cargo.toml.orig 2025-04-24 10:45:50 UTC ++++ cosmic-comp-config/Cargo.toml +@@ -6,5 +6,5 @@ input = "0.9.0" + [dependencies] + cosmic-config = { git = "https://github.com/pop-os/libcosmic/" } + input = "0.9.0" +-libdisplay-info = { version = "0.2.0", optional = true } ++libdisplay-info = { version = "0.3.0", optional = true } + serde = { version = "1", features = ["derive"] } 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(); |