diff --git a/x11/waybar/Makefile b/x11/waybar/Makefile index 19c82d068d14..f0e82c970359 100644 --- a/x11/waybar/Makefile +++ b/x11/waybar/Makefile @@ -1,97 +1,103 @@ PORTNAME= waybar -DISTVERSION= 0.9.7 -PORTREVISION= 1 +DISTVERSION= 0.9.8 CATEGORIES= x11 MAINTAINER= jbeich@FreeBSD.org COMMENT= Highly customizable Wayland bar for Sway and wlroots-based compositors LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= wayland-protocols>0:graphics/wayland-protocols LIB_DEPENDS= libdate-tz.so:devel/date \ libjsoncpp.so:devel/jsoncpp \ libfmt.so:devel/libfmt \ libspdlog.so:devel/spdlog \ - libwayland-client.so:graphics/wayland + libwayland-client.so:graphics/wayland \ + libxkbregistry.so:x11/libxkbcommon USES= compiler:c++17-lang gnome meson pkgconfig USE_GITHUB= yes USE_GNOME= gtkmm30 GH_ACCOUNT= Alexays GH_PROJECT= Waybar CPPFLAGS+= -D_WITH_GETLINE # XXX Remove after FreeBSD 11 EOL PLIST_FILES= bin/${PORTNAME} \ etc/xdg/${PORTNAME}/config \ etc/xdg/${PORTNAME}/style.css # XXX Add pkg-config support to devel/date .if exists(${.CURDIR}/files/date.pc.in) CONFIGURE_ENV+= PKG_CONFIG_PATH="${WRKDIR}" SUB_FILES+= date.pc .endif -OPTIONS_DEFINE= DBUS GLS ICONSFONT MANPAGES MPD PULSEAUDIO SNDIO UDEV -OPTIONS_DEFAULT=DBUS GLS ICONSFONT MANPAGES MPD PULSEAUDIO SNDIO UDEV +OPTIONS_DEFINE= DBUS EVDEV GLS ICONSFONT MANPAGES MPD PULSEAUDIO SNDIO UDEV +OPTIONS_DEFAULT=DBUS EVDEV GLS ICONSFONT MANPAGES MPD PULSEAUDIO SNDIO UDEV DBUS_LIB_DEPENDS= libdbusmenu-gtk3.so:devel/libdbusmenu DBUS_MESON_ENABLED= dbusmenu-gtk +EVDEV_DESC= Keyboard state via libevdev +EVDEV_BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto +EVDEV_LIB_DEPENDS= libevdev.so:devel/libevdev +EVDEV_MESON_ENABLED= libevdev + GLS_DESC= Use gtk-layer-shell library for popups support GLS_LIB_DEPENDS= libgtk-layer-shell.so:x11-toolkits/gtk-layer-shell GLS_MESON_ENABLED= gtk-layer-shell ICONSFONT_DESC= Install Font Awesome to properly render icons ICONSFONT_RUN_DEPENDS= font-awesome>0:x11-fonts/font-awesome MANPAGES_BUILD_DEPENDS= scdoc:textproc/scdoc MANPAGES_MESON_ENABLED= man-pages MANPAGES_PLIST_FILES= man/man5/${PORTNAME}-backlight.5.gz \ man/man5/${PORTNAME}-battery.5.gz \ man/man5/${PORTNAME}-bluetooth.5.gz \ man/man5/${PORTNAME}-clock.5.gz \ man/man5/${PORTNAME}-cpu.5.gz \ man/man5/${PORTNAME}-custom.5.gz \ man/man5/${PORTNAME}-disk.5.gz \ man/man5/${PORTNAME}-idle-inhibitor.5.gz \ + man/man5/${PORTNAME}-keyboard-state.5.gz \ man/man5/${PORTNAME}-memory.5.gz \ man/man5/${PORTNAME}-mpd.5.gz \ man/man5/${PORTNAME}-network.5.gz \ man/man5/${PORTNAME}-pulseaudio.5.gz \ man/man5/${PORTNAME}-river-tags.5.gz \ man/man5/${PORTNAME}-sndio.5.gz \ man/man5/${PORTNAME}-states.5.gz \ man/man5/${PORTNAME}-sway-language.5.gz \ man/man5/${PORTNAME}-sway-mode.5.gz \ man/man5/${PORTNAME}-sway-window.5.gz \ man/man5/${PORTNAME}-sway-workspaces.5.gz \ man/man5/${PORTNAME}-temperature.5.gz \ man/man5/${PORTNAME}-tray.5.gz \ man/man5/${PORTNAME}-wlr-taskbar.5.gz \ man/man5/${PORTNAME}.5.gz \ ${NULL} MPD_DESC= Music Player Daemon support MPD_LIB_DEPENDS= libmpdclient.so:audio/libmpdclient MPD_MESON_ENABLED= mpd PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio PULSEAUDIO_MESON_ENABLED= pulseaudio SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio SNDIO_USES= localbase:ldflags SNDIO_MESON_ENABLED= sndio UDEV_DESC= Monitor backlight level via libudev UDEV_LIB_DEPENDS= libepoll-shim.so:devel/libepoll-shim \ libudev.so:devel/libudev-devd UDEV_MESON_ENABLED= libudev post-patch: # 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/waybar/distinfo b/x11/waybar/distinfo index 94f5269468a5..13c7b1ea3a86 100644 --- a/x11/waybar/distinfo +++ b/x11/waybar/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1618514274 -SHA256 (Alexays-Waybar-0.9.7_GH0.tar.gz) = 0d23573e0f6ce6e3f3eb4d1d7313848b924429268f3becd81649a391ae7703e7 -SIZE (Alexays-Waybar-0.9.7_GH0.tar.gz) = 150768 +TIMESTAMP = 1629121654 +SHA256 (Alexays-Waybar-0.9.8_GH0.tar.gz) = 3f067c484aaee3e7d8ded382e72c280a92913b0c4e8a20d0ac9afdf8baf19405 +SIZE (Alexays-Waybar-0.9.8_GH0.tar.gz) = 158869 diff --git a/x11/waybar/files/date.pc.in b/x11/waybar/files/date.pc.in index a0bd9279cb1d..49d9db58bc26 100644 --- a/x11/waybar/files/date.pc.in +++ b/x11/waybar/files/date.pc.in @@ -1,10 +1,10 @@ prefix=%%LOCALBASE%% exec_prefix=${prefix} libdir=${exec_prefix}/lib includedir=${prefix}/include Name: date Description: Date and time library based on the C++11/14/17 header -Version: 3.0.0 +Version: 3.0.1 Cflags: -I${includedir} Libs: -L${libdir} -ldate-tz diff --git a/x11/waybar/files/patch-libfmt b/x11/waybar/files/patch-libfmt deleted file mode 100644 index f80a7cd6cf9a..000000000000 --- a/x11/waybar/files/patch-libfmt +++ /dev/null @@ -1,28 +0,0 @@ -Obtained from: https://github.com/Alexays/Waybar/commit/1c2e0083ba5a80d0f22a14d2baa8df52024a7394 - ---- include/util/format.hpp.orig 2021-04-15 19:17:54 UTC -+++ include/util/format.hpp -@@ -35,7 +35,11 @@ namespace fmt { - // The rationale for ignoring it is that the only reason to specify - // an alignment and a with is to get a fixed width bar, and ">" is - // sufficient in this implementation. -+#if FMT_VERSION < 80000 - width = parse_nonnegative_int(it, end, ctx); -+#else -+ width = detail::parse_nonnegative_int(it, end, -1); -+#endif - } - return it; - } ---- src/modules/clock.cpp.orig 2021-04-15 19:17:54 UTC -+++ src/modules/clock.cpp -@@ -196,6 +196,9 @@ template <> - struct fmt::formatter : fmt::formatter { - template - auto format(const waybar_time& t, FormatContext& ctx) { -+#if FMT_VERSION >= 80000 -+ auto& tm_format = specs; -+#endif - return format_to(ctx.out(), "{}", date::format(t.locale, fmt::to_string(tm_format), t.ztime)); - } - };