x11-wm/hyprland: unbreak after 239d3a1

freebsd · Oct 25, 2023 · 1adefe1 · 1adefe1
1 parent 239d3a1
commit 1adefe1
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/x11-wm/hyprland/Makefile b/x11-wm/hyprland/Makefile
@@ -1,10 +1,12 @@
 PORTNAME=	hyprland
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.31.0
+PORTREVISION=	1
 CATEGORIES=	x11-wm wayland
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
 PATCHFILES+=	913c8b81ad44.patch:-p1 # https://github.com/hyprwm/Hyprland/pull/3589
+PATCHFILES+=	df00727310b8.patch:-p1 # wlroots 0.17
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Dynamic tiling Wayland compositor that doesn't sacrifice on its looks #'
@@ -13,13 +15,12 @@ WWW=		https://hyprland.org/
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BROKEN=		fails to build after https://gitlab.freedesktop.org/wlroots/wlroots/-/commit/a289f812d620
 BROKEN_FreeBSD_12=	libc++ too old
 
 BUILD_DEPENDS=	cmake:devel/cmake-core \
 		evdev-proto>0:devel/evdev-proto \
 		wayland-protocols>=1.25:graphics/wayland-protocols \
-		wlroots>=0.16.0.739<0.17.0:x11-toolkits/wlroots
+		wlroots>=0.16.0.791<0.17.0:x11-toolkits/wlroots
 LIB_DEPENDS=	libwayland-server.so:graphics/wayland \
 		libwlroots.so:x11-toolkits/wlroots \
 		libinput.so:x11/libinput \
@@ -47,6 +48,14 @@ OPTIONS_DEFAULT=X11
 X11_USE=		XORG=xcb
 X11_MESON_ENABLED=	xwayland
 
+post-extract:
+.if defined(PATCHFILES) && ${PATCHFILES:Mdf00727310b8*}
+# Pretend to be a regular file for vendor patch to apply as is
+	@${RMDIR} ${WRKSRC}/subprojects/wlroots
+	@${ECHO_CMD} "Subproject commit 3406c1b17a4a7e6d4e2a7d9c1176affa72bce1bc" \
+		>${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
@@ -9,3 +9,5 @@ SHA256 (llvm-llvm-project-llvmorg-16.0.1_GH0.tar.gz) = b5a9ff1793b1e2d388a3819bf
 SIZE (llvm-llvm-project-llvmorg-16.0.1_GH0.tar.gz) = 179289803
 SHA256 (913c8b81ad44.patch) = 13a150ee6cb0ee7c22b98946deae44cbbec23e642ab7c574514548641486e258
 SIZE (913c8b81ad44.patch) = 1725
+SHA256 (df00727310b8.patch) = 0800ebe83c5265e888cd6f9bb5b6fc4231dfabf36c21d1236a81efbede702f64
+SIZE (df00727310b8.patch) = 5178