CVS commit: pkgsrc/wayland/waybar

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

Module Name:    pkgsrc
Committed By:   kikadf
Date:           Thu Oct  1 12:17:16 UTC 2026

Modified Files:
        pkgsrc/wayland/waybar: Makefile distinfo
        pkgsrc/wayland/waybar/patches: patch-src_modules_cpu__frequency_bsd.cpp

Log Message:
waybar: update cpu_frequency patch


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/wayland/waybar/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/wayland/waybar/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/wayland/waybar/patches/patch-src_modules_cpu__frequency_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.5 pkgsrc/wayland/waybar/Makefile:1.6
--- pkgsrc/wayland/waybar/Makefile:1.5  Tue Sep 29 06:07:58 2026
+++ pkgsrc/wayland/waybar/Makefile      Thu Oct  1 12:17:16 2026
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2026/09/29 06:07:58 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2026/10/01 12:17:16 kikadf Exp $
 
 DISTNAME=      waybar-0.15.0
-PKGREVISION=   4
+PKGREVISION=   5
 CATEGORIES=    wayland
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=Alexays/}
 GITHUB_PROJECT=        Waybar

Index: pkgsrc/wayland/waybar/distinfo
diff -u pkgsrc/wayland/waybar/distinfo:1.2 pkgsrc/wayland/waybar/distinfo:1.3
--- pkgsrc/wayland/waybar/distinfo:1.2  Thu Sep 10 09:15:31 2026
+++ pkgsrc/wayland/waybar/distinfo      Thu Oct  1 12:17:16 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2026/09/10 09:15:31 kikadf Exp $
+$NetBSD: distinfo,v 1.3 2026/10/01 12:17:16 kikadf Exp $
 
 BLAKE2s (waybar-0.15.0.tar.gz) = 59b011bb71da6acc9b3ee333f6ab9bbb4ccbb22b1627112b53b13135db4baa22
 SHA512 (waybar-0.15.0.tar.gz) = f267c1ad2af1e4e74c3d8c966009a013c0b5c2849bfaf312b3b91e9d6f6856dc5466118f308208948118ea1de0cf70986cc3b592cc830f84d634b8518c5b8c9e
@@ -8,7 +8,7 @@ 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) = 5afff7e55472fc028eff8c75b3383b3851f81861
+SHA1 (patch-src_modules_cpu__frequency_bsd.cpp) = 39b9292c02cb195b4c64117183d64e4fa4af0af8
 SHA1 (patch-src_modules_custom.cpp) = 644740e4862444b7ed33523affe5d97e5fcbdd32
 SHA1 (patch-src_modules_memory_bsd.cpp) = 48e773d3ff412d156e0a481e927067e73eb6bee4
 SHA1 (patch-src_modules_simpleclock.cpp) = 7ffa485e5cc9033e090d46133654243cbd1b3f8d

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.2 pkgsrc/wayland/waybar/patches/patch-src_modules_cpu__frequency_bsd.cpp:1.3
--- pkgsrc/wayland/waybar/patches/patch-src_modules_cpu__frequency_bsd.cpp:1.2  Thu Sep 10 09:15:32 2026
+++ pkgsrc/wayland/waybar/patches/patch-src_modules_cpu__frequency_bsd.cpp      Thu Oct  1 12:17:16 2026
@@ -1,29 +1,72 @@
-$NetBSD: patch-src_modules_cpu__frequency_bsd.cpp,v 1.2 2026/09/10 09:15:32 kikadf Exp $
+$NetBSD: patch-src_modules_cpu__frequency_bsd.cpp,v 1.3 2026/10/01 12:17:16 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.orig     2026-02-06 20:15:03.000000000 +0000
 +++ src/modules/cpu_frequency/bsd.cpp
-@@ -8,7 +8,7 @@ std::vector<float> waybar::modules::CpuF
+@@ -8,21 +8,58 @@ std::vector<float> waybar::modules::CpuF
    size_t len;
    int32_t freq;
  
 -#ifndef __OpenBSD__
-+#if defined(__FreeBSD__)
++#if defined(__NetBSD__)
    char buffer[256];
++  const char *freq_sysctls[] = {
++#if defined(__powerpc__)
++    "machdep.intrepid.frequency.current",
++#endif
++#if defined(__mips__)
++    "machdep.loongson.frequency.current",
++#endif
++#if defined(__i386__) || defined(__x86_64__)
++    "machdep.est.frequency.current",
++    "machdep.powernow.frequency.current",
++#endif
++    "machdep.cpu.frequency.current",
++    "machdep.frequency.current",
++    NULL
++  };
    uint32_t i = 0;
++
    while (true) {
-@@ -18,7 +18,11 @@ std::vector<float> waybar::modules::CpuF
-     frequencies.push_back(freq);
+-    len = 4;
+-    snprintf(buffer, 256, "dev.cpu.%u.freq", i);
++    len = sizeof(freq);
++    snprintf(buffer, 256, "machdep.cpufreq.cpu%u.current", i);
+     if (sysctlbyname(buffer, &freq, &len, NULL, 0) == -1 || len <= 0) break;
+-    frequencies.push_back(freq);
++    frequencies.push_back((float)freq);
      ++i;
-   }
+-  }
 -#else
-+#elif defined(__NetBSD__)
-+  if (sysctlbyname("machdep.cpu.frequency.current", &freq, &len, NULL, 0) == 0) {
-+    frequencies.push_back((float)freq);
-+  }
++  } 
++
++  if (frequencies.empty()) {
++    const char **s;
++    for (s = freq_sysctls; *s != NULL; ++s) {
++      len = sizeof(freq);
++      if (sysctlbyname(*s, &freq, &len, NULL, 0) != -1 || len <= 0) {
++        frequencies.push_back((float)freq);
++        break;
++      }
++    }
++  } 
 +#elif defined(__OpenBSD__)
    int getMhz[] = {CTL_HW, HW_CPUSPEED};
    len = sizeof(freq);
    sysctl(getMhz, 2, &freq, &len, NULL, 0);
+   frequencies.push_back((float)freq);
++#else
++  char buffer[256];
++  uint32_t i = 0;
++  while (true) {
++    len = 4;
++    snprintf(buffer, 256, "dev.cpu.%u.freq", i);
++    if (sysctlbyname(buffer, &freq, &len, NULL, 0) == -1 || len <= 0) break;
++    frequencies.push_back(freq);
++    ++i;
++  }
+ #endif
+ 
+   if (frequencies.empty()) {