diff --git a/x11/waybar/Makefile b/x11/waybar/Makefile index 8fe1d030af0d..b98b4f034411 100644 --- a/x11/waybar/Makefile +++ b/x11/waybar/Makefile @@ -1,185 +1,185 @@ PORTNAME= waybar -DISTVERSION= 0.14.0 -PORTREVISION= 3 +DISTVERSION= 0.15.0 +PORTREVISION= 0 CATEGORIES= x11 wayland PKGNAMESUFFIX= ${FLAVOR:N${FLAVORS:[1]}:C/.+/-${FLAVOR}/} MAINTAINER= nivit@FreeBSD.org COMMENT= Highly customizable Wayland bar for Sway and wlroots-based compositors WWW= https://github.com/Alexays/Waybar LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= wayland-protocols>0:graphics/wayland-protocols LIB_DEPENDS= libdate-tz.so:devel/date \ libfmt.so:devel/libfmt \ libgps.so:astro/gpsd@nox11 \ libgtk-layer-shell.so:x11-toolkits/gtk-layer-shell \ libinotify.so:devel/libinotify \ libjsoncpp.so:devel/jsoncpp \ libspdlog.so:devel/spdlog \ libwayland-client.so:graphics/wayland \ libxkbregistry.so:x11/libxkbcommon TEST_DEPENDS= catch>0:devel/catch FLAVORS= default nopulse USES= compiler:c++20-lang gnome meson pkgconfig USE_GITHUB= yes GH_ACCOUNT= Alexays GH_PROJECT= Waybar USE_GNOME= gtkmm30 +MESON_ARGS= ${libnl systemd tests:L:C/.*/-D&=disabled/} + +CONFLICTS_INSTALL= ${PORTNAME}* + # 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 -MESON_ARGS= ${libnl systemd tests:L:C/.*/-D&=disabled/} - -CONFLICTS_INSTALL= ${PORTNAME}* - PLIST_FILES= bin/${PORTNAME} \ etc/xdg/${PORTNAME}/config.jsonc \ etc/xdg/${PORTNAME}/style.css OPTIONS_DEFINE= CAVA DBUS EVDEV ICONSFONT JACK MANPAGES MPD MPRIS \ PIPEWIRE PULSEAUDIO SNDIO UDEV UPOWER WIREPLUMBER OPTIONS_DEFAULT= CAVA DBUS EVDEV ICONSFONT JACK MANPAGES MPD MPRIS \ PIPEWIRE PULSEAUDIO SNDIO UDEV UPOWER WIREPLUMBER OPTIONS_EXCLUDE+= CAVA # https://github.com/karlstav/cava/issues/487 .if ${FLAVOR:U:M*nopulse} OPTIONS_EXCLUDE+= PULSEAUDIO .endif -EVDEV_DESC= Keyboard state via libevdev -ICONSFONT_DESC= Install Font Awesome to properly render icons -MPD_DESC= Music Player Daemon support -MPRIS_DESC= Media Player Remote Interfacing Specification via playerctl -UDEV_DESC= Monitor backlight level via libudev -UPOWER_DESC= Monitor battery capacity via UPower +EVDEV_DESC= Keyboard state via libevdev +ICONSFONT_DESC= Install Font Awesome to properly render icons +MPD_DESC= Music Player Daemon support +MPRIS_DESC= Media Player Remote Interfacing Specification via playerctl +UDEV_DESC= Monitor backlight level via libudev +UPOWER_DESC= Monitor battery capacity via UPower WIREPLUMBER_DESC= Show current volume via WirePlumber CAVA_LIB_DEPENDS= libcava.so:audio/cava CAVA_MESON_ENABLED= cava CAVA_VARS= MANPAGES_PLIST_FILES+=share/man/man5/${PORTNAME}-cava.5.gz DBUS_LIB_DEPENDS= libdbusmenu-gtk3.so:devel/libdbusmenu DBUS_MESON_ENABLED= dbusmenu-gtk DBUS_VARS= MANPAGES_PLIST_FILES+=share/man/man5/${PORTNAME}-tray.5.gz EVDEV_BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto EVDEV_LIB_DEPENDS= libevdev.so:devel/libevdev \ libinput.so:x11/libinput EVDEV_MESON_ENABLED= libevdev libinput EVDEV_VARS= MANPAGES_PLIST_FILES+=share/man/man5/${PORTNAME}-keyboard-state.5.gz ICONSFONT_RUN_DEPENDS= font-awesome>0:x11-fonts/font-awesome JACK_LIB_DEPENDS= libjack.so:audio/jack JACK_MESON_ENABLED= jack JACK_VARS= MANPAGES_PLIST_FILES+=share/man/man5/${PORTNAME}-jack.5.gz MANPAGES_BUILD_DEPENDS= scdoc:textproc/scdoc MANPAGES_MESON_ENABLED= man-pages MANPAGES_PLIST_FILES= share/man/man5/${PORTNAME}-battery.5.gz \ share/man/man5/${PORTNAME}-cffi.5.gz \ share/man/man5/${PORTNAME}-clock.5.gz \ share/man/man5/${PORTNAME}-cpu.5.gz \ share/man/man5/${PORTNAME}-custom.5.gz \ share/man/man5/${PORTNAME}-disk.5.gz \ share/man/man5/${PORTNAME}-dwl-tags.5.gz \ share/man/man5/${PORTNAME}-dwl-window.5.gz \ share/man/man5/${PORTNAME}-ext-workspaces.5.gz \ share/man/man5/${PORTNAME}-gamemode.5.gz \ share/man/man5/${PORTNAME}-gps.5.gz \ share/man/man5/${PORTNAME}-hyprland-language.5.gz \ share/man/man5/${PORTNAME}-hyprland-submap.5.gz \ share/man/man5/${PORTNAME}-hyprland-window.5.gz \ share/man/man5/${PORTNAME}-hyprland-workspaces.5.gz \ share/man/man5/${PORTNAME}-idle-inhibitor.5.gz \ share/man/man5/${PORTNAME}-image.5.gz \ share/man/man5/${PORTNAME}-inhibitor.5.gz \ share/man/man5/${PORTNAME}-memory.5.gz \ share/man/man5/${PORTNAME}-menu.5.gz \ share/man/man5/${PORTNAME}-niri-language.5.gz \ share/man/man5/${PORTNAME}-niri-window.5.gz \ share/man/man5/${PORTNAME}-niri-workspaces.5.gz \ share/man/man5/${PORTNAME}-river-layout.5.gz \ share/man/man5/${PORTNAME}-river-mode.5.gz \ share/man/man5/${PORTNAME}-river-tags.5.gz \ share/man/man5/${PORTNAME}-river-window.5.gz \ share/man/man5/${PORTNAME}-states.5.gz \ share/man/man5/${PORTNAME}-styles.5.gz \ share/man/man5/${PORTNAME}-sway-language.5.gz \ share/man/man5/${PORTNAME}-sway-mode.5.gz \ share/man/man5/${PORTNAME}-sway-scratchpad.5.gz \ share/man/man5/${PORTNAME}-sway-window.5.gz \ share/man/man5/${PORTNAME}-sway-workspaces.5.gz \ share/man/man5/${PORTNAME}-temperature.5.gz \ share/man/man5/${PORTNAME}-wlr-taskbar.5.gz \ share/man/man5/${PORTNAME}.5.gz MPD_LIB_DEPENDS= libmpdclient.so:audio/libmpdclient MPD_MESON_ENABLED= mpd MPD_VARS= MANPAGES_PLIST_FILES+=share/man/man5/${PORTNAME}-mpd.5.gz MPRIS_LIB_DEPENDS= libplayerctl.so:multimedia/playerctl MPRIS_MESON_ENABLED= mpris MPRIS_VARS= MANPAGES_PLIST_FILES+=share/man/man5/${PORTNAME}-mpris.5.gz PIPEWIRE_LIB_DEPENDS= libpipewire-0.3.so:multimedia/pipewire PIPEWIRE_MESON_ENABLED= pipewire PIPEWIRE_VARS= MANPAGES_PLIST_FILES+=share/man/man5/${PORTNAME}-privacy.5.gz PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio PULSEAUDIO_MESON_ENABLED= pulseaudio PULSEAUDIO_VARS= MANPAGES_PLIST_FILES+=share/man/man5/${PORTNAME}-pulseaudio-slider.5.gz \ MANPAGES_PLIST_FILES+=share/man/man5/${PORTNAME}-pulseaudio.5.gz SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio SNDIO_USES= localbase:ldflags SNDIO_MESON_ENABLED= sndio SNDIO_VARS= MANPAGES_PLIST_FILES+=share/man/man5/${PORTNAME}-sndio.5.gz UDEV_LIB_DEPENDS= libepoll-shim.so:devel/libepoll-shim \ libudev.so:devel/libudev-devd UDEV_MESON_ENABLED= libudev UDEV_VARS= MANPAGES_PLIST_FILES+=share/man/man5/${PORTNAME}-backlight-slider.5.gz \ MANPAGES_PLIST_FILES+=share/man/man5/${PORTNAME}-backlight.5.gz UPOWER_LIB_DEPENDS= libupower-glib.so:sysutils/upower UPOWER_MESON_ENABLED= upower_glib UPOWER_VARS= MANPAGES_PLIST_FILES+=share/man/man5/${PORTNAME}-upower.5.gz WIREPLUMBER_LIB_DEPENDS= libwireplumber-0.5.so:multimedia/wireplumber WIREPLUMBER_MESON_ENABLED= wireplumber WIREPLUMBER_VARS= MANPAGES_PLIST_FILES+=share/man/man5/${PORTNAME}-wireplumber.5.gz 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 # https://github.com/ConsoleKit2/ConsoleKit2/issues/150 @${REINPLACE_CMD} -e 's,/login1,/ConsoleKit/Manager,' \ -e 's,login1\([".]\),ConsoleKit\1,g' \ ${WRKSRC}/src/modules/gamemode.cpp \ ${WRKSRC}/src/modules/inhibitor.cpp \ ${WRKSRC}/src/modules/upower.cpp \ ${WRKSRC}/src/util/backlight_backend.cpp \ ${WRKSRC}/src/util/prepare_for_sleep.cpp # Respect PREFIX for icons @${REINPLACE_CMD} 's,/usr/share,${DATADIR:H},' \ ${WRKSRC}/src/util/icon_loader.cpp pre-test: @if [ ! -e ${WRKDIR}/.meson_build_tests ]; then \ ${RM} ${CONFIGURE_COOKIE} ${BUILD_COOKIE}; \ ${MAKE} -C${.CURDIR} build MESON_ARGS="${MESON_ARGS} --reconfigure -Dtests=enabled"; \ ${TOUCH} ${WRKDIR}/.meson_build_tests; \ fi .include diff --git a/x11/waybar/distinfo b/x11/waybar/distinfo index 1039092315a1..b1db3d148c8d 100644 --- a/x11/waybar/distinfo +++ b/x11/waybar/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1754669396 -SHA256 (Alexays-Waybar-0.14.0_GH0.tar.gz) = 7f3859779bb3a5028a7215b2000c2e476c03453a52289164ba60a4bf1bb3772f -SIZE (Alexays-Waybar-0.14.0_GH0.tar.gz) = 341661 +TIMESTAMP = 1770543945 +SHA256 (Alexays-Waybar-0.15.0_GH0.tar.gz) = 21c2bbef88c40473c355003582f9331d2f9b8a01efdcce0935edfc5f6b023a3e +SIZE (Alexays-Waybar-0.15.0_GH0.tar.gz) = 355671 diff --git a/x11/waybar/files/patch-man_waybar-menu.5.scd b/x11/waybar/files/patch-man_waybar-menu.5.scd new file mode 100644 index 000000000000..c786ee04b239 --- /dev/null +++ b/x11/waybar/files/patch-man_waybar-menu.5.scd @@ -0,0 +1,17 @@ +--- man/waybar-menu.5.scd.orig 2026-02-06 20:15:03 UTC ++++ man/waybar-menu.5.scd +@@ -91,10 +91,10 @@ Module config : + "menu": "on-click", + "menu-file": "~/.config/waybar/power_menu.xml", + "menu-actions": { +- "shutdown": "shutdown", +- "reboot": "reboot", +- "suspend": "systemctl suspend", +- "hibernate": "systemctl hibernate", ++ "shutdown": "shutdown -p now", ++ "reboot": "shutdown -r now", ++ "suspend": "zzz", ++ "hibernate": "apiconf -s 4", + }, + }, + ``` diff --git a/x11/waybar/files/patch-no-systemctl b/x11/waybar/files/patch-no-systemctl deleted file mode 100644 index 96ad62562b92..000000000000 --- a/x11/waybar/files/patch-no-systemctl +++ /dev/null @@ -1,34 +0,0 @@ ---- man/waybar-menu.5.scd.orig 2024-07-17 21:04:05 UTC -+++ man/waybar-menu.5.scd -@@ -91,10 +91,10 @@ Module config : - "menu": "on-click", - "menu-file": "~/.config/waybar/power_menu.xml", - "menu-actions": { -- "shutdown": "shutdown", -- "reboot": "reboot", -- "suspend": "systemctl suspend", -- "hibernate": "systemctl hibernate", -+ "shutdown": "shutdown -p now", -+ "reboot": "shutdown -r now", -+ "suspend": "zzz", -+ "hibernate": "acpiconf -s 4" - }, - }, - ``` ---- resources/config.jsonc.orig 2024-07-17 21:04:05 UTC -+++ resources/config.jsonc -@@ -206,10 +206,10 @@ - "menu": "on-click", - "menu-file": "$HOME/.config/waybar/power_menu.xml", // Menu file in resources folder - "menu-actions": { -- "shutdown": "shutdown", -- "reboot": "reboot", -- "suspend": "systemctl suspend", -- "hibernate": "systemctl hibernate" -+ "shutdown": "shutdown -p now", -+ "reboot": "shutdown -r now", -+ "suspend": "zzz", -+ "hibernate": "acpiconf -s 4" - } - } - } diff --git a/x11/waybar/files/patch-resources_config.jsonc b/x11/waybar/files/patch-resources_config.jsonc new file mode 100644 index 000000000000..dc23617b920d --- /dev/null +++ b/x11/waybar/files/patch-resources_config.jsonc @@ -0,0 +1,17 @@ +--- resources/config.jsonc.orig 2026-02-06 20:15:03 UTC ++++ resources/config.jsonc +@@ -210,10 +210,10 @@ + "menu": "on-click", + "menu-file": "$HOME/.config/waybar/power_menu.xml", // Menu file in resources folder + "menu-actions": { +- "shutdown": "shutdown", +- "reboot": "reboot", +- "suspend": "systemctl suspend", +- "hibernate": "systemctl hibernate" ++ "shutdown": "shutdown -p now", ++ "reboot": "shutdown -r now", ++ "suspend": "zzz", ++ "hibernate": "apiconf -s 4" + } + } + }