git: 43c381539b15 - 2023Q3 - x11-toolkits/wlroots-devel: update to 0.16.0.681

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Jan Beich <jbeich_at_FreeBSD.org>
Date: Thu, 03 Aug 2023 21:44:54 UTC
The branch 2023Q3 has been updated by jbeich:

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

commit 43c381539b15f7aeff2633513be1acf1c62eeb60
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:43:39 +0000

    x11-toolkits/wlroots-devel: update to 0.16.0.681
    
    Changes:        https://gitlab.freedesktop.org/wlroots/wlroots/-/compare/d40bcfe2c1...c74f89d4f8
    (cherry picked from commit 6312e4808912fc8a6f10cabb867aad110c6f5abd)
---
 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 aec6d7a1d033..2a4fe54fa346 100644
--- a/x11-toolkits/wlroots-devel/Makefile
+++ b/x11-toolkits/wlroots-devel/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	wlroots
-DISTVERSION=	0.16.0-677
+DISTVERSION=	0.16.0-681
 DISTVERSIONSUFFIX=	-g${GL_COMMIT:C/(.{12}).*/\1/}
 CATEGORIES=	x11-toolkits
 PKGNAMESUFFIX=	-devel
@@ -27,7 +27,7 @@ USE_GL=		gbm
 USE_XORG=	pixman
 USE_LDCONFIG=	yes
 GL_SITE=	https://gitlab.freedesktop.org
-GL_COMMIT=	d40bcfe2c18f057f4bc324a81230f6ba2267db44
+GL_COMMIT=	c74f89d4f84bfed0284d3908aee5d207698c70c5
 MESON_ARGS=	-Dexamples=false -Dbackends=${BACKENDS:ts,} -Drenderers=${RENDERERS:ts,}
 
 .ifdef PKGNAMESUFFIX
diff --git a/x11-toolkits/wlroots-devel/distinfo b/x11-toolkits/wlroots-devel/distinfo
index 68bd6d44ef37..994bc5acbe27 100644
--- a/x11-toolkits/wlroots-devel/distinfo
+++ b/x11-toolkits/wlroots-devel/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1690546897
-SHA256 (wlroots-wlroots-d40bcfe2c18f057f4bc324a81230f6ba2267db44_GL0.tar.gz) = 407018b74fb45cbc1b72916c115185c280b478a8e534468aaac0243a394ef9c1
-SIZE (wlroots-wlroots-d40bcfe2c18f057f4bc324a81230f6ba2267db44_GL0.tar.gz) = 635499
+TIMESTAMP = 1691073628
+SHA256 (wlroots-wlroots-c74f89d4f84bfed0284d3908aee5d207698c70c5_GL0.tar.gz) = a9b6687915f5b5b7e80cdddc601fc6faf1467f89811c2e11610e751018e4a586
+SIZE (wlroots-wlroots-c74f89d4f84bfed0284d3908aee5d207698c70c5_GL0.tar.gz) = 635433
 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