Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 9 Sep 2024 23:56:58 GMT
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: df37f88be54f - main - x11-wm/cosmic-comp: update to s20240909
Message-ID:  <202409092356.489NuwsM043674@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by jbeich:

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

commit df37f88be54f944cc6900774ce7cdc0c16232459
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2024-09-09 18:12:10 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2024-09-09 23:56:25 +0000

    x11-wm/cosmic-comp: update to s20240909
    
    Changes:        https://github.com/pop-os/cosmic-comp/compare/07f8985...0d048b1
---
 x11-wm/cosmic-comp/Makefile        | 11 ++++++-----
 x11-wm/cosmic-comp/Makefile.crates |  4 ++--
 x11-wm/cosmic-comp/distinfo        | 10 +++++-----
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/x11-wm/cosmic-comp/Makefile b/x11-wm/cosmic-comp/Makefile
index 85db1d65cc74..f0585f1b0893 100644
--- a/x11-wm/cosmic-comp/Makefile
+++ b/x11-wm/cosmic-comp/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	cosmic-comp
-PORTVERSION=	s20240902
+PORTVERSION=	s20240909
 CATEGORIES=	x11-wm wayland
 
 MAINTAINER=	jbeich@FreeBSD.org
@@ -22,11 +22,12 @@ USE_GITHUB=	yes
 USE_GL=		gbm
 USE_XORG=	pixman
 GH_ACCOUNT=	pop-os
-GH_TAGNAME=	epoch-1.0.0-alpha.1-37-g07f8985
+GH_TAGNAME=	epoch-1.0.0-alpha.1-56-g0d048b1
 GH_TUPLE=	pop-os:iced:0.4.2-2011-ge31e29e9: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 \
+		share/cosmic/com.system76.CosmicSettings.WindowRules/v1/tiling_exception_defaults/tiling-exceptions.ron \
 		share/wayland-sessions/${PORTNAME:S/-comp//}.desktop \
 
 .if ${MACHINE_ARCH} == i386 || ${MACHINE_ARCH:Marmv?}
@@ -49,10 +50,10 @@ post-patch:
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 # Install extras similar to ${WRKSRC}/Makefile
-.for f in data/*.desktop data/*.ron
-	${MKDIR} ${STAGEDIR}${PREFIX}/${PLIST_FILES:M*.${f:E}:H}
+.for f in ${PLIST_FILES:Nbin/*:T:S,^,data/,}
+	${MKDIR} ${STAGEDIR}${PREFIX}/${PLIST_FILES:M*${f:T}:H}
 	${INSTALL_DATA} ${WRKSRC}/${f} \
-		${STAGEDIR}${PREFIX}/${PLIST_FILES:M*.${f:E}}
+		${STAGEDIR}${PREFIX}/${PLIST_FILES:M*${f:T}}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/x11-wm/cosmic-comp/Makefile.crates b/x11-wm/cosmic-comp/Makefile.crates
index 564fb168a724..5cdcd49140d8 100644
--- a/x11-wm/cosmic-comp/Makefile.crates
+++ b/x11-wm/cosmic-comp/Makefile.crates
@@ -626,6 +626,6 @@ CARGO_CRATES=	ab_glyph-0.2.28 \
 		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 \
-		cosmic-settings-config@git+https://github.com/pop-os/cosmic-settings-daemon\#362c77f9faaeb7f1b9e4aa79a7d5588001f04874 \
 		smithay-clipboard@git+https://github.com/pop-os/smithay-clipboard?tag=pop-dnd-5\#5a3007def49eb678d1144850c9ee04b80707c56a \
-		smithay@git+https://github.com/smithay/smithay?rev=65c4abf\#65c4abf4cbdf122abff96ad17a440c76a8cf7cea
+		smithay@git+https://github.com/smithay/smithay?rev=65c4abf\#65c4abf4cbdf122abff96ad17a440c76a8cf7cea \
+		cosmic-settings-config@git+https://github.com/pop-os/cosmic-settings-daemon\#1ed68808e85ce681da882446ec572d44c68a6866
diff --git a/x11-wm/cosmic-comp/distinfo b/x11-wm/cosmic-comp/distinfo
index 7cfc2e4b37f0..fca4d9b8d150 100644
--- a/x11-wm/cosmic-comp/distinfo
+++ b/x11-wm/cosmic-comp/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1725302663
+TIMESTAMP = 1725905530
 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
@@ -1255,13 +1255,13 @@ SHA256 (Drakulix-id-tree-632a57d6d49160e18d7300fa7edae52281ec5482_GH0.tar.gz) =
 SIZE (Drakulix-id-tree-632a57d6d49160e18d7300fa7edae52281ec5482_GH0.tar.gz) = 29608
 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-cosmic-settings-daemon-362c77f9faaeb7f1b9e4aa79a7d5588001f04874_GH0.tar.gz) = a9de91aa66248c8c3efef5515cee5ee2a122206490a82b68f60b6e51f3d38938
-SIZE (pop-os-cosmic-settings-daemon-362c77f9faaeb7f1b9e4aa79a7d5588001f04874_GH0.tar.gz) = 68300
 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 (smithay-smithay-65c4abf4cbdf122abff96ad17a440c76a8cf7cea_GH0.tar.gz) = 2cbac56b072d82a7542f89336b487580192be4156fd3e6d4b278277902be4b7c
 SIZE (smithay-smithay-65c4abf4cbdf122abff96ad17a440c76a8cf7cea_GH0.tar.gz) = 764683
-SHA256 (pop-os-cosmic-comp-s20240902-epoch-1.0.0-alpha.1-37-g07f8985_GH0.tar.gz) = 7376708d62764089708dc3228a6e6c9fceb987dc2ad25b6e43b45d8541c9768e
-SIZE (pop-os-cosmic-comp-s20240902-epoch-1.0.0-alpha.1-37-g07f8985_GH0.tar.gz) = 381087
+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-s20240909-epoch-1.0.0-alpha.1-56-g0d048b1_GH0.tar.gz) = 3860b599d49b2398a744d7ad74133c5219f8c7a9cf257e05d5651e95be578a4c
+SIZE (pop-os-cosmic-comp-s20240909-epoch-1.0.0-alpha.1-56-g0d048b1_GH0.tar.gz) = 386533
 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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202409092356.489NuwsM043674>