pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

sfwbar: update to 1.0_beta17



Module Name:	pkgsrc-wip
Committed By:	kikadf <kikadf.01%gmail.com@localhost>
Pushed By:	kikadf
Date:		Wed Mar 18 15:44:29 2026 +0100
Changeset:	aa392e97b8a98461ae95b55f163bac627604b1ad

Modified Files:
	sfwbar/Makefile
	sfwbar/PLIST
	sfwbar/distinfo
Added Files:
	sfwbar/patches/patch-config_memory.source

Log Message:
sfwbar: update to 1.0_beta17

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

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

diffstat:
 sfwbar/Makefile                           |  8 ++++++--
 sfwbar/PLIST                              | 10 ++++++----
 sfwbar/distinfo                           |  7 ++++---
 sfwbar/patches/patch-config_memory.source | 26 ++++++++++++++++++++++++++
 4 files changed, 42 insertions(+), 9 deletions(-)

diffs:
diff --git a/sfwbar/Makefile b/sfwbar/Makefile
index 33f9b30ba8..7f6df80372 100644
--- a/sfwbar/Makefile
+++ b/sfwbar/Makefile
@@ -1,9 +1,9 @@
 # $NetBSD$
 
-DISTNAME=	sfwbar-1.0_beta16.1
+DISTNAME=	sfwbar-1.0_beta17
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_GITHUB:=LBCrion/}
-GITHUB_TAG=	d30db7c77fde25093f55eae8203f5a4995768152
+GITHUB_TAG=	v${PKGVERSION_NOREV}
 
 MAINTAINER=	kikadf.01%gmail.com@localhost
 HOMEPAGE=	https://github.com/LBCrion/sfwbar/
@@ -14,6 +14,7 @@ USE_LANGUAGES=	c c++
 USE_TOOLS+=	pkg-config
 LDFLAGS+=	${COMPILER_RPATH_FLAG}${PREFIX}/lib/sfwbar
 
+MESON_ARGS+=	-Dbsdctl=disabled
 MESON_ARGS+=	-Dpulse=disabled
 MESON_ARGS+=	-Dpipewire=disabled
 MESON_ARGS+=	-Dalsa=disabled
@@ -22,6 +23,9 @@ MESON_ARGS+=	-Dnm=disabled
 MESON_ARGS+=	-Dxkb=enabled
 MESON_ARGS+=	-Ddbus=enabled
 
+post-install:
+	${RM} ${DESTDIR}${PREFIX}/share/sfwbar/memory.source.orig
+
 .include "../../wip/gtk-layer-shell/buildlink3.mk"
 
 .include "../../devel/meson/build.mk"
diff --git a/sfwbar/PLIST b/sfwbar/PLIST
index 49a9db74aa..0a671dc4cd 100644
--- a/sfwbar/PLIST
+++ b/sfwbar/PLIST
@@ -12,6 +12,7 @@ lib/sfwbar/network.so
 lib/sfwbar/xkbmap.so
 man/man1/sfwbar-appmenu.1
 man/man1/sfwbar-bluez.1
+man/man1/sfwbar-dbus.1
 man/man1/sfwbar-idle.1
 man/man1/sfwbar-idleinhibit.1
 man/man1/sfwbar-mpd.1
@@ -27,7 +28,6 @@ share/locale/zh_TW/LC_MESSAGES/sfwbar.mo
 share/sfwbar/alsa.widget
 share/sfwbar/backlight.source
 share/sfwbar/backlight.widget
-share/sfwbar/battery-svg.widget
 share/sfwbar/battery.source
 share/sfwbar/battery.widget
 share/sfwbar/bluez-popup.widget
@@ -52,6 +52,8 @@ share/sfwbar/desktop-directories/Utility.directory
 share/sfwbar/fan-rpm.widget
 share/sfwbar/icons/misc/comp.svg
 share/sfwbar/icons/misc/cpu.svg
+share/sfwbar/icons/misc/dialog-cancel-symbolic.svg
+share/sfwbar/icons/misc/dialog-ok-symbolic.svg
 share/sfwbar/icons/misc/fan.svg
 share/sfwbar/icons/misc/fforward.svg
 share/sfwbar/icons/misc/hibernate-symbolic.svg
@@ -149,7 +151,7 @@ share/sfwbar/icons/weather/snowshowers_polartwilight.svg
 share/sfwbar/icons/weather/snowshowersandthunder_day.svg
 share/sfwbar/icons/weather/snowshowersandthunder_night.svg
 share/sfwbar/icons/weather/snowshowersandthunder_polartwilight.svg
-share/sfwbar/idle.widget
+share/sfwbar/idleinhibit.widget
 share/sfwbar/lan-bps.widget
 share/sfwbar/language.widget
 share/sfwbar/mb-temp.widget
@@ -162,7 +164,7 @@ share/sfwbar/mpd-module.widget
 share/sfwbar/mpd.source
 share/sfwbar/mpd.widget
 share/sfwbar/ncenter.widget
-share/sfwbar/network-module.widget
+share/sfwbar/network.widget
 share/sfwbar/oneline.config
 share/sfwbar/privacy.widget
 share/sfwbar/rfkill-bt.widget
@@ -174,7 +176,6 @@ share/sfwbar/showdesktop.widget
 share/sfwbar/startmenu.source
 share/sfwbar/startmenu.widget
 share/sfwbar/swap.source
-share/sfwbar/sway-lang.widget
 share/sfwbar/switcher.config
 share/sfwbar/t2.config
 share/sfwbar/twoline.config
@@ -197,5 +198,6 @@ share/sfwbar/wbar-sway-lang.widget
 share/sfwbar/wbar-temp.widget
 share/sfwbar/wbar.config
 share/sfwbar/weather.widget
+share/sfwbar/wifi-secret.widget
 share/sfwbar/wifi.widget
 share/sfwbar/winops.widget
diff --git a/sfwbar/distinfo b/sfwbar/distinfo
index 6789614aae..8c71e15943 100644
--- a/sfwbar/distinfo
+++ b/sfwbar/distinfo
@@ -1,6 +1,7 @@
 $NetBSD$
 
-BLAKE2s (sfwbar-1.0_beta16.1-d30db7c77fde25093f55eae8203f5a4995768152.tar.gz) = a02801bb12d28d3917fbf0a3e70571741dbb81ff380ea9ae162326d2991a5ce7
-SHA512 (sfwbar-1.0_beta16.1-d30db7c77fde25093f55eae8203f5a4995768152.tar.gz) = a55c9c3b982ec1d452fa666cf664d760b45e45c990bcbe62d3e6eeebf0ba0e9fe2fd4707c3c5d311942103ff296bf1cdff239c9811dcdfaf8a6f9b7a45ccefbc
-Size (sfwbar-1.0_beta16.1-d30db7c77fde25093f55eae8203f5a4995768152.tar.gz) = 515619 bytes
+BLAKE2s (sfwbar-1.0_beta17.tar.gz) = b088dacefd56c0cdbd52d094a30540e411085c53060ea877d0e893867c21c0bd
+SHA512 (sfwbar-1.0_beta17.tar.gz) = f9444ace3e01997aecba7bf2a6e1edfdbe6bf67022d7ec60874e2f86da20e0e3c1a41defa7720f74eb1ff646ce65fa0343a89186883c3ac7ae59001e22aeaf23
+Size (sfwbar-1.0_beta17.tar.gz) = 518367 bytes
+SHA1 (patch-config_memory.source) = 5509fed7731c4257438e7fd0af520e1a943083d8
 SHA1 (patch-modules_network.c) = b91f130ff7b53a162315f6ab0372a8a383c49510
diff --git a/sfwbar/patches/patch-config_memory.source b/sfwbar/patches/patch-config_memory.source
new file mode 100644
index 0000000000..4f1fe49e04
--- /dev/null
+++ b/sfwbar/patches/patch-config_memory.source
@@ -0,0 +1,26 @@
+$NetBSD$
+
+* NetBSD support
+
+--- config/memory.source.orig	2026-03-18 10:39:49.620486824 +0000
++++ config/memory.source
+@@ -6,13 +6,17 @@ file("/proc/meminfo") {
+   MemTotal = RegEx("^MemTotal:[\t ]*([0-9]+)[\t ]")
+   MemFree = RegEx("^MemFree:[\t ]*([0-9]+)[\t ]")
+   MemCache = RegEx( "^Cached:[\t ]*([0-9]+)[\t ]")
+-  MemBuff = Regex("^Buffers:[\t ]*([0-9]+)[\t ]")
++  MemBuff = RegEx("^Buffers:[\t ]*([0-9]+)[\t ]")
++  MemShared = RegEx("^MemShared:[\t ]*([0-9]+)[\t ]")
+ }
+ 
++Set IsNetBSD = MemShared.count
+ Set XPageSize = BSDCtl("vm.stats.vm.v_page_size")
+ Set XMemTotal = If(!Ident(BSDCtl),MemTotal,Val(BSDCtl("vm.stats.vm.v_page_count"))*XPageSize)
+ Set XMemFree = If(!Ident(BSDCtl),MemFree,Val(BSDCtl("vm.stats.vm.v_free_count"))*XPageSize)
+ Set XMemCache = If(!Ident(BSDCtl),MemCache,Val(BSDCtl("vm.stats.vm.v_inactive_count"))*XPageSize)
+ Set XMemBuff = If(!Ident(BSDCtl),MemBuff,Val(BSDCtl("vm.stats.vm_laundry_count"))*XPageSize)
+-Set XMemUtilization = (XMemTotal-XMemFree-XMemCache-XMemBuff)/XMemTotal
++Set XMemUtil_NetBSD = (XMemTotal-XMemFree-XMemCache)/XMemTotal
++Set XMemUtil = (XMemTotal-XMemFree-XMemCache-XMemBuff)/XMemTotal
++Set XMemUtilization = If(IsNetBSD,XMemUtil_NetBSD,XMemUtil)
+ Set XMemPresent = If(Ident(BSDCtl),$XPageSize!="",MemTotal.count)


Home | Main Index | Thread Index | Old Index