x11-wm/cosmic-comp: update to s20240712

Changes:	https://github.com/pop-os/cosmic-comp/compare/62afa4c...b1778da
(cherry picked from commit 60a36bc91e5d07f5d7785a07f5baf87d857b0662)

3 files changed, 41 insertions, 20 deletions

diff --git a/x11-wm/cosmic-comp/Makefile b/x11-wm/cosmic-comp/Makefile
index 74fce0842dae..0516ea9c8b57 100644
--- a/x11-wm/cosmic-comp/Makefile
+++ b/x11-wm/cosmic-comp/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	cosmic-comp
-PORTVERSION=	s20240628
+PORTVERSION=	s20240712
 CATEGORIES=	x11-wm wayland
 
 MAINTAINER=	jbeich@FreeBSD.org
@@ -22,8 +22,8 @@ USE_GITHUB=	yes
 USE_GL=		gbm
 USE_XORG=	pixman
 GH_ACCOUNT=	pop-os
-GH_TAGNAME=	62afa4c
-GH_TUPLE=	pop-os:iced:0.4.2-1997-gd0ba4985:iced/../${WRKSRC_crate_iced:T}/iced
+GH_TAGNAME=	b1778da
+GH_TUPLE=	pop-os:iced:0.4.2-2000-g6f83a8d1:iced/../${WRKSRC_crate_iced:T}/iced
 CARGO_FEATURES=	--no-default-features # disable systemd
 PLIST_FILES=	bin/${PORTNAME} \
 		share/wayland-sessions/${PORTNAME:S/-comp//}.desktop \
diff --git a/x11-wm/cosmic-comp/Makefile.crates b/x11-wm/cosmic-comp/Makefile.crates
index 1954f2a41bf5..59810a43d236 100644
--- a/x11-wm/cosmic-comp/Makefile.crates
+++ b/x11-wm/cosmic-comp/Makefile.crates
@@ -41,6 +41,7 @@ CARGO_CRATES=	ab_glyph-0.2.26 \
 		backtrace-0.3.72 \
 		base64-0.13.1 \
 		base64-0.21.7 \
+		base64-0.22.1 \
 		bit-set-0.5.3 \
 		bit-vec-0.6.3 \
 		bit_field-0.10.2 \
@@ -206,9 +207,11 @@ CARGO_CRATES=	ab_glyph-0.2.26 \
 		grid-0.11.0 \
 		guillotiere-0.6.2 \
 		half-2.4.1 \
+		hashbrown-0.12.3 \
 		hashbrown-0.14.5 \
 		hassle-rs-0.11.0 \
 		heck-0.4.1 \
+		heck-0.5.0 \
 		hermit-abi-0.3.9 \
 		hex-0.4.3 \
 		hexf-parse-0.2.1 \
@@ -225,6 +228,7 @@ CARGO_CRATES=	ab_glyph-0.2.26 \
 		image-0.24.9 \
 		imagesize-0.10.1 \
 		imagesize-0.12.0 \
+		indexmap-1.9.3 \
 		indexmap-2.2.6 \
 		inotify-0.9.6 \
 		inotify-sys-0.1.5 \
@@ -433,6 +437,8 @@ CARGO_CRATES=	ab_glyph-0.2.26 \
 		serde_json-1.0.117 \
 		serde_repr-0.1.19 \
 		serde_spanned-0.6.6 \
+		serde_with-3.8.1 \
+		serde_with_macros-3.8.1 \
 		sha1-0.10.6 \
 		sha2-0.10.8 \
 		sharded-slab-0.1.7 \
@@ -536,7 +542,7 @@ CARGO_CRATES=	ab_glyph-0.2.26 \
 		wasm-bindgen-macro-support-0.2.92 \
 		wasm-bindgen-shared-0.2.92 \
 		wasm-timer-0.2.5 \
-		wayland-backend-0.3.4 \
+		wayland-backend-0.3.5 \
 		wayland-client-0.31.3 \
 		wayland-csd-frame-0.3.0 \
 		wayland-cursor-0.31.3 \
@@ -549,7 +555,7 @@ CARGO_CRATES=	ab_glyph-0.2.26 \
 		wayland-protocols-wlr-0.3.1 \
 		wayland-scanner-0.31.2 \
 		wayland-server-0.31.2 \
-		wayland-sys-0.31.2 \
+		wayland-sys-0.31.3 \
 		web-sys-0.3.69 \
 		web-time-0.2.4 \
 		web-time-1.1.0 \
@@ -623,13 +629,14 @@ CARGO_CRATES=	ab_glyph-0.2.26 \
 		cosmic-text@git+https://github.com/pop-os/cosmic-text.git\#a03ec6b75f0ea8fd6264d6cd05afcec3c2213f8f \
 		taffy@git+https://github.com/DioxusLabs/taffy?rev=7781c70\#7781c70241f7f572130c13106f2a869a9cf80885 \
 		d3d12,naga,wgpu,wgpu-core,wgpu-hal,wgpu-types@git+https://github.com/gfx-rs/wgpu?rev=20fda69\#20fda698341efbdc870b8027d6d49f5bf3f36109 \
+		cosmic-config,cosmic-config-derive,cosmic-theme,iced,iced_core,iced_futures,iced_graphics,iced_renderer,iced_runtime,iced_style,iced_tiny_skia,iced_wgpu,iced_widget,libcosmic@git+https://github.com/pop-os/libcosmic/\#928b714d14c4973a8c9467370864f8adc1c69d7c \
 		cosmic-protocols@git+https://github.com/pop-os/cosmic-protocols?branch=main\#f16efccaffdbe60b81d1a500be6e81851dc1dad4 \
 		glyphon@git+https://github.com/pop-os/glyphon.git?tag=v0.5.0\#1b0646ff8f74da92d3be704dfc2257d7f4d7eed8 \
-		cosmic-config,cosmic-config-derive,cosmic-theme,iced,iced_core,iced_futures,iced_graphics,iced_renderer,iced_runtime,iced_style,iced_tiny_skia,iced_wgpu,iced_widget,libcosmic@git+https://github.com/pop-os/libcosmic/\#61760f8e4e33744a451e8e8fe09d581793c9c677 \
 		smithay-clipboard@git+https://github.com/pop-os/smithay-clipboard?tag=pop-dnd-5\#d099e82a4c1e7d3e88dc34b7333de21928b1b22c \
 		clipboard_macos,clipboard_wayland,clipboard_x11,dnd,mime,window_clipboard@git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-8\#7c59b07b9172d8e0401f7e06609e1050575309c9 \
 		atomicwrites@git+https://github.com/jackpot51/rust-atomicwrites\#043ab4859d53ffd3d55334685303d8df39c9f768 \
 		id_tree@git+https://github.com/Drakulix/id-tree.git?branch=feature/copy_clone\#632a57d6d49160e18d7300fa7edae52281ec5482 \
 		softbuffer@git+https://github.com/pop-os/softbuffer?tag=cosmic-4.0\#6e75b1ad7e98397d37cb187886d05969bc480995 \
 		smithay-egui@git+https://github.com/Smithay/smithay-egui.git?rev=cdc652e0\#cdc652e0d4823b16a5bd9badd288e38512789dc5 \
-		smithay@git+https://github.com/smithay/smithay?rev=a1650f8\#a1650f8568ad8bf0fd7844e98f4724d769cd3c75
+		smithay@git+https://github.com/smithay/smithay?rev=e2b233f\#e2b233ff588747310c8c4aa6bbb6d56c877351a8 \
+		cosmic-settings-config@git+https://github.com/pop-os/cosmic-settings-daemon\#ad0e0703549f7b135746d0429c6408cc8a7cc037
diff --git a/x11-wm/cosmic-comp/distinfo b/x11-wm/cosmic-comp/distinfo
index c84b912b05e3..cdd685716471 100644
--- a/x11-wm/cosmic-comp/distinfo
+++ b/x11-wm/cosmic-comp/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1719572675
+TIMESTAMP = 1720805387
 SHA256 (rust/crates/ab_glyph-0.2.26.crate) = 2e53b0a3d5760cd2ba9b787ae0c6440ad18ee294ff71b05e3381c900a7d16cfd
 SIZE (rust/crates/ab_glyph-0.2.26.crate) = 19078
 SHA256 (rust/crates/ab_glyph_rasterizer-0.1.8.crate) = c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046
@@ -85,6 +85,8 @@ SHA256 (rust/crates/base64-0.13.1.crate) = 9e1b586273c5702936fe7b7d6896644d8be71
 SIZE (rust/crates/base64-0.13.1.crate) = 61002
 SHA256 (rust/crates/base64-0.21.7.crate) = 9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567
 SIZE (rust/crates/base64-0.21.7.crate) = 82576
+SHA256 (rust/crates/base64-0.22.1.crate) = 72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6
+SIZE (rust/crates/base64-0.22.1.crate) = 81597
 SHA256 (rust/crates/bit-set-0.5.3.crate) = 0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1
 SIZE (rust/crates/bit-set-0.5.3.crate) = 14470
 SHA256 (rust/crates/bit-vec-0.6.3.crate) = 349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb
@@ -415,12 +417,16 @@ SHA256 (rust/crates/guillotiere-0.6.2.crate) = b62d5865c036cb1393e23c50693df631d
 SIZE (rust/crates/guillotiere-0.6.2.crate) = 18116
 SHA256 (rust/crates/half-2.4.1.crate) = 6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888
 SIZE (rust/crates/half-2.4.1.crate) = 50892
+SHA256 (rust/crates/hashbrown-0.12.3.crate) = 8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888
+SIZE (rust/crates/hashbrown-0.12.3.crate) = 102968
 SHA256 (rust/crates/hashbrown-0.14.5.crate) = e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1
 SIZE (rust/crates/hashbrown-0.14.5.crate) = 141498
 SHA256 (rust/crates/hassle-rs-0.11.0.crate) = af2a7e73e1f34c48da31fb668a907f250794837e08faa144fd24f0b8b741e890
 SIZE (rust/crates/hassle-rs-0.11.0.crate) = 27178
 SHA256 (rust/crates/heck-0.4.1.crate) = 95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8
 SIZE (rust/crates/heck-0.4.1.crate) = 11567
+SHA256 (rust/crates/heck-0.5.0.crate) = 2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea
+SIZE (rust/crates/heck-0.5.0.crate) = 11517
 SHA256 (rust/crates/hermit-abi-0.3.9.crate) = d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024
 SIZE (rust/crates/hermit-abi-0.3.9.crate) = 16165
 SHA256 (rust/crates/hex-0.4.3.crate) = 7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70
@@ -453,6 +459,8 @@ SHA256 (rust/crates/imagesize-0.10.1.crate) = df19da1e92fbfec043ca97d622955381b1
 SIZE (rust/crates/imagesize-0.10.1.crate) = 11439
 SHA256 (rust/crates/imagesize-0.12.0.crate) = 029d73f573d8e8d63e6d5020011d3255b28c3ba85d6cf870a07184ed23de9284
 SIZE (rust/crates/imagesize-0.12.0.crate) = 15747
+SHA256 (rust/crates/indexmap-1.9.3.crate) = bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99
+SIZE (rust/crates/indexmap-1.9.3.crate) = 54653
 SHA256 (rust/crates/indexmap-2.2.6.crate) = 168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26
 SIZE (rust/crates/indexmap-2.2.6.crate) = 82420
 SHA256 (rust/crates/inotify-0.9.6.crate) = f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff
@@ -869,6 +877,10 @@ SHA256 (rust/crates/serde_repr-0.1.19.crate) = 6c64451ba24fc7a6a2d60fc75dd9c83c9
 SIZE (rust/crates/serde_repr-0.1.19.crate) = 9997
 SHA256 (rust/crates/serde_spanned-0.6.6.crate) = 79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0
 SIZE (rust/crates/serde_spanned-0.6.6.crate) = 9120
+SHA256 (rust/crates/serde_with-3.8.1.crate) = 0ad483d2ab0149d5a5ebcd9972a3852711e0153d863bf5a5d0391d28883c4a20
+SIZE (rust/crates/serde_with-3.8.1.crate) = 142294
+SHA256 (rust/crates/serde_with_macros-3.8.1.crate) = 65569b702f41443e8bc8bbb1c5779bd0450bbe723b56198980e80ec45780bce2
+SIZE (rust/crates/serde_with_macros-3.8.1.crate) = 30796
 SHA256 (rust/crates/sha1-0.10.6.crate) = e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba
 SIZE (rust/crates/sha1-0.10.6.crate) = 13517
 SHA256 (rust/crates/sha2-0.10.8.crate) = 793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8
@@ -1075,8 +1087,8 @@ SHA256 (rust/crates/wasm-bindgen-shared-0.2.92.crate) = af190c94f2773fdb3729c55b
 SIZE (rust/crates/wasm-bindgen-shared-0.2.92.crate) = 7263
 SHA256 (rust/crates/wasm-timer-0.2.5.crate) = be0ecb0db480561e9a7642b5d3e4187c128914e58aa84330b9493e3eb68c5e7f
 SIZE (rust/crates/wasm-timer-0.2.5.crate) = 21668
-SHA256 (rust/crates/wayland-backend-0.3.4.crate) = 34e9e6b6d4a2bb4e7e69433e0b35c7923b95d4dc8503a84d25ec917a4bbfdf07
-SIZE (rust/crates/wayland-backend-0.3.4.crate) = 70797
+SHA256 (rust/crates/wayland-backend-0.3.5.crate) = 269c04f203640d0da2092d1b8d89a2d081714ae3ac2f1b53e99f205740517198
+SIZE (rust/crates/wayland-backend-0.3.5.crate) = 71351
 SHA256 (rust/crates/wayland-client-0.31.3.crate) = 1e63801c85358a431f986cffa74ba9599ff571fc5774ac113ed3b490c19a1133
 SIZE (rust/crates/wayland-client-0.31.3.crate) = 63081
 SHA256 (rust/crates/wayland-csd-frame-0.3.0.crate) = 625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e
@@ -1101,8 +1113,8 @@ SHA256 (rust/crates/wayland-scanner-0.31.2.crate) = 67da50b9f80159dec0ea4c11c13e
 SIZE (rust/crates/wayland-scanner-0.31.2.crate) = 35644
 SHA256 (rust/crates/wayland-server-0.31.2.crate) = 63e89118bd072ba6ce0f9c2c92fa41f72d1d78a138d2abc497a80a8264565559
 SIZE (rust/crates/wayland-server-0.31.2.crate) = 52069
-SHA256 (rust/crates/wayland-sys-0.31.2.crate) = 105b1842da6554f91526c14a2a2172897b7f745a805d62af4ce698706be79c12
-SIZE (rust/crates/wayland-sys-0.31.2.crate) = 8571
+SHA256 (rust/crates/wayland-sys-0.31.3.crate) = 4a6754825230fa5b27bafaa28c30b3c9e72c55530581220cef401fa422c0fae7
+SIZE (rust/crates/wayland-sys-0.31.3.crate) = 8573
 SHA256 (rust/crates/web-sys-0.3.69.crate) = 77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef
 SIZE (rust/crates/web-sys-0.3.69.crate) = 728877
 SHA256 (rust/crates/web-time-0.2.4.crate) = aa30049b1c872b72c89866d458eae9f20380ab280ffd1b1e18df2d3e2d98cfe0
@@ -1249,12 +1261,12 @@ SHA256 (DioxusLabs-taffy-7781c70241f7f572130c13106f2a869a9cf80885_GH0.tar.gz) =
 SIZE (DioxusLabs-taffy-7781c70241f7f572130c13106f2a869a9cf80885_GH0.tar.gz) = 389939
 SHA256 (gfx-rs-wgpu-20fda698341efbdc870b8027d6d49f5bf3f36109_GH0.tar.gz) = 0715b053dd2f42a32c92a41996c9f029a294c48943cb18d5bae4dfa50d4be51c
 SIZE (gfx-rs-wgpu-20fda698341efbdc870b8027d6d49f5bf3f36109_GH0.tar.gz) = 11456338
+SHA256 (pop-os-libcosmic-928b714d14c4973a8c9467370864f8adc1c69d7c_GH0.tar.gz) = 96259bbfc225a187443b35f0aded32d6700d6670cb652931be12628035c666af
+SIZE (pop-os-libcosmic-928b714d14c4973a8c9467370864f8adc1c69d7c_GH0.tar.gz) = 1098633
 SHA256 (pop-os-cosmic-protocols-f16efccaffdbe60b81d1a500be6e81851dc1dad4_GH0.tar.gz) = cdbbbcd201f6c0ae5915546bfddbbf52382f4729ae7c70f490ff01c21b3a5672
 SIZE (pop-os-cosmic-protocols-f16efccaffdbe60b81d1a500be6e81851dc1dad4_GH0.tar.gz) = 44709
 SHA256 (pop-os-glyphon-v0.5.0_GH0.tar.gz) = df1108e99572aea9433415081b4692f1561b9abe63766ccc70cb7fe709570a33
 SIZE (pop-os-glyphon-v0.5.0_GH0.tar.gz) = 183087
-SHA256 (pop-os-libcosmic-61760f8e4e33744a451e8e8fe09d581793c9c677_GH0.tar.gz) = d8788135ab89394434c6baea8b3b26ce9e86a6a4fe541d75b777e403bc725d6f
-SIZE (pop-os-libcosmic-61760f8e4e33744a451e8e8fe09d581793c9c677_GH0.tar.gz) = 1095838
 SHA256 (pop-os-smithay-clipboard-pop-dnd-5_GH0.tar.gz) = 5e871e450991b94b8c09bc08994d6173e9bbb0f80b19ea7e3a126527d765bc90
 SIZE (pop-os-smithay-clipboard-pop-dnd-5_GH0.tar.gz) = 22877
 SHA256 (pop-os-window_clipboard-pop-dnd-8_GH0.tar.gz) = e44be0ca5c716ef753e3344cd06d167e7e84fa366058a71fce01c645e1d6f616
@@ -1267,9 +1279,11 @@ SHA256 (pop-os-softbuffer-cosmic-4.0_GH0.tar.gz) = 980f30eb5afc07acdec43f181a9e7
 SIZE (pop-os-softbuffer-cosmic-4.0_GH0.tar.gz) = 165853
 SHA256 (Smithay-smithay-egui-cdc652e0d4823b16a5bd9badd288e38512789dc5_GH0.tar.gz) = c7f24118a1410bf55dc39bb541ffec1330d2d0504ec57a1c420d4ee8c00c708e
 SIZE (Smithay-smithay-egui-cdc652e0d4823b16a5bd9badd288e38512789dc5_GH0.tar.gz) = 11092
-SHA256 (smithay-smithay-a1650f8568ad8bf0fd7844e98f4724d769cd3c75_GH0.tar.gz) = ddc81ab00cc5a6b3631c0839ab2d428160db6a312e1475c7b68838605815627d
-SIZE (smithay-smithay-a1650f8568ad8bf0fd7844e98f4724d769cd3c75_GH0.tar.gz) = 749512
-SHA256 (pop-os-cosmic-comp-s20240628-62afa4c_GH0.tar.gz) = be43843a098d4464762a50f2d79ec059104ecebd46f9a57288370bdfb9dcecee
-SIZE (pop-os-cosmic-comp-s20240628-62afa4c_GH0.tar.gz) = 373091
-SHA256 (pop-os-iced-0.4.2-1997-gd0ba4985_GH0.tar.gz) = e94835aa94fd06e2529897cbfcf630450572cf3445210df514fcc35d81d3eecd
-SIZE (pop-os-iced-0.4.2-1997-gd0ba4985_GH0.tar.gz) = 4679516
+SHA256 (smithay-smithay-e2b233ff588747310c8c4aa6bbb6d56c877351a8_GH0.tar.gz) = ab03e99aea7e49d052f77b931c1a15339377da29b902b360a2faae48b76213c8
+SIZE (smithay-smithay-e2b233ff588747310c8c4aa6bbb6d56c877351a8_GH0.tar.gz) = 750644
+SHA256 (pop-os-cosmic-settings-daemon-ad0e0703549f7b135746d0429c6408cc8a7cc037_GH0.tar.gz) = 5cdb3ef6fcceeb95aace1e061c841772c768ef07d2205c3f5be7d61c6f560491
+SIZE (pop-os-cosmic-settings-daemon-ad0e0703549f7b135746d0429c6408cc8a7cc037_GH0.tar.gz) = 66831
+SHA256 (pop-os-cosmic-comp-s20240712-b1778da_GH0.tar.gz) = 356633973bb320ff6fe1227c772fbc8b7c628ad5d3db19fd63dfe29f48392cf8
+SIZE (pop-os-cosmic-comp-s20240712-b1778da_GH0.tar.gz) = 372899
+SHA256 (pop-os-iced-0.4.2-2000-g6f83a8d1_GH0.tar.gz) = dbaa86bc0e2c066b5266bfccb31c78a68e26910dace39a28539ef6f6a41cdc3b
+SIZE (pop-os-iced-0.4.2-2000-g6f83a8d1_GH0.tar.gz) = 4680262