CVS commit: pkgsrc/wayland/waybar

["Robert Bagdan" <kikadf%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   kikadf
Date:           Thu Sep 10 09:15:32 UTC 2026

Modified Files:
        pkgsrc/wayland/waybar: Makefile distinfo
        pkgsrc/wayland/waybar/patches: patch-include_modules_battery.hpp
            patch-include_util_udev__deleter.hpp patch-meson.build
            patch-src_factory.cpp patch-src_modules_battery.cpp
            patch-src_modules_cpu__frequency_bsd.cpp
            patch-src_modules_custom.cpp patch-src_modules_simpleclock.cpp
            patch-src_modules_user.cpp patch-src_util_icon__loader.cpp
Added Files:
        pkgsrc/wayland/waybar/patches: patch-src_modules_memory_bsd.cpp

Log Message:
waybar: fix memory info module


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/wayland/waybar/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/wayland/waybar/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/wayland/waybar/patches/patch-include_modules_battery.hpp \
    pkgsrc/wayland/waybar/patches/patch-include_util_udev__deleter.hpp \
    pkgsrc/wayland/waybar/patches/patch-meson.build \
    pkgsrc/wayland/waybar/patches/patch-src_factory.cpp \
    pkgsrc/wayland/waybar/patches/patch-src_modules_battery.cpp \
    pkgsrc/wayland/waybar/patches/patch-src_modules_cpu__frequency_bsd.cpp \
    pkgsrc/wayland/waybar/patches/patch-src_modules_custom.cpp \
    pkgsrc/wayland/waybar/patches/patch-src_modules_simpleclock.cpp \
    pkgsrc/wayland/waybar/patches/patch-src_modules_user.cpp \
    pkgsrc/wayland/waybar/patches/patch-src_util_icon__loader.cpp
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/wayland/waybar/patches/patch-src_modules_memory_bsd.cpp

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

Modified files:

Index: pkgsrc/wayland/waybar/Makefile
diff -u pkgsrc/wayland/waybar/Makefile:1.2 pkgsrc/wayland/waybar/Makefile:1.3
--- pkgsrc/wayland/waybar/Makefile:1.2  Wed Sep  2 19:04:51 2026
+++ pkgsrc/wayland/waybar/Makefile      Thu Sep 10 09:15:31 2026
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2026/09/02 19:04:51 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2026/09/10 09:15:31 kikadf Exp $
 
 DISTNAME=      waybar-0.15.0
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    wayland
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=Alexays/}
 GITHUB_PROJECT=        Waybar

Index: pkgsrc/wayland/waybar/distinfo
diff -u pkgsrc/wayland/waybar/distinfo:1.1 pkgsrc/wayland/waybar/distinfo:1.2
--- pkgsrc/wayland/waybar/distinfo:1.1  Mon Aug 24 14:25:31 2026
+++ pkgsrc/wayland/waybar/distinfo      Thu Sep 10 09:15:31 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1 2026/08/24 14:25:31 kikadf Exp $
+$NetBSD: distinfo,v 1.2 2026/09/10 09:15:31 kikadf Exp $
 
 BLAKE2s (waybar-0.15.0.tar.gz) = 59b011bb71da6acc9b3ee333f6ab9bbb4ccbb22b1627112b53b13135db4baa22
 SHA512 (waybar-0.15.0.tar.gz) = f267c1ad2af1e4e74c3d8c966009a013c0b5c2849bfaf312b3b91e9d6f6856dc5466118f308208948118ea1de0cf70986cc3b592cc830f84d634b8518c5b8c9e
@@ -8,8 +8,9 @@ SHA1 (patch-include_util_udev__deleter.h
 SHA1 (patch-meson.build) = ffb2de1b1c11b79312ef166411ac93f3f4433cc7
 SHA1 (patch-src_factory.cpp) = de849a029ac8b51381bbe4b94ea59ab9c94c44ef
 SHA1 (patch-src_modules_battery.cpp) = 4ee104fb0ed46112c09d8559687d910e08ee93b0
-SHA1 (patch-src_modules_cpu__frequency_bsd.cpp) = 9ad194942940b2b38b0f01d6a96408cd23969269
+SHA1 (patch-src_modules_cpu__frequency_bsd.cpp) = 5afff7e55472fc028eff8c75b3383b3851f81861
 SHA1 (patch-src_modules_custom.cpp) = 644740e4862444b7ed33523affe5d97e5fcbdd32
+SHA1 (patch-src_modules_memory_bsd.cpp) = 48e773d3ff412d156e0a481e927067e73eb6bee4
 SHA1 (patch-src_modules_simpleclock.cpp) = 7ffa485e5cc9033e090d46133654243cbd1b3f8d
-SHA1 (patch-src_modules_user.cpp) = 7b9d5578a64d2b1fefbecd650549c5e9f8ea19ad
-SHA1 (patch-src_util_icon__loader.cpp) = 29b8f755333ab617263b6f80e20c993025300e9a
+SHA1 (patch-src_modules_user.cpp) = ddc4941a988f157ac1b2b6d11181a491541b8147
+SHA1 (patch-src_util_icon__loader.cpp) = 6554d2ef732dedb2e55dfc6deba05a456f2963a1

Index: pkgsrc/wayland/waybar/patches/patch-include_modules_battery.hpp
diff -u pkgsrc/wayland/waybar/patches/patch-include_modules_battery.hpp:1.1 pkgsrc/wayland/waybar/patches/patch-include_modules_battery.hpp:1.2
--- pkgsrc/wayland/waybar/patches/patch-include_modules_battery.hpp:1.1 Mon Aug 24 14:25:32 2026
+++ pkgsrc/wayland/waybar/patches/patch-include_modules_battery.hpp     Thu Sep 10 09:15:32 2026
@@ -1,4 +1,4 @@
-$NetBSD: patch-include_modules_battery.hpp,v 1.1 2026/08/24 14:25:32 kikadf Exp $
+$NetBSD: patch-include_modules_battery.hpp,v 1.2 2026/09/10 09:15:32 kikadf Exp $
 
 * Use udev only for linux
 
Index: pkgsrc/wayland/waybar/patches/patch-include_util_udev__deleter.hpp
diff -u pkgsrc/wayland/waybar/patches/patch-include_util_udev__deleter.hpp:1.1 pkgsrc/wayland/waybar/patches/patch-include_util_udev__deleter.hpp:1.2
--- pkgsrc/wayland/waybar/patches/patch-include_util_udev__deleter.hpp:1.1      Mon Aug 24 14:25:32 2026
+++ pkgsrc/wayland/waybar/patches/patch-include_util_udev__deleter.hpp  Thu Sep 10 09:15:32 2026
@@ -1,4 +1,4 @@
-$NetBSD: patch-include_util_udev__deleter.hpp,v 1.1 2026/08/24 14:25:32 kikadf Exp $
+$NetBSD: patch-include_util_udev__deleter.hpp,v 1.2 2026/09/10 09:15:32 kikadf Exp $
 
 * Use udev only for linux
 
Index: pkgsrc/wayland/waybar/patches/patch-meson.build
diff -u pkgsrc/wayland/waybar/patches/patch-meson.build:1.1 pkgsrc/wayland/waybar/patches/patch-meson.build:1.2
--- pkgsrc/wayland/waybar/patches/patch-meson.build:1.1 Mon Aug 24 14:25:32 2026
+++ pkgsrc/wayland/waybar/patches/patch-meson.build     Thu Sep 10 09:15:32 2026
@@ -1,4 +1,4 @@
-$NetBSD: patch-meson.build,v 1.1 2026/08/24 14:25:32 kikadf Exp $
+$NetBSD: patch-meson.build,v 1.2 2026/09/10 09:15:32 kikadf Exp $
 
 * Build battery on NetBSD, link with -lprop
 * Config files to examples
Index: pkgsrc/wayland/waybar/patches/patch-src_factory.cpp
diff -u pkgsrc/wayland/waybar/patches/patch-src_factory.cpp:1.1 pkgsrc/wayland/waybar/patches/patch-src_factory.cpp:1.2
--- pkgsrc/wayland/waybar/patches/patch-src_factory.cpp:1.1     Mon Aug 24 14:25:32 2026
+++ pkgsrc/wayland/waybar/patches/patch-src_factory.cpp Thu Sep 10 09:15:32 2026
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_factory.cpp,v 1.1 2026/08/24 14:25:32 kikadf Exp $
+$NetBSD: patch-src_factory.cpp,v 1.2 2026/09/10 09:15:32 kikadf Exp $
 
 * Enable battery module on NetBSD
 
Index: pkgsrc/wayland/waybar/patches/patch-src_modules_battery.cpp
diff -u pkgsrc/wayland/waybar/patches/patch-src_modules_battery.cpp:1.1 pkgsrc/wayland/waybar/patches/patch-src_modules_battery.cpp:1.2
--- pkgsrc/wayland/waybar/patches/patch-src_modules_battery.cpp:1.1     Mon Aug 24 14:25:32 2026
+++ pkgsrc/wayland/waybar/patches/patch-src_modules_battery.cpp Thu Sep 10 09:15:32 2026
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_modules_battery.cpp,v 1.1 2026/08/24 14:25:32 kikadf Exp $
+$NetBSD: patch-src_modules_battery.cpp,v 1.2 2026/09/10 09:15:32 kikadf Exp $
 
 * Add NetBSD support
 * Use udev only for linux
Index: pkgsrc/wayland/waybar/patches/patch-src_modules_cpu__frequency_bsd.cpp
diff -u pkgsrc/wayland/waybar/patches/patch-src_modules_cpu__frequency_bsd.cpp:1.1 pkgsrc/wayland/waybar/patches/patch-src_modules_cpu__frequency_bsd.cpp:1.2
--- pkgsrc/wayland/waybar/patches/patch-src_modules_cpu__frequency_bsd.cpp:1.1  Mon Aug 24 14:25:32 2026
+++ pkgsrc/wayland/waybar/patches/patch-src_modules_cpu__frequency_bsd.cpp      Thu Sep 10 09:15:32 2026
@@ -1,6 +1,7 @@
-$NetBSD: patch-src_modules_cpu__frequency_bsd.cpp,v 1.1 2026/08/24 14:25:32 kikadf Exp $
+$NetBSD: patch-src_modules_cpu__frequency_bsd.cpp,v 1.2 2026/09/10 09:15:32 kikadf Exp $
 
 * Add NetBSD support
+https://github.com/Alexays/Waybar/pull/5318
 
 --- src/modules/cpu_frequency/bsd.cpp.orig     2026-05-25 08:52:26.638052357 +0000
 +++ src/modules/cpu_frequency/bsd.cpp
Index: pkgsrc/wayland/waybar/patches/patch-src_modules_custom.cpp
diff -u pkgsrc/wayland/waybar/patches/patch-src_modules_custom.cpp:1.1 pkgsrc/wayland/waybar/patches/patch-src_modules_custom.cpp:1.2
--- pkgsrc/wayland/waybar/patches/patch-src_modules_custom.cpp:1.1      Mon Aug 24 14:25:32 2026
+++ pkgsrc/wayland/waybar/patches/patch-src_modules_custom.cpp  Thu Sep 10 09:15:32 2026
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_modules_custom.cpp,v 1.1 2026/08/24 14:25:32 kikadf Exp $
+$NetBSD: patch-src_modules_custom.cpp,v 1.2 2026/09/10 09:15:32 kikadf Exp $
 
 * Portable WEXITSTATUS usage
 
Index: pkgsrc/wayland/waybar/patches/patch-src_modules_simpleclock.cpp
diff -u pkgsrc/wayland/waybar/patches/patch-src_modules_simpleclock.cpp:1.1 pkgsrc/wayland/waybar/patches/patch-src_modules_simpleclock.cpp:1.2
--- pkgsrc/wayland/waybar/patches/patch-src_modules_simpleclock.cpp:1.1 Mon Aug 24 14:25:32 2026
+++ pkgsrc/wayland/waybar/patches/patch-src_modules_simpleclock.cpp     Thu Sep 10 09:15:32 2026
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_modules_simpleclock.cpp,v 1.1 2026/08/24 14:25:32 kikadf Exp $
+$NetBSD: patch-src_modules_simpleclock.cpp,v 1.2 2026/09/10 09:15:32 kikadf Exp $
 
 * fmt::localtime was removed in fmtlib-12
 
Index: pkgsrc/wayland/waybar/patches/patch-src_modules_user.cpp
diff -u pkgsrc/wayland/waybar/patches/patch-src_modules_user.cpp:1.1 pkgsrc/wayland/waybar/patches/patch-src_modules_user.cpp:1.2
--- pkgsrc/wayland/waybar/patches/patch-src_modules_user.cpp:1.1        Mon Aug 24 14:25:32 2026
+++ pkgsrc/wayland/waybar/patches/patch-src_modules_user.cpp    Thu Sep 10 09:15:32 2026
@@ -1,6 +1,7 @@
-$NetBSD: patch-src_modules_user.cpp,v 1.1 2026/08/24 14:25:32 kikadf Exp $
+$NetBSD: patch-src_modules_user.cpp,v 1.2 2026/09/10 09:15:32 kikadf Exp $
 
 * Portable uptime usage, fallback to CLOCK_MONOTONIC
+https://github.com/Alexays/Waybar/pull/5320
 
 --- src/modules/user.cpp.orig  2025-12-18 09:12:40.964198952 +0000
 +++ src/modules/user.cpp
Index: pkgsrc/wayland/waybar/patches/patch-src_util_icon__loader.cpp
diff -u pkgsrc/wayland/waybar/patches/patch-src_util_icon__loader.cpp:1.1 pkgsrc/wayland/waybar/patches/patch-src_util_icon__loader.cpp:1.2
--- pkgsrc/wayland/waybar/patches/patch-src_util_icon__loader.cpp:1.1   Mon Aug 24 14:25:32 2026
+++ pkgsrc/wayland/waybar/patches/patch-src_util_icon__loader.cpp       Thu Sep 10 09:15:32 2026
@@ -1,6 +1,7 @@
-$NetBSD: patch-src_util_icon__loader.cpp,v 1.1 2026/08/24 14:25:32 kikadf Exp $
+$NetBSD: patch-src_util_icon__loader.cpp,v 1.2 2026/09/10 09:15:32 kikadf Exp $
 
 * Fix ctype usage
+https://github.com/Alexays/Waybar/pull/5321
 
 --- src/util/icon_loader.cpp.orig      2026-07-27 13:52:11.975754660 +0000
 +++ src/util/icon_loader.cpp

Added files:

Index: pkgsrc/wayland/waybar/patches/patch-src_modules_memory_bsd.cpp
diff -u /dev/null pkgsrc/wayland/waybar/patches/patch-src_modules_memory_bsd.cpp:1.1
--- /dev/null   Thu Sep 10 09:15:32 2026
+++ pkgsrc/wayland/waybar/patches/patch-src_modules_memory_bsd.cpp      Thu Sep 10 09:15:32 2026
@@ -0,0 +1,24 @@
+$NetBSD: patch-src_modules_memory_bsd.cpp,v 1.1 2026/09/10 09:15:32 kikadf Exp $
+
+* Fix get_free_memory on NetBSD, avoid underflow
+https://github.com/Alexays/Waybar/pull/5319
+
+--- src/modules/memory/bsd.cpp.orig    2026-09-09 17:46:47.416277348 +0000
++++ src/modules/memory/bsd.cpp
+@@ -73,10 +73,16 @@ static uint64_t get_free_memory() {
+   if (sysctl(mib, miblen, &uvmexp, &sz, NULL, 0)) {
+     throw std::runtime_error("sysctl vm.uvmexp failed");
+   }
++#ifdef VM_UVMEXP2
++  uint64_t total = get_total_memory();
++  uint64_t used = static_cast<uint64_t>(uvmexp.active + uvmexp.wired) * uvmexp.pagesize;
++  return used < total ? total - used : 0;
++#else
+   return static_cast<uint64_t>(uvmexp.free + uvmexp.inactive + uvmexp.filepages +
+                                uvmexp.execpages) *
+          uvmexp.pagesize;
+ #endif
++#endif
+ }
+ 
+ void waybar::modules::Memory::parseMeminfo() {