git: 435b3b306aed - main - x11-wm/cosmic-comp: update to 1.0.0.a.2

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Jan Beich <jbeich_at_FreeBSD.org>
Date: Thu, 26 Sep 2024 00:22:59 UTC
The branch main has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=435b3b306aed7f439d41c63edfdcb2449589600e

commit 435b3b306aed7f439d41c63edfdcb2449589600e
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2024-09-20 10:43:58 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2024-09-26 00:22:23 +0000

    x11-wm/cosmic-comp: update to 1.0.0.a.2
    
    Changes:        https://github.com/pop-os/cosmic-comp/compare/d7ca032...epoch-1.0.0-alpha.2
---
 x11-wm/cosmic-comp/Makefile               |  6 ++--
 x11-wm/cosmic-comp/Makefile.crates        |  8 ++---
 x11-wm/cosmic-comp/distinfo               | 22 +++++++-------
 x11-wm/cosmic-comp/files/patch-Cargo.lock | 49 +++++++++++++++++++++++++++++++
 x11-wm/cosmic-comp/files/patch-no-systemd | 10 +++----
 5 files changed, 72 insertions(+), 23 deletions(-)

diff --git a/x11-wm/cosmic-comp/Makefile b/x11-wm/cosmic-comp/Makefile
index 77e5eabcad31..a43b4dda5527 100644
--- a/x11-wm/cosmic-comp/Makefile
+++ b/x11-wm/cosmic-comp/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	cosmic-comp
-PORTVERSION=	s20240919
+DISTVERSIONPREFIX=	epoch-
+DISTVERSION=	1.0.0-alpha.2
 CATEGORIES=	x11-wm wayland
 
 MAINTAINER=	jbeich@FreeBSD.org
@@ -22,8 +23,7 @@ USE_GITHUB=	yes
 USE_GL=		gbm
 USE_XORG=	pixman
 GH_ACCOUNT=	pop-os
-GH_TAGNAME=	epoch-1.0.0-alpha.1-71-gd7ca032
-GH_TUPLE=	pop-os:iced:0.4.2-2011-ge31e29e9:iced/../${WRKSRC_crate_iced:T}/iced
+GH_TUPLE=	pop-os:iced:0.4.2-2015-g74e9a62b:iced/../${WRKSRC_crate_iced:T}/iced
 CARGO_FEATURES=	--no-default-features # disable systemd
 PLIST_FILES=	bin/${PORTNAME} \
 		share/cosmic/com.system76.CosmicSettings.Shortcuts/v1/defaults/keybindings.ron \
diff --git a/x11-wm/cosmic-comp/Makefile.crates b/x11-wm/cosmic-comp/Makefile.crates
index 7038ec1bbcde..88f81bcd6b60 100644
--- a/x11-wm/cosmic-comp/Makefile.crates
+++ b/x11-wm/cosmic-comp/Makefile.crates
@@ -616,15 +616,15 @@ CARGO_CRATES=	ab_glyph-0.2.28 \
 		zvariant_utils-2.1.0 \
 		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-text@git+https://github.com/pop-os/cosmic-text.git\#e16b39f29c84773a05457fe39577a602de27855c \
+		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/\#a962865230f3b9ecba40c0c09e9c279e832c9f10 \
 		smithay@git+https://github.com/smithay/smithay?rev=08d31e1\#08d31e17ea4ac47cddeb56e2ac18ee50b331911b \
 		glyphon@git+https://github.com/pop-os/glyphon.git?tag=v0.5.0\#1b0646ff8f74da92d3be704dfc2257d7f4d7eed8 \
-		cosmic-protocols@git+https://github.com/pop-os/cosmic-protocols?branch=main\#de2fead49d6af3a221db153642e4d7c2235aafc4 \
-		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/\#b40839638ab0e1d96de3f817eded647e6952db40 \
 		smithay-egui@git+https://github.com/Smithay/smithay-egui.git?rev=0d0b4ca0\#0d0b4ca01a851b97cd27bdc94cce1c1f52723ad5 \
+		cosmic-text@git+https://github.com/pop-os/cosmic-text.git\#4fe90bb6126c22f589b46768d7754d65ae300c5e \
 		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-clipboard@git+https://github.com/pop-os/smithay-clipboard?tag=pop-dnd-5\#5a3007def49eb678d1144850c9ee04b80707c56a \
-		cosmic-settings-config@git+https://github.com/pop-os/cosmic-settings-daemon\#1ed68808e85ce681da882446ec572d44c68a6866
+		cosmic-settings-config@git+https://github.com/pop-os/cosmic-settings-daemon\#1ed68808e85ce681da882446ec572d44c68a6866 \
+		cosmic-protocols@git+https://github.com/pop-os/cosmic-protocols?branch=main\#91aeb55052a8e6e15a7ddd53e039a9350f16fa69
diff --git a/x11-wm/cosmic-comp/distinfo b/x11-wm/cosmic-comp/distinfo
index 882b0f228171..8b98c74002fa 100644
--- a/x11-wm/cosmic-comp/distinfo
+++ b/x11-wm/cosmic-comp/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1726755805
+TIMESTAMP = 1727082801
 SHA256 (rust/crates/ab_glyph-0.2.28.crate) = 79faae4620f45232f599d9bc7b290f88247a0834162c4495ab2f02d60004adfb
 SIZE (rust/crates/ab_glyph-0.2.28.crate) = 19965
 SHA256 (rust/crates/ab_glyph_rasterizer-0.1.8.crate) = c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046
@@ -1235,18 +1235,16 @@ 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-cosmic-text-e16b39f29c84773a05457fe39577a602de27855c_GH0.tar.gz) = fd7f33340c4c423bc26df1a55124f2adfacacf3eddc83121427b301aabb2c870
-SIZE (pop-os-cosmic-text-e16b39f29c84773a05457fe39577a602de27855c_GH0.tar.gz) = 180530
+SHA256 (pop-os-libcosmic-a962865230f3b9ecba40c0c09e9c279e832c9f10_GH0.tar.gz) = e9ab7504b4b0a3e7d8abc2a3ba1660c12fbdd0cf0d34d2bebeca36a48b27ac4b
+SIZE (pop-os-libcosmic-a962865230f3b9ecba40c0c09e9c279e832c9f10_GH0.tar.gz) = 1103116
 SHA256 (smithay-smithay-08d31e17ea4ac47cddeb56e2ac18ee50b331911b_GH0.tar.gz) = 04851d30d21b354ba4a4f614e190df44c2d27fa83eba060707d05d473e63ed26
 SIZE (smithay-smithay-08d31e17ea4ac47cddeb56e2ac18ee50b331911b_GH0.tar.gz) = 736988
 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-cosmic-protocols-de2fead49d6af3a221db153642e4d7c2235aafc4_GH0.tar.gz) = 70cbd895e8e74efb4fe6cdeab4eaa4443942ec41861b5f9821e19a60aee961d3
-SIZE (pop-os-cosmic-protocols-de2fead49d6af3a221db153642e4d7c2235aafc4_GH0.tar.gz) = 44046
-SHA256 (pop-os-libcosmic-b40839638ab0e1d96de3f817eded647e6952db40_GH0.tar.gz) = eccc2ae305c34f2e6bc0444b2f10b6dcecdbb02faa2bfb8a2d0d2e46158f1b70
-SIZE (pop-os-libcosmic-b40839638ab0e1d96de3f817eded647e6952db40_GH0.tar.gz) = 1100305
 SHA256 (Smithay-smithay-egui-0d0b4ca01a851b97cd27bdc94cce1c1f52723ad5_GH0.tar.gz) = f6cfcfd84d6162d984b028e2ccaf45d0f0c629d39daf67b0ec123eaf95252c84
 SIZE (Smithay-smithay-egui-0d0b4ca01a851b97cd27bdc94cce1c1f52723ad5_GH0.tar.gz) = 11132
+SHA256 (pop-os-cosmic-text-4fe90bb6126c22f589b46768d7754d65ae300c5e_GH0.tar.gz) = 155b2ee305ac73339e4d37056efb2b56587afbfd28f2439cdd237563ce54c35b
+SIZE (pop-os-cosmic-text-4fe90bb6126c22f589b46768d7754d65ae300c5e_GH0.tar.gz) = 182952
 SHA256 (pop-os-window_clipboard-pop-dnd-8_GH0.tar.gz) = e44be0ca5c716ef753e3344cd06d167e7e84fa366058a71fce01c645e1d6f616
 SIZE (pop-os-window_clipboard-pop-dnd-8_GH0.tar.gz) = 24267
 SHA256 (jackpot51-rust-atomicwrites-043ab4859d53ffd3d55334685303d8df39c9f768_GH0.tar.gz) = 95ce4266b50ce6470ba74a5a9ce718bbfba45bf5ab43786db05be1682f6f0db1
@@ -1259,7 +1257,9 @@ SHA256 (pop-os-smithay-clipboard-pop-dnd-5_GH0.tar.gz) = 5e871e450991b94b8c09bc0
 SIZE (pop-os-smithay-clipboard-pop-dnd-5_GH0.tar.gz) = 22877
 SHA256 (pop-os-cosmic-settings-daemon-1ed68808e85ce681da882446ec572d44c68a6866_GH0.tar.gz) = 4fe7a80a7b63bd095be0218e3cc458ca3b802812ba0553c821f4d6e3398ac303
 SIZE (pop-os-cosmic-settings-daemon-1ed68808e85ce681da882446ec572d44c68a6866_GH0.tar.gz) = 68980
-SHA256 (pop-os-cosmic-comp-s20240919-epoch-1.0.0-alpha.1-71-gd7ca032_GH0.tar.gz) = 177df2da9064e74dd70bf691b2caf12a4c2bcc124eaf03a025360801372f184c
-SIZE (pop-os-cosmic-comp-s20240919-epoch-1.0.0-alpha.1-71-gd7ca032_GH0.tar.gz) = 387829
-SHA256 (pop-os-iced-0.4.2-2011-ge31e29e9_GH0.tar.gz) = fb03bc7d15efe698f7fda13ee3bdb488e356a934a46242328d08715d939dc7a1
-SIZE (pop-os-iced-0.4.2-2011-ge31e29e9_GH0.tar.gz) = 4684342
+SHA256 (pop-os-cosmic-protocols-91aeb55052a8e6e15a7ddd53e039a9350f16fa69_GH0.tar.gz) = c5b57625796a1d8f010e9c6e40a0a02d56978f26a0a3ba5be9156c678be76166
+SIZE (pop-os-cosmic-protocols-91aeb55052a8e6e15a7ddd53e039a9350f16fa69_GH0.tar.gz) = 43325
+SHA256 (pop-os-cosmic-comp-epoch-1.0.0-alpha.2_GH0.tar.gz) = 557a22743ff51fd2e051ad55f871fcd27af1a245ca31dc2aaf10d140491486e3
+SIZE (pop-os-cosmic-comp-epoch-1.0.0-alpha.2_GH0.tar.gz) = 391713
+SHA256 (pop-os-iced-0.4.2-2015-g74e9a62b_GH0.tar.gz) = 4f9090765ea72b9ced97dc0be64592c97260eb6053f49a4a860215ea3d86ae1e
+SIZE (pop-os-iced-0.4.2-2015-g74e9a62b_GH0.tar.gz) = 4684574
diff --git a/x11-wm/cosmic-comp/files/patch-Cargo.lock b/x11-wm/cosmic-comp/files/patch-Cargo.lock
new file mode 100644
index 000000000000..6abc94c11c4f
--- /dev/null
+++ b/x11-wm/cosmic-comp/files/patch-Cargo.lock
@@ -0,0 +1,49 @@
+Avoid multiple different copies of libcosmic breaking USES=cargo
+
+--- Cargo.lock.orig	2024-09-23 09:13:21 UTC
++++ Cargo.lock
+@@ -886,7 +886,7 @@ version = "0.1.0"
+ [[package]]
+ name = "cosmic-config"
+ version = "0.1.0"
+-source = "git+https://github.com/pop-os/libcosmic/#af68a3f660402b850dfd00041372d964d3b098d7"
++source = "git+https://github.com/pop-os/libcosmic/#a962865230f3b9ecba40c0c09e9c279e832c9f10"
+ dependencies = [
+  "atomicwrites",
+  "calloop 0.14.1",
+@@ -905,7 +905,7 @@ version = "0.1.0"
+ [[package]]
+ name = "cosmic-config-derive"
+ version = "0.1.0"
+-source = "git+https://github.com/pop-os/libcosmic/#af68a3f660402b850dfd00041372d964d3b098d7"
++source = "git+https://github.com/pop-os/libcosmic/#a962865230f3b9ecba40c0c09e9c279e832c9f10"
+ dependencies = [
+  "quote",
+  "syn 1.0.109",
+@@ -940,7 +940,7 @@ version = "0.12.1"
+ [[package]]
+ name = "cosmic-text"
+ version = "0.12.1"
+-source = "git+https://github.com/pop-os/cosmic-text.git#e8f567cf5b456dfab749a575c257acaa36f622d9"
++source = "git+https://github.com/pop-os/cosmic-text.git#4fe90bb6126c22f589b46768d7754d65ae300c5e"
+ dependencies = [
+  "bitflags 2.6.0",
+  "fontdb",
+@@ -963,7 +963,7 @@ version = "0.1.0"
+ [[package]]
+ name = "cosmic-theme"
+ version = "0.1.0"
+-source = "git+https://github.com/pop-os/libcosmic/#af68a3f660402b850dfd00041372d964d3b098d7"
++source = "git+https://github.com/pop-os/libcosmic/#a962865230f3b9ecba40c0c09e9c279e832c9f10"
+ dependencies = [
+  "almost",
+  "cosmic-config",
+@@ -2792,7 +2792,7 @@ version = "0.1.0"
+ [[package]]
+ name = "libcosmic"
+ version = "0.1.0"
+-source = "git+https://github.com/pop-os/libcosmic/#af68a3f660402b850dfd00041372d964d3b098d7"
++source = "git+https://github.com/pop-os/libcosmic/#a962865230f3b9ecba40c0c09e9c279e832c9f10"
+ dependencies = [
+  "apply",
+  "chrono",
diff --git a/x11-wm/cosmic-comp/files/patch-no-systemd b/x11-wm/cosmic-comp/files/patch-no-systemd
index 8aac3b483513..ac2a59551579 100644
--- a/x11-wm/cosmic-comp/files/patch-no-systemd
+++ b/x11-wm/cosmic-comp/files/patch-no-systemd
@@ -12,9 +12,9 @@ Avoid various systemd dependencies
  DesktopNames=pop:COSMIC
  X-GDM-SessionRegisters=false
 \ No newline at end of file
---- src/main.rs.orig	2024-01-29 00:48:40 UTC
+--- src/main.rs.orig	2024-09-23 09:13:21 UTC
 +++ src/main.rs
-@@ -35,6 +35,11 @@ fn main() -> Result<()> {
+@@ -87,6 +87,11 @@ fn main() -> Result<()> {
      logger::init_logger()?;
      info!("Cosmic starting up!");
  
@@ -23,6 +23,6 @@ Avoid various systemd dependencies
 +    // Mimic wlroots, used by https://github.com/qt/qtbase/commit/4b4870a12cd9
 +    std::env::set_var("XDG_SESSION_TYPE", "wayland");
 +
-     // init event loop
-     let mut event_loop = EventLoop::try_new().with_context(|| "Failed to initialize event loop")?;
-     // init wayland
+     #[cfg(feature = "profile-with-tracy")]
+     profiling::tracy_client::Client::start();
+     profiling::register_thread!("Main Thread");