git: aa94b9c4dcd4 - main - x11-wm/phoc: update to 0.34.0

The branch main has been updated by jbeich:

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

commit aa94b9c4dcd4f78d13a1a1d6f876342d2d567ba5
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2023-12-05 23:37:43 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2023-12-06 17:06:52 +0000

    x11-wm/phoc: update to 0.34.0
    
    Changes:        https://gitlab.gnome.org/World/Phosh/phoc/-/releases/v0.34.0
    Reported by:    GitLab (notify releases)
---
 x11-wm/phoc/Makefile                | 12 +++++-------
 x11-wm/phoc/distinfo                | 10 +++++-----
 x11-wm/phoc/files/patch-meson.build | 13 +++++++++++++
 3 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/x11-wm/phoc/Makefile b/x11-wm/phoc/Makefile
index f7a25aa36dd9..c4c00d4476cc 100644
--- a/x11-wm/phoc/Makefile
+++ b/x11-wm/phoc/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	phoc
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.33.0
-PORTREVISION=	1
+DISTVERSION=	0.34.0_beta1
 CATEGORIES=	x11-wm wayland
 
 MAINTAINER=	jbeich@FreeBSD.org
@@ -13,7 +12,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	evdev-proto>0:devel/evdev-proto \
 		wayland-protocols>=1.15:graphics/wayland-protocols \
-		wlroots>=0.16.0<0.17.0:x11-toolkits/wlroots
+		wlroots>=0.17.0<0.18.0:x11-toolkits/wlroots
 LIB_DEPENDS=	libjson-glib-1.0.so:devel/json-glib \
 		libwayland-server.so:graphics/wayland \
 		libwlroots.so:x11-toolkits/wlroots \
@@ -21,17 +20,17 @@ LIB_DEPENDS=	libjson-glib-1.0.so:devel/json-glib \
 		libxkbcommon.so:x11/libxkbcommon
 RUN_DEPENDS=	${LOCALBASE}/share/glib-2.0/schemas/org.gnome.mutter.gschema.xml:x11-wm/mutter
 
-USES=		compiler:c11 gettext gl gnome meson pkgconfig python:build shebangfix xorg
+USES=		compiler:c11 gettext gl gnome meson pkgconfig xorg
 USE_GITLAB=	yes
 USE_GL=		glesv2
 USE_GNOME=	cairo gnomedesktop3
 USE_XORG=	pixman xcb
 GL_SITE=	https://gitlab.gnome.org
 GL_ACCOUNT=	World/Phosh
-GL_TUPLE=	World/Phosh:gmobile:v0.0.1-11-gff85498:gmobile/subprojects/gmobile
-SHEBANG_FILES=	build-aux/post_install.py
+GL_TUPLE=	World/Phosh:gmobile:v0.0.4-5-g5ae8f59:gmobile/subprojects/gmobile
 MESON_ARGS=	-Dembed-wlroots=disabled
 PLIST_FILES=	bin/${PORTNAME} \
+		man/man5/${PORTNAME}.ini.5.gz \
 		share/applications/sm.puri.Phoc.desktop \
 		share/icons/hicolor/symbolic/apps/sm.puri.Phoc.svg
 GLIB_SCHEMAS=	sm.puri.phoc.gschema.xml
@@ -43,5 +42,4 @@ MANPAGES_BUILD_DEPENDS=	rst2man:textproc/py-docutils
 MANPAGES_MESON_TRUE=	man
 MANPAGES_PLIST_FILES=	man/man1/${PORTNAME}.1.gz
 
-.include "${.CURDIR:H:H}/x11-toolkits/wlroots016/override.mk"
 .include <bsd.port.mk>
diff --git a/x11-wm/phoc/distinfo b/x11-wm/phoc/distinfo
index 5f3b4fb8b9a0..c62a272d22e2 100644
--- a/x11-wm/phoc/distinfo
+++ b/x11-wm/phoc/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1698486141
-SHA256 (phoc-v0.33.0.tar.bz2) = d348a8c22e30f4168170509d0f4922e20dc752389e630b20718134af7ce08683
-SIZE (phoc-v0.33.0.tar.bz2) = 215097
-SHA256 (gmobile-v0.0.1-11-gff85498.tar.bz2) = a2a8587b03b386da62c22e486fbb752a8913becbc8c45c2aabd43b9e63ed07a7
-SIZE (gmobile-v0.0.1-11-gff85498.tar.bz2) = 20328
+TIMESTAMP = 1701819463
+SHA256 (phoc-v0.34.0_beta1.tar.bz2) = 4c1171b37f0de3dc2dba5509d3f6bbba3c562ed8764cae838a1b67a4d4f05b3a
+SIZE (phoc-v0.34.0_beta1.tar.bz2) = 225061
+SHA256 (gmobile-v0.0.4-5-g5ae8f59.tar.bz2) = 1febb642710331f777e8a3ac5e3825ecd8f20c7bcd9d5e82527a87ee6c2b2b38
+SIZE (gmobile-v0.0.4-5-g5ae8f59.tar.bz2) = 39710
diff --git a/x11-wm/phoc/files/patch-meson.build b/x11-wm/phoc/files/patch-meson.build
new file mode 100644
index 000000000000..f4f7536a4968
--- /dev/null
+++ b/x11-wm/phoc/files/patch-meson.build
@@ -0,0 +1,13 @@
+Dependency wlroots found: NO found 0.17.0 but need: '>= 0.17.0-dev' ; matched: '< 0.18.0'
+
+--- meson.build.orig	2023-12-05 23:37:43 UTC
++++ meson.build
+@@ -70,7 +70,7 @@ else
+ if not embed_wlroots.disabled() and wlroots_proj.found()
+         wlroots = wlroots_proj.get_variable('wlroots')
+ else
+-        wlroots = dependency('wlroots', version: ['>= 0.17.0-dev', '< 0.18.0'])
++        wlroots = dependency('wlroots', version: ['>= 0.17.0', '< 0.18.0'])
+ endif
+ wlroots_has_xwayland = wlroots.get_variable(pkgconfig: 'have_xwayland',
+                                             internal: 'have_xwayland') == 'true'