diff options
Diffstat (limited to '')
-rw-r--r-- | x11-wm/cosmic-comp/Makefile | 2 | ||||
-rw-r--r-- | x11-wm/cosmic-comp/Makefile.crates | 4 | ||||
-rw-r--r-- | x11-wm/cosmic-comp/distinfo | 8 | ||||
-rw-r--r-- | x11-wm/cosmic-comp/files/patch-libdisplay-info-0.3 | 52 |
4 files changed, 56 insertions, 10 deletions
diff --git a/x11-wm/cosmic-comp/Makefile b/x11-wm/cosmic-comp/Makefile index 9ab55a03c1e2..82934897afbc 100644 --- a/x11-wm/cosmic-comp/Makefile +++ b/x11-wm/cosmic-comp/Makefile @@ -1,7 +1,7 @@ PORTNAME= cosmic-comp DISTVERSIONPREFIX= epoch- DISTVERSION= 1.0.0-alpha.7 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-wm wayland MAINTAINER= jbeich@FreeBSD.org diff --git a/x11-wm/cosmic-comp/Makefile.crates b/x11-wm/cosmic-comp/Makefile.crates index f3737b79d2b6..aa6c570116a5 100644 --- a/x11-wm/cosmic-comp/Makefile.crates +++ b/x11-wm/cosmic-comp/Makefile.crates @@ -251,9 +251,6 @@ CARGO_CRATES= ab_glyph-0.2.29 \ kurbo-0.11.1 \ lazy_static-1.5.0 \ libc-0.2.169 \ - libdisplay-info-0.2.2 \ - libdisplay-info-derive-0.1.0 \ - libdisplay-info-sys-0.2.2 \ libloading-0.8.6 \ libm-0.2.11 \ libredox-0.1.3 \ @@ -636,6 +633,7 @@ CARGO_CRATES= ab_glyph-0.2.29 \ atomicwrites@git+https://github.com/jackpot51/rust-atomicwrites\#043ab4859d53ffd3d55334685303d8df39c9f768 \ iced_glyphon@git+https://github.com/pop-os/glyphon.git?tag=iced-0.14-dev\#6ef9d12a20cfd0f7bdf38136a26ded9f7459ec8b \ clipboard_macos,clipboard_wayland,clipboard_x11,dnd,mime,window_clipboard@git+https://github.com/pop-os/window_clipboard.git?tag=pop-0.13-2\#6b9faab87bea9cebec6ae036906fd67fed254f5f \ + libdisplay-info,libdisplay-info-derive,libdisplay-info-sys@git+https://github.com/Smithay/libdisplay-info-rs?branch=feature%2F0.3.0\#5b706d544d87f1bcae4c5ba97b281a8ab16754ed \ softbuffer@git+https://github.com/pop-os/softbuffer?tag=cosmic-4.0\#6e75b1ad7e98397d37cb187886d05969bc480995 \ cosmic-config,cosmic-config-derive,cosmic-theme,iced,iced_core,iced_futures,iced_graphics,iced_renderer,iced_runtime,iced_tiny_skia,iced_wgpu,iced_widget,libcosmic@git+https://github.com/pop-os/libcosmic/\#8a0e74b189f53dae9b8001c6fa5cf1820b3ececb \ cosmic-client-toolkit,cosmic-protocols@git+https://github.com/pop-os/cosmic-protocols?branch=main\#bc4af9183e0967802d7fbe91ba811a29ca6a3b67 \ diff --git a/x11-wm/cosmic-comp/distinfo b/x11-wm/cosmic-comp/distinfo index ea738b7d046f..b28cba9d2342 100644 --- a/x11-wm/cosmic-comp/distinfo +++ b/x11-wm/cosmic-comp/distinfo @@ -505,12 +505,6 @@ SHA256 (rust/crates/lazy_static-1.5.0.crate) = bbd2bcb4c963f2ddae06a2efc7e9f3591 SIZE (rust/crates/lazy_static-1.5.0.crate) = 14025 SHA256 (rust/crates/libc-0.2.169.crate) = b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a SIZE (rust/crates/libc-0.2.169.crate) = 757901 -SHA256 (rust/crates/libdisplay-info-0.2.2.crate) = 4210cfe93a0dc37228e08105e3c13171e5af816f7bd39e00e3d3adcf2b487a2b -SIZE (rust/crates/libdisplay-info-0.2.2.crate) = 34625 -SHA256 (rust/crates/libdisplay-info-derive-0.1.0.crate) = ea1cd31036b732a546d845f9485c56b1b606b5e476b0821c680dd66c8cd6fcee -SIZE (rust/crates/libdisplay-info-derive-0.1.0.crate) = 3601 -SHA256 (rust/crates/libdisplay-info-sys-0.2.2.crate) = 7f4f9264ece23c37ffa023ae635f48d588e1786745dad06dff10c9fb99dc646c -SIZE (rust/crates/libdisplay-info-sys-0.2.2.crate) = 26200 SHA256 (rust/crates/libloading-0.8.6.crate) = fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34 SIZE (rust/crates/libloading-0.8.6.crate) = 28922 SHA256 (rust/crates/libm-0.2.11.crate) = 8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa @@ -1275,6 +1269,8 @@ SHA256 (pop-os-glyphon-iced-0.14-dev_GH0.tar.gz) = ec5f82cdbf5f5c0a7313cad64de78 SIZE (pop-os-glyphon-iced-0.14-dev_GH0.tar.gz) = 183465 SHA256 (pop-os-window_clipboard-pop-0.13-2_GH0.tar.gz) = 2181c53f2fe5d373cedfa7fe826bab04cbdd39fdbcb77920bbcc9f41a9cca79c SIZE (pop-os-window_clipboard-pop-0.13-2_GH0.tar.gz) = 24227 +SHA256 (Smithay-libdisplay-info-rs-5b706d544d87f1bcae4c5ba97b281a8ab16754ed_GH0.tar.gz) = 1f61882dcb638b790369d1f09e41ec4b4d24ec15abef2abf3b00e01399121ab5 +SIZE (Smithay-libdisplay-info-rs-5b706d544d87f1bcae4c5ba97b281a8ab16754ed_GH0.tar.gz) = 119266 SHA256 (pop-os-softbuffer-cosmic-4.0_GH0.tar.gz) = 980f30eb5afc07acdec43f181a9e745cb7a887a6dff7e06dc9199748b2487569 SIZE (pop-os-softbuffer-cosmic-4.0_GH0.tar.gz) = 165853 SHA256 (pop-os-libcosmic-8a0e74b189f53dae9b8001c6fa5cf1820b3ececb_GH0.tar.gz) = 7891bf08e33aef4d59046e038e5eb47e3144d06e12888161d5a1fbbd49fd9b33 diff --git a/x11-wm/cosmic-comp/files/patch-libdisplay-info-0.3 b/x11-wm/cosmic-comp/files/patch-libdisplay-info-0.3 new file mode 100644 index 000000000000..679912dccc17 --- /dev/null +++ b/x11-wm/cosmic-comp/files/patch-libdisplay-info-0.3 @@ -0,0 +1,52 @@ +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" + + [[package]] + name = "libdisplay-info" +-version = "0.2.2" +-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" + dependencies = [ + "bitflags 2.8.0", + "libc", +@@ -2913,9 +2912,8 @@ 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" + dependencies = [ + "proc-macro2", + "quote", +@@ -2924,9 +2922,8 @@ 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" + dependencies = [ + "semver", + "system-deps", +--- Cargo.toml.orig 2025-04-24 10:45:50 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" } |