diff --git a/x11-wm/sway/Makefile b/x11-wm/sway/Makefile index 8151edd6c261..3a08f76fdd7b 100644 --- a/x11-wm/sway/Makefile +++ b/x11-wm/sway/Makefile @@ -1,69 +1,70 @@ PORTNAME= sway DISTVERSION?= 1.8.1 -PORTREVISION?= 0 +PORTREVISION?= 1 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 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 \ wlroots>=0.16.0<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 gl 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}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 diff --git a/x11-wm/sway/distinfo b/x11-wm/sway/distinfo index 5fae00309793..8caa334db09b 100644 --- a/x11-wm/sway/distinfo +++ b/x11-wm/sway/distinfo @@ -1,7 +1,9 @@ -TIMESTAMP = 1676224359 +TIMESTAMP = 1679910352 SHA256 (swaywm-sway-1.8.1_GH0.tar.gz) = e9f575761342fc8fe0cfeea80c90f32ddfa8c543572fec179f40922346f47dff SIZE (swaywm-sway-1.8.1_GH0.tar.gz) = 5577483 SHA256 (cd9d1038a822.patch) = 266891cbe27a67f81740879dbe39819e3bf0f17b681bdc93087ae05987c2f88d SIZE (cd9d1038a822.patch) = 8968 SHA256 (f98ca3ab7ca1.patch) = b3a427b6edbf1c89bbf5fdeb5e3fc4c6708478e6d2031fcead87d29bf5c409fa SIZE (f98ca3ab7ca1.patch) = 2673 +SHA256 (dee032d0a0ec.patch) = 7f6673efaf77bfa90368c71afc320cc7fe59b04fcb1238dc369563ce87bf3029 +SIZE (dee032d0a0ec.patch) = 1908 diff --git a/x11-wm/swayfx/Makefile b/x11-wm/swayfx/Makefile index ce1f21e1c9a1..c159ec55dd64 100644 --- a/x11-wm/swayfx/Makefile +++ b/x11-wm/swayfx/Makefile @@ -1,18 +1,18 @@ DISTVERSION= 0.2 -PORTREVISION= 0 +PORTREVISION= 1 PKGNAMESUFFIX= ${GH_PROJECT:S/${PORTNAME}//} COMMENT= Sway, but with eye candy! WWW= https://github.com/WillPower3309/swayfx MASTERDIR= ${.CURDIR}/../sway DESCR= ${.CURDIR}/pkg-descr DISTINFO_FILE= ${.CURDIR}/distinfo GH_ACCOUNT= WillPower3309 GH_PROJECT= swayfx USE_GL= egl CONFLICTS_INSTALL= ${PORTNAME} .include "${MASTERDIR}/Makefile" diff --git a/x11-wm/swayfx/distinfo b/x11-wm/swayfx/distinfo index d59e2b3eb4b5..c7d3b23d92a4 100644 --- a/x11-wm/swayfx/distinfo +++ b/x11-wm/swayfx/distinfo @@ -1,7 +1,9 @@ -TIMESTAMP = 1678506984 +TIMESTAMP = 1679910379 SHA256 (WillPower3309-swayfx-0.2_GH0.tar.gz) = fe5f6070b9b3fc97fafb1bfe1caddce71458632ef4fb884a9ec28d1a458b4e55 SIZE (WillPower3309-swayfx-0.2_GH0.tar.gz) = 5534158 SHA256 (cd9d1038a822.patch) = 266891cbe27a67f81740879dbe39819e3bf0f17b681bdc93087ae05987c2f88d SIZE (cd9d1038a822.patch) = 8968 SHA256 (f98ca3ab7ca1.patch) = b3a427b6edbf1c89bbf5fdeb5e3fc4c6708478e6d2031fcead87d29bf5c409fa SIZE (f98ca3ab7ca1.patch) = 2673 +SHA256 (dee032d0a0ec.patch) = 7f6673efaf77bfa90368c71afc320cc7fe59b04fcb1238dc369563ce87bf3029 +SIZE (dee032d0a0ec.patch) = 1908