Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 3 Aug 2023 21:41:52 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: 6312e4808912 - main - x11-toolkits/wlroots-devel: update to 0.16.0.681
Message-ID:  <202308032141.373Lfq3b048583@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=6312e4808912fc8a6f10cabb867aad110c6f5abd

commit 6312e4808912fc8a6f10cabb867aad110c6f5abd
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2023-08-03 14:40:28 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2023-08-03 21:41:39 +0000

    x11-toolkits/wlroots-devel: update to 0.16.0.681
    
    Changes:        https://gitlab.freedesktop.org/wlroots/wlroots/-/compare/d40bcfe2c1...c74f89d4f8
---
 x11-toolkits/wlroots-devel/Makefile | 4 ++--
 x11-toolkits/wlroots-devel/distinfo | 6 +++---
 x11-wm/hyprland/Makefile            | 9 +++++++++
 x11-wm/hyprland/distinfo            | 2 ++
 4 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/x11-toolkits/wlroots-devel/Makefile b/x11-toolkits/wlroots-devel/Makefile
index e8d0a582d793..9bd738ab5e8a 100644
--- a/x11-toolkits/wlroots-devel/Makefile
+++ b/x11-toolkits/wlroots-devel/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	wlroots
-DISTVERSION=	0.16.0-677
-DISTVERSIONSUFFIX=	-gd40bcfe2c1
+DISTVERSION=	0.16.0-681
+DISTVERSIONSUFFIX=	-gc74f89d4f8
 CATEGORIES=	x11-toolkits
 PKGNAMESUFFIX=	-devel
 
diff --git a/x11-toolkits/wlroots-devel/distinfo b/x11-toolkits/wlroots-devel/distinfo
index 2110441f8b32..48633601e3c9 100644
--- a/x11-toolkits/wlroots-devel/distinfo
+++ b/x11-toolkits/wlroots-devel/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1690546897
-SHA256 (wlroots-0.16.0-677-gd40bcfe2c1.tar.bz2) = 1b4207e329d0f2b5ab6ec441029572c1748ca6305509445059f33144a0579320
-SIZE (wlroots-0.16.0-677-gd40bcfe2c1.tar.bz2) = 475552
+TIMESTAMP = 1691073628
+SHA256 (wlroots-0.16.0-681-gc74f89d4f8.tar.bz2) = 1646610e3ff533a4110d9f9297d45975c3820aa026229ed5bc5b01073ca35a6d
+SIZE (wlroots-0.16.0-681-gc74f89d4f8.tar.bz2) = 476133
 SHA256 (10f80a8f1bb2.patch) = ca65f8eecf32e7364d5ba43cd9ee91060710a6fb8392892c86ad71e4f2a4c0b5
 SIZE (10f80a8f1bb2.patch) = 6097
 SHA256 (3196c73d487f.patch) = 69c6bc4658852bb45a24b129f625a7faaed8035dab0d79c388ae74d650beacdc
diff --git a/x11-wm/hyprland/Makefile b/x11-wm/hyprland/Makefile
index 104c75d5db1b..2dd84563684a 100644
--- a/x11-wm/hyprland/Makefile
+++ b/x11-wm/hyprland/Makefile
@@ -9,6 +9,7 @@ PATCHFILES+=	9fc5f4c48b20.patch:-p1 # https://github.com/hyprwm/Hyprland/pull/26
 PATCHFILES+=	f6b340cc19d2.patch:-p1 # https://github.com/hyprwm/Hyprland/pull/2799
 PATCHFILES+=	f5913135c638.patch:-p1 # cursor-shape-v1
 PATCHFILES+=	7a2027d1fd5d.patch:-p1 # https://github.com/hyprwm/Hyprland/issues/2828
+PATCHFILES+=	7d98181ade0a.patch:-p1 # https://github.com/hyprwm/Hyprland/pull/2884
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Dynamic tiling Wayland compositor that doesn't sacrifice on its looks #'
@@ -43,6 +44,14 @@ OPTIONS_DEFAULT=X11
 X11_USE=		XORG=xcb
 X11_MESON_ENABLED=	xwayland
 
+post-extract:
+.if defined(PATCHFILES) && ${PATCHFILES:M7d98181ade0a*}
+# Pretend to be a regular file for vendor patch to apply as is
+	@${RMDIR} ${WRKSRC}/subprojects/wlroots
+	@${ECHO_CMD} "Subproject commit e8d545a9770a2473db32e0a0bfa757b05d2af4f3" \
+		>${WRKSRC}/subprojects/wlroots
+.endif
+
 post-patch:
 # Extract (snapshot) version from the port instead of meson.build
 	@${REINPLACE_CMD} -i .nogit -e "/GIT_BRANCH/s/run_command.*/'main'/" \
diff --git a/x11-wm/hyprland/distinfo b/x11-wm/hyprland/distinfo
index 13f464ef5327..c147d27e7154 100644
--- a/x11-wm/hyprland/distinfo
+++ b/x11-wm/hyprland/distinfo
@@ -15,3 +15,5 @@ SHA256 (f5913135c638.patch) = 5ce790d91b4918f77dfa67cf3f42a129a1dbef20f8906facb8
 SIZE (f5913135c638.patch) = 9018
 SHA256 (7a2027d1fd5d.patch) = dcf2e5b2233077c3b35dd1191ea672104e0f7632a6310a8c4661933444d13819
 SIZE (7a2027d1fd5d.patch) = 1916
+SHA256 (7d98181ade0a.patch) = d94c45c2abeb4d3b96c058e31d2c2090cdaf934a6f289846e9c4050c54b25c23
+SIZE (7d98181ade0a.patch) = 1195



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