git: b952fb0d2b5d - 2022Q2 - x11/waybar: update to 0.9.13

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Jan Beich <jbeich_at_FreeBSD.org>
Date: Mon, 23 May 2022 16:47:19 UTC
The branch 2022Q2 has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=b952fb0d2b5d8d0ccc4cdf2c99ca4b53f171dd95

commit b952fb0d2b5d8d0ccc4cdf2c99ca4b53f171dd95
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2022-05-23 11:54:24 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2022-05-23 16:47:15 +0000

    x11/waybar: update to 0.9.13
    
    Changes:        https://github.com/Alexays/Waybar/releases/tag/0.9.13
    Reported by:    GitHub (watch releases)
    
    (cherry picked from commit 3d285b4adb9be06ace919c6380cde9fc2949c3f5)
---
 x11/waybar/Makefile | 21 ++++++++++++++++-----
 x11/waybar/distinfo | 10 +++++-----
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/x11/waybar/Makefile b/x11/waybar/Makefile
index d22ad137f04d..989a5ce60df0 100644
--- a/x11/waybar/Makefile
+++ b/x11/waybar/Makefile
@@ -1,10 +1,9 @@
 PORTNAME=	waybar
-DISTVERSION=	0.9.12
-PORTREVISION=	2
+DISTVERSION=	0.9.13
 CATEGORIES=	x11
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
-PATCHFILES+=	8b6bc215ccdd.patch:-p1 # https://github.com/Alexays/Waybar/pull/1476
+PATCHFILES+=	d25278f710a4.patch:-p1 # https://github.com/Alexays/Waybar/pull/1567
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Highly customizable Wayland bar for Sway and wlroots-based compositors
@@ -36,8 +35,8 @@ CONFIGURE_ENV+=	PKG_CONFIG_PATH="${WRKDIR}"
 SUB_FILES+=	date.pc
 .endif
 
-OPTIONS_DEFINE=	DBUS EVDEV GLS ICONSFONT MANPAGES MPD PULSEAUDIO SNDIO UDEV
-OPTIONS_DEFAULT=DBUS EVDEV GLS ICONSFONT MANPAGES MPD PULSEAUDIO SNDIO UDEV
+OPTIONS_DEFINE=	DBUS EVDEV GLS ICONSFONT MANPAGES MPD PULSEAUDIO SNDIO UDEV UPOWER
+OPTIONS_DEFAULT=DBUS EVDEV GLS ICONSFONT MANPAGES MPD PULSEAUDIO SNDIO UDEV UPOWER
 
 DBUS_LIB_DEPENDS=	libdbusmenu-gtk3.so:devel/libdbusmenu
 DBUS_MESON_ENABLED=	dbusmenu-gtk
@@ -71,6 +70,7 @@ MANPAGES_PLIST_FILES=	man/man5/${PORTNAME}-backlight.5.gz \
 			man/man5/${PORTNAME}-network.5.gz \
 			man/man5/${PORTNAME}-pulseaudio.5.gz \
 			man/man5/${PORTNAME}-river-tags.5.gz \
+			man/man5/${PORTNAME}-river-window.5.gz \
 			man/man5/${PORTNAME}-sndio.5.gz \
 			man/man5/${PORTNAME}-states.5.gz \
 			man/man5/${PORTNAME}-sway-language.5.gz \
@@ -79,6 +79,7 @@ MANPAGES_PLIST_FILES=	man/man5/${PORTNAME}-backlight.5.gz \
 			man/man5/${PORTNAME}-sway-workspaces.5.gz \
 			man/man5/${PORTNAME}-temperature.5.gz \
 			man/man5/${PORTNAME}-tray.5.gz \
+			man/man5/${PORTNAME}-upower.5.gz \
 			man/man5/${PORTNAME}-wlr-taskbar.5.gz \
 			man/man5/${PORTNAME}-wlr-workspaces.5.gz \
 			man/man5/${PORTNAME}.5.gz \
@@ -100,11 +101,21 @@ UDEV_LIB_DEPENDS=	libepoll-shim.so:devel/libepoll-shim \
 			libudev.so:devel/libudev-devd
 UDEV_MESON_ENABLED=	libudev
 
+UPOWER_DESC=		Monitor battery capacity via UPower
+UPOWER_LIB_DEPENDS=	libupower-glib.so:sysutils/upower
+UPOWER_MESON_ENABLED=	upower_glib
+
 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
+# Temporarily use ConsoleKit2 like sysutils/gnome-settings-daemon
+	@${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/upower.cpp
 
 pre-test:
 	@if [ ! -e ${WRKDIR}/.meson_build_tests ]; then \
diff --git a/x11/waybar/distinfo b/x11/waybar/distinfo
index 35e352e3f0f2..4a7e8371b2c1 100644
--- a/x11/waybar/distinfo
+++ b/x11/waybar/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1646902405
-SHA256 (Alexays-Waybar-0.9.12_GH0.tar.gz) = 1f3f6692de99567c43939e7ad2e96f8c6a5ef83f760ad6f77865e46a3c6811d6
-SIZE (Alexays-Waybar-0.9.12_GH0.tar.gz) = 183392
-SHA256 (8b6bc215ccdd.patch) = 53ce1f7a8ebd7a1f361e7fe3f72c054979c1c84e59d536647177c616a50df0ff
-SIZE (8b6bc215ccdd.patch) = 1396
+TIMESTAMP = 1653306864
+SHA256 (Alexays-Waybar-0.9.13_GH0.tar.gz) = 9e6553274ce3013d2be9912f975287efe4dfd38de4e335db43a73aff2a3b0a34
+SIZE (Alexays-Waybar-0.9.13_GH0.tar.gz) = 198160
+SHA256 (d25278f710a4.patch) = 6a0d4311a995f221202defaecb72fc6522c85f63d379e332a48a27373badf932
+SIZE (d25278f710a4.patch) = 1568