diff --git a/x11-wm/sway/Makefile b/x11-wm/sway/Makefile index e22477c2ed09..be391bfcf8bc 100644 --- a/x11-wm/sway/Makefile +++ b/x11-wm/sway/Makefile @@ -1,70 +1,66 @@ PORTNAME= sway -DISTVERSION= 1.8.1 -PORTREVISION= 3 +DISTVERSION= 1.9 CATEGORIES= x11-wm wayland PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ PATCHFILES+= cd9d1038a822.patch:-p1 # https://github.com/swaywm/sway/pull/5090 -PATCHFILES+= f98ca3ab7ca1.patch:-p1 # https://github.com/swaywm/sway/pull/5090 -PATCHFILES+= dee032d0a0ec.patch:-p1 # https://github.com/swaywm/sway/pull/7525 +PATCHFILES+= 1f1c83e83a1a.patch:-p1 # https://github.com/swaywm/sway/pull/5090 MAINTAINER= jbeich@FreeBSD.org COMMENT= i3-compatible Wayland compositor WWW= https://swaywm.org/ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ wayland-protocols>=1.24:graphics/wayland-protocols 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 gl gnome meson pkgconfig xorg +USES= compiler:c11 gnome meson pkgconfig xorg USE_GITHUB= yes -USE_GL= glesv2 USE_GNOME= cairo pango USE_XORG= pixman GH_ACCOUNT= swaywm MESON_ARGS= -Dsd-bus-provider=basu CONFLICTS_INSTALL= ${PORTNAME}-devel ${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/wlroots016/override.mk" .include diff --git a/x11-wm/sway/distinfo b/x11-wm/sway/distinfo index 8caa334db09b..d0ecc11775d6 100644 --- a/x11-wm/sway/distinfo +++ b/x11-wm/sway/distinfo @@ -1,9 +1,7 @@ -TIMESTAMP = 1679910352 -SHA256 (swaywm-sway-1.8.1_GH0.tar.gz) = e9f575761342fc8fe0cfeea80c90f32ddfa8c543572fec179f40922346f47dff -SIZE (swaywm-sway-1.8.1_GH0.tar.gz) = 5577483 +TIMESTAMP = 1708781966 +SHA256 (swaywm-sway-1.9_GH0.tar.gz) = b6e4e8d74af744278201792bcc4447470fcb91e15bbda475c647d475bf8e7b0b +SIZE (swaywm-sway-1.9_GH0.tar.gz) = 5581281 SHA256 (cd9d1038a822.patch) = 266891cbe27a67f81740879dbe39819e3bf0f17b681bdc93087ae05987c2f88d SIZE (cd9d1038a822.patch) = 8968 -SHA256 (f98ca3ab7ca1.patch) = b3a427b6edbf1c89bbf5fdeb5e3fc4c6708478e6d2031fcead87d29bf5c409fa -SIZE (f98ca3ab7ca1.patch) = 2673 -SHA256 (dee032d0a0ec.patch) = 7f6673efaf77bfa90368c71afc320cc7fe59b04fcb1238dc369563ce87bf3029 -SIZE (dee032d0a0ec.patch) = 1908 +SHA256 (1f1c83e83a1a.patch) = 59d24c7e69a871d92b65095c46fc994900440453064dd70ffc7de2f0ff728655 +SIZE (1f1c83e83a1a.patch) = 2701