x11/waybar: update to 0.10.2

- Backport Hyprland >= 0.40 socket path fix

Changes:	https://github.com/Alexays/Waybar/releases/tag/0.10.0
Changes:	https://github.com/Alexays/Waybar/releases/tag/0.10.1
Changes:	https://github.com/Alexays/Waybar/releases/tag/0.10.2
This commit is contained in:
Jan Beich 2024-04-23 17:59:08 +02:00
parent cfa2d75dbb
commit c8720b3105
2 changed files with 46 additions and 55 deletions

View file

@ -1,11 +1,11 @@
PORTNAME= waybar
DISTVERSION= 0.9.24
PORTREVISION= 3
DISTVERSION= 0.10.2
CATEGORIES= x11 wayland
PKGNAMESUFFIX= ${FLAVOR:N${FLAVORS:[1]}:C/.+/-${FLAVOR}/}
PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
PATCHFILES+= 514d00803c91.patch:-p1 # https://github.com/Alexays/Waybar/pull/2949
PATCHFILES+= f41458ea24a5.patch:-p1 # https://github.com/Alexays/Waybar/pull/3183
PATCHFILES+= 67de082393dc.patch:-p1 # https://github.com/Alexays/Waybar/pull/3193
MAINTAINER= ports@FreeBSD.org
COMMENT= Highly customizable Wayland bar for Sway and wlroots-based compositors
@ -16,10 +16,12 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
BUILD_DEPENDS= wayland-protocols>0:graphics/wayland-protocols
LIB_DEPENDS= libdate-tz.so:devel/date \
libinotify.so:devel/libinotify \
libjsoncpp.so:devel/jsoncpp \
libfmt.so:devel/libfmt \
libspdlog.so:devel/spdlog \
libwayland-client.so:graphics/wayland \
libgtk-layer-shell.so:x11-toolkits/gtk-layer-shell \
libxkbregistry.so:x11/libxkbcommon
TEST_DEPENDS= catch>0:devel/catch
@ -31,9 +33,9 @@ USE_GITHUB= yes
USE_GNOME= gtkmm30
GH_ACCOUNT= Alexays
GH_PROJECT= Waybar
MESON_ARGS= ${libnl systemd wireplumber tests:L:C/.*/-D&=disabled/}
MESON_ARGS= ${libnl systemd tests:L:C/.*/-D&=disabled/}
PLIST_FILES= bin/${PORTNAME} \
etc/xdg/${PORTNAME}/config \
etc/xdg/${PORTNAME}/config.jsonc \
etc/xdg/${PORTNAME}/style.css
# XXX Add pkg-config support to devel/date
@ -42,102 +44,110 @@ CONFIGURE_ENV+= PKG_CONFIG_PATH="${WRKDIR}"
SUB_FILES+= date.pc
.endif
OPTIONS_DEFINE= CAVA DBUS EVDEV GLS ICONSFONT JACK MANPAGES MPD MPRIS PULSEAUDIO SNDIO UDEV UPOWER
OPTIONS_DEFAULT= CAVA DBUS EVDEV GLS ICONSFONT JACK MANPAGES MPD MPRIS PULSEAUDIO SNDIO UDEV UPOWER
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
OPTIONS_EXCLUDE+= WIREPLUMBER # https://gitlab.freedesktop.org/pipewire/wireplumber/-/issues/571
.if ${FLAVOR:U:M*nopulse}
OPTIONS_EXCLUDE+= PULSEAUDIO
.endif
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_DESC= Keyboard state via libevdev
EVDEV_BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto
EVDEV_LIB_DEPENDS= libevdev.so:devel/libevdev \
libinotify.so:devel/libinotify \
libinput.so:x11/libinput
EVDEV_MESON_ENABLED= libevdev libinput
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
EVDEV_VARS= MANPAGES_PLIST_FILES+=share/man/man5/${PORTNAME}-keyboard-state.5.gz
ICONSFONT_DESC= Install Font Awesome to properly render icons
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}-backlight-slider.5.gz \
share/man/man5/${PORTNAME}-backlight.5.gz \
share/man/man5/${PORTNAME}-battery.5.gz \
share/man/man5/${PORTNAME}-bluetooth.5.gz \
share/man/man5/${PORTNAME}-cava.5.gz \
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}-gamemode.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}-keyboard-state.5.gz \
share/man/man5/${PORTNAME}-memory.5.gz \
share/man/man5/${PORTNAME}-mpd.5.gz \
share/man/man5/${PORTNAME}-mpris.5.gz \
share/man/man5/${PORTNAME}-network.5.gz \
share/man/man5/${PORTNAME}-pulseaudio-slider.5.gz \
share/man/man5/${PORTNAME}-pulseaudio.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}-sndio.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}-tray.5.gz \
share/man/man5/${PORTNAME}-upower.5.gz \
share/man/man5/${PORTNAME}-wireplumber.5.gz \
share/man/man5/${PORTNAME}-wlr-taskbar.5.gz \
share/man/man5/${PORTNAME}-wlr-workspaces.5.gz \
share/man/man5/${PORTNAME}.5.gz \
${NULL}
MPD_DESC= Music Player Daemon support
MPD_LIB_DEPENDS= libmpdclient.so:audio/libmpdclient
MPD_MESON_ENABLED= mpd
MPD_VARS= MANPAGES_PLIST_FILES+=share/man/man5/${PORTNAME}-mpd.5.gz
MPRIS_DESC= Media Player Remote Interfacing Specification via playerctl
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_DESC= Monitor backlight level via libudev
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_DESC= Monitor battery capacity via UPower
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
@ -147,10 +157,10 @@ post-patch:
# https://github.com/ConsoleKit2/ConsoleKit2/issues/150
@${REINPLACE_CMD} -e 's,/login1,/ConsoleKit/Manager,' \
-e 's,login1\([".]\),ConsoleKit\1,g' \
${WRKSRC}/src/modules/backlight.cpp \
${WRKSRC}/src/modules/gamemode.cpp \
${WRKSRC}/src/modules/inhibitor.cpp \
${WRKSRC}/src/modules/upower/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},' \
@ -163,23 +173,4 @@ pre-test:
${TOUCH} ${WRKDIR}/.meson_build_tests; \
fi
# XXX https://github.com/HowardHinnant/date/issues/799
.if ${CXX} == c++ && exists(/usr/include/c++/v1/__chrono/concepts.h)
USES+= cmake:indirect
CMAKE_ARGS= -B ${WRKDIR}/libcxx_build -S ${WRKSRC_libcxx}/libcxx
CMAKE_OFF= LIBCXX_INCLUDE_BENCHMARKS
CMAKE_INSTALL_PREFIX= ${WRKDIR}/libcxx_prefix
# XXX Move into separate port and standardize via USES
GH_TUPLE+= llvm:llvm-project:llvmorg-16.0.1:libcxx
CXXFLAGS+= -nostdinc++ -isystem${WRKDIR}/libcxx_prefix/include/c++/v1
# Don't link against new libc++ as it's not necessary
#LDFLAGS+= -nostdlib++ -L${WRKDIR}/libcxx_prefix/lib -l:libc++.a -lcxxrt
pre-configure: bundled-libcxx
bundled-libcxx:
@${SETENVI} ${WRK_ENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS}
@${DO_MAKE_BUILD:NDESTDIR*} install -C ${WRKDIR}/libcxx_build
.endif # exists(/usr/include/c++/v1/__chrono/concepts.h)
.include <bsd.port.mk>

View file

@ -1,7 +1,7 @@
TIMESTAMP = 1699016827
SHA256 (Alexays-Waybar-0.9.24_GH0.tar.gz) = 57aa7860bc066ebf4f3327dafa9841100b098c0dec1dce4baaa1fae63e9b57ae
SIZE (Alexays-Waybar-0.9.24_GH0.tar.gz) = 275416
SHA256 (llvm-llvm-project-llvmorg-16.0.1_GH0.tar.gz) = b5a9ff1793b1e2d388a3819bf35797002b1d2e40bb35a10c65605e0ea1435271
SIZE (llvm-llvm-project-llvmorg-16.0.1_GH0.tar.gz) = 179289803
SHA256 (514d00803c91.patch) = fcf2b190530afaab38a0cb9207508b64cd5fd63ea863036d7563e5005adaa6f9
SIZE (514d00803c91.patch) = 1387
TIMESTAMP = 1713887948
SHA256 (Alexays-Waybar-0.10.2_GH0.tar.gz) = 7ecccfe5d326d66987a32e77e02b825019d191670ab8e87412df01dd0913f9c0
SIZE (Alexays-Waybar-0.10.2_GH0.tar.gz) = 301414
SHA256 (f41458ea24a5.patch) = a125479cf8bf9b57306f8cd3df9fc969e43ddd797abd56a61f9328ba5877634c
SIZE (f41458ea24a5.patch) = 2490
SHA256 (67de082393dc.patch) = 71da4a4b2577f9a08555187151fc532b57a137f5de45622861e1307f70fffc3b
SIZE (67de082393dc.patch) = 992