waybar: fix ctype usage, add missing conf file

[kikadf (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	kikadf <kikadf.01%gmail.com@localhost>
Pushed By:	kikadf
Date:		Mon Jul 27 18:06:04 2026 +0200
Changeset:	d97e6d7a12015e6d39ea1e734a371c9934883edc

Modified Files:
	waybar/Makefile
	waybar/PLIST
	waybar/distinfo
	waybar/patches/patch-meson.build
	waybar/patches/patch-src_modules_battery.cpp
Added Files:
	waybar/patches/patch-src_util_icon__loader.cpp

Log Message:
waybar: fix ctype usage, add missing conf file

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=d97e6d7a12015e6d39ea1e734a371c9934883edc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 waybar/Makefile                                |  5 +++++
 waybar/PLIST                                   |  1 +
 waybar/distinfo                                |  5 +++--
 waybar/patches/patch-meson.build               | 12 ------------
 waybar/patches/patch-src_modules_battery.cpp   |  2 +-
 waybar/patches/patch-src_util_icon__loader.cpp | 15 +++++++++++++++
 6 files changed, 25 insertions(+), 15 deletions(-)

diffs:
diff --git a/waybar/Makefile b/waybar/Makefile
index 09c61618b8..b363e4b20a 100644
--- a/waybar/Makefile
+++ b/waybar/Makefile
@@ -32,10 +32,15 @@ SUBST_SED.conf+=	-e 's|SYSCONFDIR "|"${PKG_SYSCONFBASE}|g'
 EGDIR=		${PREFIX}/share/examples/waybar
 CONF_FILES=	${EGDIR}/config.jsonc ${PKG_SYSCONFDIR}/config.jsonc
 CONF_FILES+=	${EGDIR}/style.css ${PKG_SYSCONFDIR}/style.css
+CONF_FILES+=	${EGDIR}/power_menu.xml ${PKG_SYSCONFDIR}/power_menu.xml
 
 PKG_SYSCONFSUBDIR=	xdg/waybar
 BUILD_DEFS+=		PKG_SYSCONFBASE
 
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/resources/custom_modules/power_menu.xml \
+		${DESTDIR}${EGDIR}
+
 .include "../../devel/meson/build.mk"
 .include "../../textproc/scdoc/tool.mk"
 .include "../../devel/chrono-date/buildlink3.mk"
diff --git a/waybar/PLIST b/waybar/PLIST
index bfc6f4cd41..7ad6060877 100644
--- a/waybar/PLIST
+++ b/waybar/PLIST
@@ -39,4 +39,5 @@ man/man5/waybar-tray.5
 man/man5/waybar-wlr-taskbar.5
 man/man5/waybar.5
 share/examples/waybar/config.jsonc
+share/examples/waybar/power_menu.xml
 share/examples/waybar/style.css
diff --git a/waybar/distinfo b/waybar/distinfo
index 45fea6b05e..f57f41f258 100644
--- a/waybar/distinfo
+++ b/waybar/distinfo
@@ -5,10 +5,11 @@ SHA512 (waybar-0.15.0.tar.gz) = f267c1ad2af1e4e74c3d8c966009a013c0b5c2849bfaf312
 Size (waybar-0.15.0.tar.gz) = 355671 bytes
 SHA1 (patch-include_modules_battery.hpp) = 3bebca10de357bc25a70d26d677a8f7717d3b495
 SHA1 (patch-include_util_udev__deleter.hpp) = 8f95df3fc76f9f7461fe4576994c6fdfacb3b91b
-SHA1 (patch-meson.build) = 3c081f5d65408b0703eec9f7239e54942b89e9b0
+SHA1 (patch-meson.build) = ffb2de1b1c11b79312ef166411ac93f3f4433cc7
 SHA1 (patch-src_factory.cpp) = de849a029ac8b51381bbe4b94ea59ab9c94c44ef
-SHA1 (patch-src_modules_battery.cpp) = 0b4483af30c912a5ebaae94ea329123b63a4580a
+SHA1 (patch-src_modules_battery.cpp) = 4ee104fb0ed46112c09d8559687d910e08ee93b0
 SHA1 (patch-src_modules_cpu__frequency_bsd.cpp) = 9ad194942940b2b38b0f01d6a96408cd23969269
 SHA1 (patch-src_modules_custom.cpp) = 644740e4862444b7ed33523affe5d97e5fcbdd32
 SHA1 (patch-src_modules_simpleclock.cpp) = 7ffa485e5cc9033e090d46133654243cbd1b3f8d
 SHA1 (patch-src_modules_user.cpp) = 7b9d5578a64d2b1fefbecd650549c5e9f8ea19ad
+SHA1 (patch-src_util_icon__loader.cpp) = 29b8f755333ab617263b6f80e20c993025300e9a
diff --git a/waybar/patches/patch-meson.build b/waybar/patches/patch-meson.build
index 462b314d2e..44807e8c23 100644
--- a/waybar/patches/patch-meson.build
+++ b/waybar/patches/patch-meson.build
@@ -5,18 +5,6 @@ $NetBSD$
 
 --- meson.build.orig	2026-02-06 20:15:03.000000000 +0000
 +++ meson.build
-@@ -26,9 +26,9 @@ elif compiler.has_link_argument('-lstdc+
-     cpp_link_args += ['-lstdc++fs']
- endif
- 
--git = find_program('git', native: true, required: false)
-+########################git = find_program('git', native: true, required: false)
- 
--if not git.found()
-+if not false
-     add_project_arguments('-DVERSION="@0@"'.format(meson.project_version()), language: 'cpp')
- else
-     git_path = run_command(git, 'rev-parse', '--show-toplevel', check: false).stdout().strip()
 @@ -58,15 +58,19 @@ if compiler.links(code, name : 'nl_langi
      add_project_arguments('-DHAVE_LANGINFO_1STDAY', language: 'cpp')
  endif
diff --git a/waybar/patches/patch-src_modules_battery.cpp b/waybar/patches/patch-src_modules_battery.cpp
index 37ddb785f0..c9dbe1128c 100644
--- a/waybar/patches/patch-src_modules_battery.cpp
+++ b/waybar/patches/patch-src_modules_battery.cpp
@@ -143,7 +143,7 @@ $NetBSD$
 +    spdlog::info("{} {} {} {}", max_charge,cur_charge,charge_rate,discharge_rate);
 +
 +    if (max_charge <= 0) max_charge = last_max_charge;
-+    if (charge_rate == 0 && discharge_rate == 0) {
++    if (charge_rate == 0 && (discharge_rate == 0 || discharge_rate == -1000)) {
 +        time_remaining = 0.0;
 +        power = 0.0;
 +    } else {
diff --git a/waybar/patches/patch-src_util_icon__loader.cpp b/waybar/patches/patch-src_util_icon__loader.cpp
new file mode 100644
index 0000000000..dc2d0b6df7
--- /dev/null
+++ b/waybar/patches/patch-src_util_icon__loader.cpp
@@ -0,0 +1,15 @@
+$NetBSD$
+
+* Fix ctype usage
+
+--- src/util/icon_loader.cpp.orig	2026-07-27 13:52:11.975754660 +0000
++++ src/util/icon_loader.cpp
+@@ -185,7 +185,7 @@ Glib::RefPtr<Gio::DesktopAppInfo> IconLo
+ 
+     auto lower_app_id = app_id;
+     std::ranges::transform(lower_app_id, lower_app_id.begin(),
+-                           [](char c) { return std::tolower(c); });
++                           [](char c) { return static_cast<char>(std::tolower(static_cast<unsigned char>(c))); });
+     app_info_ = get_desktop_app_info(lower_app_id);
+     if (app_info_) {
+       return app_info_;