x11-wm/cosmic-comp: update to s20240208

Changes: pop-os/cosmic-comp@ce74675...6a4bcb1
freebsd · Feb 9, 2024 · c3547f5 · c3547f5
1 parent 0c79841
commit c3547f5
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 16 deletions.
diff --git a/x11-wm/cosmic-comp/Makefile b/x11-wm/cosmic-comp/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	cosmic-comp
-PORTVERSION=	s20240129
+PORTVERSION=	s20240208
 CATEGORIES=	x11-wm wayland
 
 MAINTAINER=	jbeich@FreeBSD.org
@@ -21,7 +21,7 @@ USES=		cargo gl
 USE_GITHUB=	yes
 USE_GL=		gbm
 GH_ACCOUNT=	pop-os
-GH_TAGNAME=	ce74675
+GH_TAGNAME=	6a4bcb1
 GH_TUPLE=	pop-os:iced:0.4.2-1768-g6115280d:iced/../${WRKSRC_crate_iced:T}/iced
 CARGO_FEATURES=	--no-default-features # disable systemd
 PLIST_FILES=	bin/${PORTNAME} \

diff --git a/x11-wm/cosmic-comp/Makefile.crates b/x11-wm/cosmic-comp/Makefile.crates
@@ -193,7 +193,7 @@ CARGO_CRATES=	ab_glyph-0.2.23 \
 		indexmap-2.1.0 \
 		inotify-0.9.6 \
 		inotify-sys-0.1.5 \
-		input-0.8.3 \
+		input-0.9.0 \
 		input-sys-1.18.0 \
 		instant-0.1.12 \
 		intl-memoizer-0.5.1 \
@@ -432,7 +432,6 @@ CARGO_CRATES=	ab_glyph-0.2.23 \
 		ttf-parser-0.20.0 \
 		type-map-0.4.0 \
 		typenum-1.17.0 \
-		udev-0.7.0 \
 		udev-0.8.0 \
 		unic-langid-0.9.4 \
 		unic-langid-impl-0.9.4 \
@@ -546,11 +545,11 @@ CARGO_CRATES=	ab_glyph-0.2.23 \
 		zerocopy-derive-0.7.32 \
 		zune-inflate-0.2.54 \
 		glyphon@git+https://github.com/jackpot51/glyphon.git\#abb70c0fda8cf1a5dfc314c1c778103d7ba951e6 \
+		smithay@git+https://github.com/smithay/smithay?rev=3b3e07952e\#3b3e07952e471618fe8b590ba3223f4201cec10c \
 		taffy@git+https://github.com/DioxusLabs/taffy?rev=7781c70\#7781c70241f7f572130c13106f2a869a9cf80885 \
 		atomicwrites@git+https://github.com/jackpot51/rust-atomicwrites\#043ab4859d53ffd3d55334685303d8df39c9f768 \
 		id_tree@git+https://github.com/Drakulix/id-tree.git?branch=feature/copy_clone\#632a57d6d49160e18d7300fa7edae52281ec5482 \
 		smithay-egui@git+https://github.com/Smithay/smithay-egui.git?rev=cdc652e0\#cdc652e0d4823b16a5bd9badd288e38512789dc5 \
-		smithay@git+https://github.com/smithay/smithay?rev=f1e7fc18a\#f1e7fc18a7f060f8ff1e647ca407df62f85467cf \
 		cosmic-text@git+https://github.com/pop-os/cosmic-text.git\#db1530c4ec14bcbb290f9c971d8a6197c90e189a \
 		cosmic-protocols@git+https://github.com/pop-os/cosmic-protocols?branch=main\#e65fa5e2bb47e51656221657049bd3f88ae9dae5 \
 		softbuffer@git+https://github.com/pop-os/softbuffer?tag=v0.3-cosmic\#6f0371ccece51d124c6c5d37082189df0dc5f9ba \

diff --git a/x11-wm/cosmic-comp/distinfo b/x11-wm/cosmic-comp/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1706489320
+TIMESTAMP = 1707423298
 SHA256 (rust/crates/ab_glyph-0.2.23.crate) = 80179d7dd5d7e8c285d67c4a1e652972a92de7475beddfb92028c76463b13225
 SIZE (rust/crates/ab_glyph-0.2.23.crate) = 18537
 SHA256 (rust/crates/ab_glyph_rasterizer-0.1.8.crate) = c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046
@@ -389,8 +389,8 @@ SHA256 (rust/crates/inotify-0.9.6.crate) = f8069d3ec154eb856955c1c0fbffefbf5f3c4
 SIZE (rust/crates/inotify-0.9.6.crate) = 22971
 SHA256 (rust/crates/inotify-sys-0.1.5.crate) = e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb
 SIZE (rust/crates/inotify-sys-0.1.5.crate) = 6965
-SHA256 (rust/crates/input-0.8.3.crate) = e6e74cd82cedcd66db78742a8337bdc48f188c4d2c12742cbc5cd85113f0b059
-SIZE (rust/crates/input-0.8.3.crate) = 40583
+SHA256 (rust/crates/input-0.9.0.crate) = 7911ce3db9c10c5ab4a35c49af778a5f9a827bd0f7371d9be56175d8dd2740d0
+SIZE (rust/crates/input-0.9.0.crate) = 40668
 SHA256 (rust/crates/input-sys-1.18.0.crate) = bd4f5b4d1c00331c5245163aacfe5f20be75b564c7112d45893d4ae038119eb0
 SIZE (rust/crates/input-sys-1.18.0.crate) = 365567
 SHA256 (rust/crates/instant-0.1.12.crate) = 7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c
@@ -867,8 +867,6 @@ SHA256 (rust/crates/type-map-0.4.0.crate) = b6d3364c5e96cb2ad1603037ab253ddd34d7
 SIZE (rust/crates/type-map-0.4.0.crate) = 3177
 SHA256 (rust/crates/typenum-1.17.0.crate) = 42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825
 SIZE (rust/crates/typenum-1.17.0.crate) = 42849
-SHA256 (rust/crates/udev-0.7.0.crate) = 4ebdbbd670373442a12fe9ef7aeb53aec4147a5a27a00bbc3ab639f08f48191a
-SIZE (rust/crates/udev-0.7.0.crate) = 17980
 SHA256 (rust/crates/udev-0.8.0.crate) = 50051c6e22be28ee6f217d50014f3bc29e81c20dc66ff7ca0d5c5226e1dcc5a1
 SIZE (rust/crates/udev-0.8.0.crate) = 20532
 SHA256 (rust/crates/unic-langid-0.9.4.crate) = 238722e6d794ed130f91f4ea33e01fcff4f188d92337a21297892521c72df516
@@ -1095,6 +1093,8 @@ SHA256 (rust/crates/zune-inflate-0.2.54.crate) = 73ab332fe2f6680068f3582b16a24f9
 SIZE (rust/crates/zune-inflate-0.2.54.crate) = 37973
 SHA256 (jackpot51-glyphon-abb70c0fda8cf1a5dfc314c1c778103d7ba951e6_GH0.tar.gz) = 0e0192006dbce1cbe454fb3fadbb0d897ec0444a8050375a85a951ebb68c2095
 SIZE (jackpot51-glyphon-abb70c0fda8cf1a5dfc314c1c778103d7ba951e6_GH0.tar.gz) = 182998
+SHA256 (smithay-smithay-3b3e07952e471618fe8b590ba3223f4201cec10c_GH0.tar.gz) = 915eae0b22562259eda7de376e3f75e7fc2927607b57b810704d110bc997e21a
+SIZE (smithay-smithay-3b3e07952e471618fe8b590ba3223f4201cec10c_GH0.tar.gz) = 720604
 SHA256 (DioxusLabs-taffy-7781c70241f7f572130c13106f2a869a9cf80885_GH0.tar.gz) = e1a8e5cd37d8bb34badfd3c3e03a6948893a2ae6f789143162253f1f8e11fd4a
 SIZE (DioxusLabs-taffy-7781c70241f7f572130c13106f2a869a9cf80885_GH0.tar.gz) = 389939
 SHA256 (jackpot51-rust-atomicwrites-043ab4859d53ffd3d55334685303d8df39c9f768_GH0.tar.gz) = 95ce4266b50ce6470ba74a5a9ce718bbfba45bf5ab43786db05be1682f6f0db1
@@ -1103,8 +1103,6 @@ SHA256 (Drakulix-id-tree-632a57d6d49160e18d7300fa7edae52281ec5482_GH0.tar.gz) =
 SIZE (Drakulix-id-tree-632a57d6d49160e18d7300fa7edae52281ec5482_GH0.tar.gz) = 29608
 SHA256 (Smithay-smithay-egui-cdc652e0d4823b16a5bd9badd288e38512789dc5_GH0.tar.gz) = c7f24118a1410bf55dc39bb541ffec1330d2d0504ec57a1c420d4ee8c00c708e
 SIZE (Smithay-smithay-egui-cdc652e0d4823b16a5bd9badd288e38512789dc5_GH0.tar.gz) = 11092
-SHA256 (smithay-smithay-f1e7fc18a7f060f8ff1e647ca407df62f85467cf_GH0.tar.gz) = 3b9f9dac0c8a0e616641ad4bc62209c40d0ff57b3c3f464d323d7adfc4b7627d
-SIZE (smithay-smithay-f1e7fc18a7f060f8ff1e647ca407df62f85467cf_GH0.tar.gz) = 712139
 SHA256 (pop-os-cosmic-text-db1530c4ec14bcbb290f9c971d8a6197c90e189a_GH0.tar.gz) = 91948ff6407228cdb39b1f63155a19bc65f2d2c5f7f1cce53ec17435fb1de8f7
 SIZE (pop-os-cosmic-text-db1530c4ec14bcbb290f9c971d8a6197c90e189a_GH0.tar.gz) = 175113
 SHA256 (pop-os-cosmic-protocols-e65fa5e2bb47e51656221657049bd3f88ae9dae5_GH0.tar.gz) = 138a25c0e6754e5f59a6b615b58e2720df33ac4d202115ce20f5f3e0418e0b2a
@@ -1113,7 +1111,7 @@ SHA256 (pop-os-softbuffer-v0.3-cosmic_GH0.tar.gz) = ce82bbee893bcd1838c6770adf2c
 SIZE (pop-os-softbuffer-v0.3-cosmic_GH0.tar.gz) = 161848
 SHA256 (pop-os-libcosmic-efe4ce2f5b514e4d553ab82c0c873dca7585c028_GH0.tar.gz) = 008ad8bae4add3630d249584798ce7dc905354f7577d52e6568b6b5643667fda
 SIZE (pop-os-libcosmic-efe4ce2f5b514e4d553ab82c0c873dca7585c028_GH0.tar.gz) = 1055072
-SHA256 (pop-os-cosmic-comp-s20240129-ce74675_GH0.tar.gz) = 1f3a0edb25f53624c4be494992def66e9f338f830fe678f0f3c174a31404e17e
-SIZE (pop-os-cosmic-comp-s20240129-ce74675_GH0.tar.gz) = 320713
+SHA256 (pop-os-cosmic-comp-s20240208-6a4bcb1_GH0.tar.gz) = 23a04ec6bc2ec996e682402acf6e2d7623f54b332bf89a65c92c12ce7dcbd5bd
+SIZE (pop-os-cosmic-comp-s20240208-6a4bcb1_GH0.tar.gz) = 322156
 SHA256 (pop-os-iced-0.4.2-1768-g6115280d_GH0.tar.gz) = 10dfe4a05e0bfc88401fc58f925b451176018f0057508ba5d606dff7089199ef
 SIZE (pop-os-iced-0.4.2-1768-g6115280d_GH0.tar.gz) = 4632265
diff --git a/x11-wm/cosmic-comp/files/patch-Cargo.toml b/x11-wm/cosmic-comp/files/patch-Cargo.toml
@@ -8,12 +8,12 @@ Caused by:
   The patch location `https://github.com/smithay/smithay?rev=f1e7fc18a` does not appear to contain any packages matching the name `smithay`.
 *** Error code 101
 
---- Cargo.toml.orig	2024-01-29 00:48:40 UTC
+--- Cargo.toml.orig	2024-02-07 20:40:23 UTC
 +++ Cargo.toml
 @@ -89,6 +89,3 @@ lto = "fat"
 
  [profile.release]
  lto = "fat"
 -
 -[patch."https://github.com/Smithay/smithay.git"]
--smithay = { git = "https://github.com/smithay//smithay", rev = "f1e7fc18a" }
+-smithay = { git = "https://github.com/smithay//smithay", rev = "3b3e07952e" }