diff --git a/x11-wm/phoc/Makefile b/x11-wm/phoc/Makefile index c4c00d4476cc..985837edb714 100644 --- a/x11-wm/phoc/Makefile +++ b/x11-wm/phoc/Makefile @@ -1,45 +1,45 @@ PORTNAME= phoc DISTVERSIONPREFIX= v -DISTVERSION= 0.34.0_beta1 +DISTVERSION= 0.35.0 CATEGORIES= x11-wm wayland MAINTAINER= jbeich@FreeBSD.org COMMENT= Phone compositor WWW= https://gitlab.gnome.org/World/Phosh/phoc LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ wayland-protocols>=1.15:graphics/wayland-protocols \ 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 \ libinput.so:x11/libinput \ 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 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.4-5-g5ae8f59:gmobile/subprojects/gmobile +GL_TUPLE= World/Phosh:gmobile:v0.0.4-7-gd5ed9ed: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 OPTIONS_DEFINE= MANPAGES OPTIONS_DEFAULT=MANPAGES MANPAGES_BUILD_DEPENDS= rst2man:textproc/py-docutils MANPAGES_MESON_TRUE= man MANPAGES_PLIST_FILES= man/man1/${PORTNAME}.1.gz .include diff --git a/x11-wm/phoc/distinfo b/x11-wm/phoc/distinfo index c62a272d22e2..656201105511 100644 --- a/x11-wm/phoc/distinfo +++ b/x11-wm/phoc/distinfo @@ -1,5 +1,5 @@ -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 +TIMESTAMP = 1704534864 +SHA256 (phoc-v0.35.0.tar.bz2) = 47a2485e2e1fcb03163d57fa244ce35f2c50f41c44d63499a807c6a721759a86 +SIZE (phoc-v0.35.0.tar.bz2) = 226546 +SHA256 (gmobile-v0.0.4-7-gd5ed9ed.tar.bz2) = 12b8b52769e79e4322bf0d537d9d4234a99946aa33923bddb03118130512e4e5 +SIZE (gmobile-v0.0.4-7-gd5ed9ed.tar.bz2) = 39637 diff --git a/x11-wm/phoc/files/patch-helpers_tracing_meson.build b/x11-wm/phoc/files/patch-helpers_tracing_meson.build new file mode 100644 index 000000000000..55241ee783d6 --- /dev/null +++ b/x11-wm/phoc/files/patch-helpers_tracing_meson.build @@ -0,0 +1,13 @@ +Error: Orphaned: %%DATADIR%%/systemtap/activation.stp +Error: Orphaned: %%DATADIR%%/systemtap/direct-scanout.stp +Error: Orphaned: %%DATADIR%%/systemtap/render-loop.stp + +--- helpers/tracing/meson.build.orig 2024-01-06 09:54:24 UTC ++++ helpers/tracing/meson.build +@@ -4,4 +4,6 @@ stp_scripts = [ + 'render-loop.stp', + ] + ++if not get_option('dtrace').disabled() + install_data(stp_scripts, install_dir : pkgdatadir / 'systemtap' ) ++endif diff --git a/x11-wm/phoc/files/patch-meson.build b/x11-wm/phoc/files/patch-meson.build deleted file mode 100644 index f4f7536a4968..000000000000 --- a/x11-wm/phoc/files/patch-meson.build +++ /dev/null @@ -1,13 +0,0 @@ -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'