diff --git a/x11-wm/mango/Makefile b/x11-wm/mango/Makefile index 34ceea75e4c1..b570cc15bc3c 100644 --- a/x11-wm/mango/Makefile +++ b/x11-wm/mango/Makefile @@ -1,46 +1,48 @@ PORTNAME= mango -DISTVERSION= 0.16.3 +DISTVERSION= 0.17.0 PORTREVISION= 0 CATEGORIES= x11-wm MAINTAINER= nivit@FreeBSD.org COMMENT= Lightweight, high-performance Wayland compositor built on dwl WWW= https://mangowm.github.io/ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= hwdata>=0.399:misc/hwdata \ +BUILD_DEPENDS= evdev-proto>=5.8:devel/evdev-proto \ + hwdata>=0.399:misc/hwdata \ wayland-protocols>=1.24:graphics/wayland-protocols LIB_DEPENDS= libcjson.so:devel/libcjson \ + libdrm.so:graphics/libdrm \ libinput.so:x11/libinput \ libpcre2-8.so:devel/pcre2 \ libpixman-1.so:x11/pixman \ libscenefx-0.5.so:x11-toolkits/scenefx05 \ libwayland-server.so:graphics/wayland \ libwlroots-0.20.so:x11-toolkits/wlroots020 \ libxcb-icccm.so:x11/xcb-util-wm \ libxkbcommon.so:x11/libxkbcommon RUN_DEPENDS= hwdata>=0.399:misc/hwdata \ Xwayland:x11-servers/xwayland USES= gnome meson pkgconfig USE_GITHUB= yes GH_ACCOUNT= mangowm USE_GNOME= cairo glib20 pango MESON_ARGS= -Dsysconfdir=${PREFIX}/etc SUB_FILES= pkg-message OPTIONS_DEFINE= DOCS post-patch: @${REINPLACE_CMD} -E -e "s|(assets/(config.conf))|\1', rename : '\2.sample|1" \ ${WRKSRC}/meson.build post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) .include diff --git a/x11-wm/mango/distinfo b/x11-wm/mango/distinfo index c2806a8a854a..1afabc8b75e8 100644 --- a/x11-wm/mango/distinfo +++ b/x11-wm/mango/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1788557425 -SHA256 (mangowm-mango-0.16.3_GH0.tar.gz) = a1db5ca86c7f7af9514f3e91e760aeb3734f3a8f60e86637d8a92d9c5c1bab76 -SIZE (mangowm-mango-0.16.3_GH0.tar.gz) = 545032 +TIMESTAMP = 1789248558 +SHA256 (mangowm-mango-0.17.0_GH0.tar.gz) = 9246b8e49cd0d9953952af8750ef8db83dd947cbcee4e2bdec722b3ca3bde46c +SIZE (mangowm-mango-0.17.0_GH0.tar.gz) = 577948 diff --git a/x11-wm/mango/files/patch-meson.build b/x11-wm/mango/files/patch-meson.build index 8aec00d03050..888733766fba 100644 --- a/x11-wm/mango/files/patch-meson.build +++ b/x11-wm/mango/files/patch-meson.build @@ -1,32 +1,32 @@ ---- meson.build.orig 2026-05-29 13:04:35 UTC +--- meson.build.orig 2026-09-12 12:52:03 UTC +++ meson.build @@ -12,12 +12,16 @@ endif endif endif +osname = build_machine.system() + prefix = get_option('prefix') sysconfdir = get_option('sysconfdir') - # 如果 sysconfdir 以 prefix 开头,去掉 prefix + # If sysconfdir starts with prefix, strip the prefix. -if sysconfdir.startswith(prefix) and not is_nixos - sysconfdir = sysconfdir.substring(prefix.length()) +if sysconfdir.startswith(prefix) and not is_nixos and osname != 'freebsd' + # this fails with: Unknown method "length" in object <[OptionStringHolder] holds [OptionString] + # sysconfdir = sysconfdir.substring(prefix.length()) + sysconfdir = sysconfdir.replace(prefix, '') - # 确保 sysconfdir 是绝对路径 + # Ensure sysconfdir is an absolute path. if not sysconfdir.startswith('/') sysconfdir = '/' + sysconfdir @@ -72,9 +76,8 @@ c_args = [ - '-g', '-Wno-unused-function', + '-Wno-unused-result', '-DWLR_USE_UNSTABLE', - '-D_POSIX_C_SOURCE=200809L', '-DVERSION="@0@"'.format(version_with_hash), - '-DSYSCONFDIR="@0@"'.format('/etc'), + '-DSYSCONFDIR="@0@"'.format(sysconfdir), ] - # 仅在 debug 选项启用时添加调试参数 + # add debug args only when debug option is enabled diff --git a/x11-wm/mango/files/patch-src_dispatch_bind.c b/x11-wm/mango/files/patch-src_dispatch_bind.c new file mode 100644 index 000000000000..b0c298824093 --- /dev/null +++ b/x11-wm/mango/files/patch-src_dispatch_bind.c @@ -0,0 +1,11 @@ +--- src/dispatch/bind.c.orig 2026-09-12 12:52:03 UTC ++++ src/dispatch/bind.c +@@ -1224,7 +1224,7 @@ static void close_inherited_fds(void) { + + static void close_inherited_fds(void) { + #ifdef SYS_close_range +- extern long syscall(long number, ...); ++ extern long syscall(int number, ...); + if (syscall(SYS_close_range, 3, ~0U, 0) == 0) + return; + #endif diff --git a/x11-wm/mango/files/patch-src_dispatch_bind__define.h b/x11-wm/mango/files/patch-src_dispatch_bind__define.h deleted file mode 100644 index 9b487c8d61f8..000000000000 --- a/x11-wm/mango/files/patch-src_dispatch_bind__define.h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/dispatch/bind_define.h.orig 2026-09-04 03:02:04 UTC -+++ src/dispatch/bind_define.h -@@ -1111,7 +1111,7 @@ static void close_inherited_fds(void) { - - static void close_inherited_fds(void) { - #ifdef SYS_close_range -- extern long syscall(long number, ...); -+ extern int syscall(int number, ...); - if (syscall(SYS_close_range, 3, ~0U, 0) == 0) - return; - #endif diff --git a/x11-wm/mango/files/patch-src_mango.c b/x11-wm/mango/files/patch-src_mango.c deleted file mode 100644 index 74928770b279..000000000000 --- a/x11-wm/mango/files/patch-src_mango.c +++ /dev/null @@ -1,14 +0,0 @@ ---- src/mango.c.orig 2026-08-27 06:44:37 UTC -+++ src/mango.c -@@ -9,7 +9,11 @@ - #include - #include - #include -+#ifdef __FreeBSD__ -+#include -+#else - #include -+#endif - #include - #include - #include