diff --git a/x11-wm/sway-devel/Makefile b/x11-wm/sway-devel/Makefile index 57229fc1985e..7af886f3d08a 100644 --- a/x11-wm/sway-devel/Makefile +++ b/x11-wm/sway-devel/Makefile @@ -1,72 +1,70 @@ PORTNAME= sway -DISTVERSION?= 1.8.1-183 # git rev-list --count 1.8.1.. -DISTVERSIONSUFFIX?= -gbb91b7f5f +DISTVERSION?= 1.8.1-188 # git rev-list --count 1.8.1.. +DISTVERSIONSUFFIX?= -gbf44690ee CATEGORIES= x11-wm wayland PKGNAMESUFFIX?= -devel PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ PATCHFILES+= cd9d1038a822.patch:-p1 # https://github.com/swaywm/sway/pull/5090 PATCHFILES+= 1f1c83e83a1a.patch:-p1 # https://github.com/swaywm/sway/pull/5090 MAINTAINER= jbeich@FreeBSD.org COMMENT?= i3-compatible Wayland compositor (development snapshot) WWW?= https://swaywm.org/ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN= fails to build after https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/4316 - BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ wayland-protocols>=1.24:graphics/wayland-protocols \ - wlroots>=0.16.0.668<0.17.0:x11-toolkits/wlroots + wlroots>=0.16.0.702<0.17.0:x11-toolkits/wlroots LIB_DEPENDS= libjson-c.so:devel/json-c \ libevdev.so:devel/libevdev \ libudev.so:devel/libudev-devd \ libpcre2-8.so:devel/pcre2 \ libwayland-egl.so:graphics/wayland \ libwlroots.so:x11-toolkits/wlroots \ libinput.so:x11/libinput \ libxkbcommon.so:x11/libxkbcommon USES= compiler:c11 gnome meson pkgconfig xorg USE_GITHUB= yes USE_GNOME= cairo pango USE_XORG= pixman GH_ACCOUNT?= swaywm MESON_ARGS= -Dsd-bus-provider=basu CONFLICTS_INSTALL?= ${PORTNAME} ${PORTNAME}fx OPTIONS_DEFINE= BASU MANPAGES PIXBUF SWAYBG X11 OPTIONS_DEFAULT=BASU MANPAGES PIXBUF SWAYBG X11 OPTIONS_SUB= yes BASU_DESC= Tray in swaybar via basu BASU_LIB_DEPENDS= libbasu.so:devel/basu BASU_MESON_ENABLED= tray MANPAGES_BUILD_DEPENDS= scdoc>=1.9.2:textproc/scdoc MANPAGES_MESON_ENABLED= man-pages PIXBUF_USE= GNOME=gdkpixbuf2 PIXBUF_MESON_ENABLED= gdk-pixbuf SWAYBG_DESC= Default command to set background SWAYBG_RUN_DEPENDS= swaybg:x11/swaybg X11_USE= XORG=xcb X11_LIB_DEPENDS= libxcb-icccm.so:x11/xcb-util-wm X11_MESON_ENABLED= xwayland post-patch: # Let @sample handle default files under etc/ @${REINPLACE_CMD} -e '/config\.in/{ N; s/@BASENAME@/&.sample/; }' \ ${WRKSRC}/meson.build # Extract (snapshot) version from the port instead of meson.build @${REINPLACE_CMD} -i .nogit -e 's/git.found()/false/' \ -e '/project_version/s/@0@/${DISTVERSIONFULL}/' \ ${WRKSRC}/meson.build .include "${.CURDIR:H:H}/x11-toolkits/wlroots-devel/override.mk" .include diff --git a/x11-wm/sway-devel/distinfo b/x11-wm/sway-devel/distinfo index 050213eaad7c..efe5e8568269 100644 --- a/x11-wm/sway-devel/distinfo +++ b/x11-wm/sway-devel/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1690989518 -SHA256 (swaywm-sway-1.8.1-183-gbb91b7f5f_GH0.tar.gz) = cb34e49a5a9f83b023467cb07b702be9456df07d87408448faf34782e6d560b6 -SIZE (swaywm-sway-1.8.1-183-gbb91b7f5f_GH0.tar.gz) = 5580590 +TIMESTAMP = 1693082677 +SHA256 (swaywm-sway-1.8.1-188-gbf44690ee_GH0.tar.gz) = 67e29dc1f31be09da0bf8a3260828a2d69789b09198d7a00c3c1e83bf097a361 +SIZE (swaywm-sway-1.8.1-188-gbf44690ee_GH0.tar.gz) = 5580792 SHA256 (cd9d1038a822.patch) = 266891cbe27a67f81740879dbe39819e3bf0f17b681bdc93087ae05987c2f88d SIZE (cd9d1038a822.patch) = 8968 SHA256 (1f1c83e83a1a.patch) = 59d24c7e69a871d92b65095c46fc994900440453064dd70ffc7de2f0ff728655 SIZE (1f1c83e83a1a.patch) = 2701