Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 18 Jul 2024 23:13:32 GMT
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org
Subject:   git: bde5dc89f74d - 2024Q3 - x11/waybar: update to 0.10.4
Message-ID:  <202407182313.46INDWla075428@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch 2024Q3 has been updated by jbeich:

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

commit bde5dc89f74d49a7188a403eaf97d089eba5de2c
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2024-07-17 21:04:05 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2024-07-18 23:13:25 +0000

    x11/waybar: update to 0.10.4
    
    Changes:        https://github.com/Alexays/Waybar/releases/tag/0.10.4
    (cherry picked from commit ed35a2bb42eb4d38f280b29b39919364477e2615)
---
 x11/waybar/Makefile                 |  5 +++--
 x11/waybar/distinfo                 |  6 +++---
 x11/waybar/files/patch-no-systemctl | 34 ++++++++++++++++++++++++++++++++++
 3 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/x11/waybar/Makefile b/x11/waybar/Makefile
index 0e7e6916849f..018f85209fd2 100644
--- a/x11/waybar/Makefile
+++ b/x11/waybar/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	waybar
-DISTVERSION=	0.10.3
+DISTVERSION=	0.10.4
 CATEGORIES=	x11 wayland
 PKGNAMESUFFIX=	${FLAVOR:N${FLAVORS:[1]}:C/.+/-${FLAVOR}/}
 
@@ -88,6 +88,7 @@ MANPAGES_PLIST_FILES=	share/man/man5/${PORTNAME}-battery.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}-river-layout.5.gz \
 			share/man/man5/${PORTNAME}-river-mode.5.gz \
 			share/man/man5/${PORTNAME}-river-tags.5.gz \
@@ -154,7 +155,7 @@ post-patch:
 		-e 's,login1\([".]\),ConsoleKit\1,g' \
 		${WRKSRC}/src/modules/gamemode.cpp \
 		${WRKSRC}/src/modules/inhibitor.cpp \
-		${WRKSRC}/src/modules/upower/upower.cpp \
+		${WRKSRC}/src/modules/upower.cpp \
 		${WRKSRC}/src/util/backlight_backend.cpp \
 		${WRKSRC}/src/util/prepare_for_sleep.cpp
 # Respect PREFIX for icons
diff --git a/x11/waybar/distinfo b/x11/waybar/distinfo
index 9185d2ca5029..4e24af589c1f 100644
--- a/x11/waybar/distinfo
+++ b/x11/waybar/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1714985692
-SHA256 (Alexays-Waybar-0.10.3_GH0.tar.gz) = 50a9ae85d3dcfef04e4bc4e0f3470f187964e4466c156e5558850cea84a3df5c
-SIZE (Alexays-Waybar-0.10.3_GH0.tar.gz) = 301886
+TIMESTAMP = 1721250245
+SHA256 (Alexays-Waybar-0.10.4_GH0.tar.gz) = ad1ead64aec35bc589207ea1edce90e848620d578985967d44a850a66b5ef829
+SIZE (Alexays-Waybar-0.10.4_GH0.tar.gz) = 309411
 SHA256 (llvm-llvm-project-llvmorg-16.0.1_GH0.tar.gz) = b5a9ff1793b1e2d388a3819bf35797002b1d2e40bb35a10c65605e0ea1435271
 SIZE (llvm-llvm-project-llvmorg-16.0.1_GH0.tar.gz) = 179289803
diff --git a/x11/waybar/files/patch-no-systemctl b/x11/waybar/files/patch-no-systemctl
new file mode 100644
index 000000000000..96ad62562b92
--- /dev/null
+++ b/x11/waybar/files/patch-no-systemctl
@@ -0,0 +1,34 @@
+--- 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"
+ 		}
+     }
+ }



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202407182313.46INDWla075428>