Index: head/x11/swaylock/Makefile =================================================================== --- head/x11/swaylock/Makefile (revision 491072) +++ head/x11/swaylock/Makefile (revision 491073) @@ -1,38 +1,42 @@ # $FreeBSD$ PORTNAME= swaylock -DISTVERSION= 1.2-30 -DISTVERSIONSUFFIX= -g4e72a36 +DISTVERSION= 1.2-38 +DISTVERSIONSUFFIX= -g3d94a60 CATEGORIES= x11 MAINTAINER= jbeich@FreeBSD.org COMMENT= Screen locker for Wayland LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= wayland-protocols>=1.14:graphics/wayland-protocols LIB_DEPENDS= libwayland-client.so:graphics/wayland \ libxkbcommon.so:x11/libxkbcommon USES= compiler:c11 meson pkgconfig USE_GITHUB= yes GH_ACCOUNT= swaywm -USE_GNOME= cairo gdkpixbuf2 pango +USE_GNOME= cairo pango MESON_ARGS= -Dswaylock-version="${DISTVERSIONFULL}" PLIST_FILES= bin/${PORTNAME} \ etc/pam.d/${PORTNAME} \ share/bash-completion/completions/${PORTNAME} \ share/fish/completions/${PORTNAME}.fish \ share/zsh/site-functions/_${PORTNAME} -OPTIONS_DEFINE= MANPAGES -OPTIONS_DEFAULT=MANPAGES +OPTIONS_DEFINE= MANPAGES PIXBUF +OPTIONS_DEFAULT=MANPAGES PIXBUF MANPAGES_BUILD_DEPENDS= scdoc:textproc/scdoc MANPAGES_PLIST_FILES= man/man1/${PORTNAME}.1.gz + +PIXBUF_USE= GNOME=gdkpixbuf2 +PIXBUF_MESON_ON= -Dgdk-pixbuf=enabled +PIXBUF_MESON_OFF= -Dgdk-pixbuf=disabled post-patch-MANPAGES-off: @${REINPLACE_CMD} -i '' "s/'scdoc/&-disabled/" ${WRKSRC}/meson.build .include Index: head/x11/swaylock/distinfo =================================================================== --- head/x11/swaylock/distinfo (revision 491072) +++ head/x11/swaylock/distinfo (revision 491073) @@ -1,3 +1,3 @@ -TIMESTAMP = 1547884489 -SHA256 (swaywm-swaylock-1.2-30-g4e72a36_GH0.tar.gz) = 7f5b63de5a004b4c3c758d3c4d4c1d1fe174d5d2d03aff2e70532d282edb74ed -SIZE (swaywm-swaylock-1.2-30-g4e72a36_GH0.tar.gz) = 33918 +TIMESTAMP = 1548275509 +SHA256 (swaywm-swaylock-1.2-38-g3d94a60_GH0.tar.gz) = 6ce2729cab0a58c916aacae585ebd0ade291fce2b012c3f500806b60a1d781d9 +SIZE (swaywm-swaylock-1.2-38-g3d94a60_GH0.tar.gz) = 32523 Index: head/x11-toolkits/wlroots/Makefile =================================================================== --- head/x11-toolkits/wlroots/Makefile (revision 491072) +++ head/x11-toolkits/wlroots/Makefile (revision 491073) @@ -1,49 +1,49 @@ # $FreeBSD$ PORTNAME= wlroots -DISTVERSION= 0.2-147 -DISTVERSIONSUFFIX= -gb619ab4d +DISTVERSION= 0.2-154 +DISTVERSIONSUFFIX= -gc41d0130 CATEGORIES= x11-toolkits MAINTAINER= jbeich@FreeBSD.org COMMENT= Modular Wayland compositor library LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ wayland-protocols>=1.15:graphics/wayland-protocols LIB_DEPENDS= libudev.so:devel/libudev-devd \ libdrm.so:graphics/libdrm \ libwayland-egl.so:graphics/wayland \ libinput.so:x11/libinput \ libxkbcommon.so:x11/libxkbcommon RUN_DEPENDS= xkeyboard-config>0:x11/xkeyboard-config USES= compiler:c11 gl meson pkgconfig USE_GITHUB= yes USE_GL= egl gbm glesv2 USE_XORG= pixman USE_LDCONFIG= yes GH_ACCOUNT= swaywm MESON_ARGS= -Dexamples=false # https://github.com/swaywm/wlroots/issues/1450 LLD_UNSAFE= yes OPTIONS_DEFINE= X11 OPTIONS_DEFAULT=X11 OPTIONS_SUB= yes X11_LIB_DEPENDS=libxcb-errors.so:x11/xcb-util-errors \ libxcb-icccm.so:x11/xcb-util-wm X11_RUN_DEPENDS=Xwayland:x11-servers/xwayland X11_USE= XORG=x11,xcb X11_MESON_ON= -Dx11-backend=enabled -Dxcb-icccm=enabled -Dxwayland=enabled X11_MESON_OFF= -Dx11-backend=disabled -Dxcb-icccm=disabled -Dxwayland=disabled post-patch: # Ignore unused dependencies @${REINPLACE_CMD} '/examples/d' ${WRKSRC}/meson.build .include Index: head/x11-toolkits/wlroots/distinfo =================================================================== --- head/x11-toolkits/wlroots/distinfo (revision 491072) +++ head/x11-toolkits/wlroots/distinfo (revision 491073) @@ -1,3 +1,3 @@ -TIMESTAMP = 1548090097 -SHA256 (swaywm-wlroots-0.2-147-gb619ab4d_GH0.tar.gz) = d6192b51757cf020597d2fb7fd4565d159d5fb055c6f4c28ef329acd9514c768 -SIZE (swaywm-wlroots-0.2-147-gb619ab4d_GH0.tar.gz) = 473386 +TIMESTAMP = 1548194332 +SHA256 (swaywm-wlroots-0.2-154-gc41d0130_GH0.tar.gz) = 33a06fd2f9706c535ac5ab993805a4d1b18bce90ca5c3db497de42bbe6d48eec +SIZE (swaywm-wlroots-0.2-154-gc41d0130_GH0.tar.gz) = 473682 Index: head/x11-wm/sway/Makefile =================================================================== --- head/x11-wm/sway/Makefile (revision 491072) +++ head/x11-wm/sway/Makefile (revision 491073) @@ -1,66 +1,69 @@ # $FreeBSD$ PORTNAME= sway -DISTVERSION= 1.0-beta.2-243 -DISTVERSIONSUFFIX= -g410c9613 +DISTVERSION= 1.0-beta.2-270 +DISTVERSIONSUFFIX= -g1a1133dc CATEGORIES= x11-wm + +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ +PATCHFILES= f24c0e7b92a5.patch:-p1 MAINTAINER= jbeich@FreeBSD.org COMMENT= i3-compatible Wayland compositor LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ wayland-protocols>=1.14:graphics/wayland-protocols \ wlroots>=0.2.126:x11-toolkits/wlroots LIB_DEPENDS= libjson-c.so:devel/json-c \ libevdev.so:devel/libevdev \ libpcre.so:devel/pcre \ libwayland-egl.so:graphics/wayland \ libwlroots.so:x11-toolkits/wlroots \ libinput.so:x11/libinput \ libxkbcommon.so:x11/libxkbcommon USES= compiler:c11 gnome meson pkgconfig USE_GITHUB= yes USE_GNOME= cairo pango USE_XORG= pixman GH_ACCOUNT= swaywm MESON_ARGS= -Dsway-version="${DISTVERSIONFULL}" OPTIONS_DEFINE= MANPAGES PIXBUF SUID X11 OPTIONS_DEFAULT=MANPAGES PIXBUF SUID X11 OPTIONS_SUB= yes MANPAGES_BUILD_DEPENDS= scdoc:textproc/scdoc MANPAGES_MESON_ON= -Dman-pages=enabled MANPAGES_MESON_OFF= -Dman-pages=disabled PIXBUF_USE= GNOME=gdkpixbuf2 PIXBUF_MESON_ON= -Dgdk-pixbuf=enabled PIXBUF_MESON_OFF= -Dgdk-pixbuf=disabled SUID_DESC= setuid bit on "sway" binary (required for DRM session) SUID_PLIST_SUB= MAYBE_SUID="@(,,4755) " SUID_PLIST_SUB_OFF= MAYBE_SUID="" X11_USE= XORG=xcb X11_MESON_ON= -Dxwayland=enabled X11_MESON_OFF= -Dxwayland=disabled post-patch: # Let @sample handle default files under etc/ @${REINPLACE_CMD} -e '/config\.in/{ N; s/@BASENAME@/&.sample/; }' \ ${WRKSRC}/meson.build # Let terminal chooser pick default @${REINPLACE_CMD} -e 's/urxvt/swayterm/' \ ${WRKSRC}/config.in post-install: ${INSTALL_SCRIPT} ${FILESDIR}/swayterm ${STAGEDIR}${PREFIX}/bin ${MKDIR} ${STAGEDIR}${ETCDIR}/config.d # x11/libxkbcommon has --with-default-rules="xorg" but x11/libinput expects "evdev" ${ECHO_CMD} 'input * xkb_rules evdev' >${STAGEDIR}${ETCDIR}/config.d/evdev .include Index: head/x11-wm/sway/distinfo =================================================================== --- head/x11-wm/sway/distinfo (revision 491072) +++ head/x11-wm/sway/distinfo (revision 491073) @@ -1,3 +1,5 @@ -TIMESTAMP = 1548083115 -SHA256 (swaywm-sway-1.0-beta.2-243-g410c9613_GH0.tar.gz) = 31e835231c5bd3d3a097480a4c94e4eaf477fc8475aa3fede80d94ebc77207d4 -SIZE (swaywm-sway-1.0-beta.2-243-g410c9613_GH0.tar.gz) = 5457761 +TIMESTAMP = 1548260686 +SHA256 (swaywm-sway-1.0-beta.2-270-g1a1133dc_GH0.tar.gz) = 08a5da6981e583820548c75394453a98fe812832854076d56ac226b2e25eb4d8 +SIZE (swaywm-sway-1.0-beta.2-270-g1a1133dc_GH0.tar.gz) = 5457917 +SHA256 (f24c0e7b92a5.patch) = ee69184db6dc93868ada4f5c8e453e8afbe0a2f230a2be53abe1abf24d40833b +SIZE (f24c0e7b92a5.patch) = 3649