From 39820069c36312562d6fa31a190df401a03d24f7 Mon Sep 17 00:00:00 2001
From: Yusuf Yaman <nxjoseph@FreeBSD.org>
Date: Mon, 30 Mar 2026 17:38:41 +0300
Subject: [PATCH] x11/sfwbar: Update 1.0_beta16.1 => 1.0_beta17
While here:
- Make nopulse flavor also exclude new PIPEWIRE option
- Remove all patches since they're now included in new version
Changelog:
https://github.com/LBCrion/sfwbar/releases/tag/v1.0_beta17
PR: ?
---
x11/sfwbar/Makefile | 17 ++++++++---------
x11/sfwbar/distinfo | 12 +++---------
x11/sfwbar/pkg-plist | 34 +++++++++++++++++++++++-----------
3 files changed, 34 insertions(+), 29 deletions(-)
diff --git a/x11/sfwbar/Makefile b/x11/sfwbar/Makefile
index 1ba675629c33..eb6e4b728f97 100644
--- a/x11/sfwbar/Makefile
+++ b/x11/sfwbar/Makefile
@@ -1,14 +1,9 @@
PORTNAME= sfwbar
DISTVERSIONPREFIX= v
-DISTVERSION= 1.0_beta16.1
+DISTVERSION= 1.0_beta17
CATEGORIES= x11 wayland
PKGNAMESUFFIX= ${FLAVOR:N${FLAVORS:[1]}:C/.+/-${FLAVOR}/}
-PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
-PATCHFILES= f101b45ae0ace422052463febe85c19dca8ad2ff.patch:-p1 \
- 30db8085d15f6892a175f976e36dd32ec63261ad.patch:-p1 \
- 5f460019b79c54ae782ccb661e9f4c1a160246b8.patch:-p1
-
MAINTAINER= tino.engel@mail.de
COMMENT= Flexible taskbar application for wayland compositors
WWW= https://github.com/LBCrion/sfwbar
@@ -39,10 +34,11 @@ MESON_ARGS= -Dbluez=enabled \
SUB_FILES= pkg-message
-OPTIONS_DEFINE= ALSA MPD NM PULSEAUDIO XKB
-OPTIONS_DEFAULT= ALSA MPD NM PULSEAUDIO XKB
+OPTIONS_DEFINE= ALSA MPD NM PIPEWIRE PULSEAUDIO XKB
+OPTIONS_DEFAULT= ALSA MPD NM PIPEWIRE PULSEAUDIO XKB
.if ${FLAVOR:U:M*nopulse}
-OPTIONS_EXCLUDE+= PULSEAUDIO
+OPTIONS_EXCLUDE+= PIPEWIRE PULSEAUDIO
+MESON_ARGS+= -Dpipewire=disabled
.endif
OPTIONS_SUB= yes
@@ -60,6 +56,9 @@ MPD_MESON_ENABLED= mpd
NM_MESON_ENABLED= nm
+PIPEWIRE_LIB_DEPENDS= libpipewire-0.3.so:multimedia/pipewire
+PIPEWIRE_MESON_ENABLED= pipewire
+
PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio
PULSEAUDIO_MESON_ENABLED= pulse
diff --git a/x11/sfwbar/distinfo b/x11/sfwbar/distinfo
index 76cbb773f73b..eaa80854ba60 100644
--- a/x11/sfwbar/distinfo
+++ b/x11/sfwbar/distinfo
@@ -1,9 +1,3 @@
-TIMESTAMP = 1748545933
-SHA256 (LBCrion-sfwbar-v1.0_beta16.1_GH0.tar.gz) = 98f3d77713a2e3a10fcb09c365c92fa96ab84bf157e59bd3f4d4d274ce0496e8
-SIZE (LBCrion-sfwbar-v1.0_beta16.1_GH0.tar.gz) = 466343
-SHA256 (f101b45ae0ace422052463febe85c19dca8ad2ff.patch) = 1cd6832ee54951fb808f51092cbb04301021389da4e6d6debe81da99a2dc275b
-SIZE (f101b45ae0ace422052463febe85c19dca8ad2ff.patch) = 833
-SHA256 (30db8085d15f6892a175f976e36dd32ec63261ad.patch) = 407e58190cb94561466d99bbbbc19d6b5bb23ea7903ead5a7609c20fbd5415f6
-SIZE (30db8085d15f6892a175f976e36dd32ec63261ad.patch) = 753
-SHA256 (5f460019b79c54ae782ccb661e9f4c1a160246b8.patch) = 1a939246a1b4dd7aa308d18347eb64482a3d2e644183af3048efa20dd9dd2867
-SIZE (5f460019b79c54ae782ccb661e9f4c1a160246b8.patch) = 1086
+TIMESTAMP = 1774880355
+SHA256 (LBCrion-sfwbar-v1.0_beta17_GH0.tar.gz) = a4915bc7dd0873c45d0d6b01b070e39a91fd16cfadf730d6a9e48db68a8cd09e
+SIZE (LBCrion-sfwbar-v1.0_beta17_GH0.tar.gz) = 518367
diff --git a/x11/sfwbar/pkg-plist b/x11/sfwbar/pkg-plist
index af49bae4b6e7..6ed982e764ce 100644
--- a/x11/sfwbar/pkg-plist
+++ b/x11/sfwbar/pkg-plist
@@ -3,12 +3,14 @@ bin/sfwbar
lib/sfwbar/appmenu.so
lib/sfwbar/bluez.so
lib/sfwbar/bsdctl.so
+lib/sfwbar/dbus.so
lib/sfwbar/idle.so
lib/sfwbar/idleinhibit.so
lib/sfwbar/libsfwbar.so
%%MPD%%lib/sfwbar/mpd.so
lib/sfwbar/ncenter.so
lib/sfwbar/network.so
+%%PIPEWIRE%%lib/sfwbar/pipewire.so
%%PULSEAUDIO%%lib/sfwbar/pulsectl.so
lib/sfwbar/wifi-iwd.so
%%XKB%%lib/sfwbar/xkbmap.so
@@ -17,18 +19,21 @@ share/icons/hicolor/scalable/apps/sfwbar.svg
share/man/man1/sfwbar-appmenu.1.gz
share/man/man1/sfwbar-bluez.1.gz
share/man/man1/sfwbar-bsdctl.1.gz
+share/man/man1/sfwbar-dbus.1.gz
share/man/man1/sfwbar-idle.1.gz
share/man/man1/sfwbar-idleinhibit.1.gz
%%MPD%%share/man/man1/sfwbar-mpd.1.gz
share/man/man1/sfwbar-ncenter.1.gz
share/man/man1/sfwbar-network.1.gz
+%%PIPEWIRE%%share/man/man1/sfwbar-pipewire.1.gz
%%VOLUME%%share/man/man1/sfwbar-volume.1.gz
share/man/man1/sfwbar-wifi.1.gz
%%XKB%%share/man/man1/sfwbar-xkbmap.1.gz
share/man/man1/sfwbar.1.gz
-%%DATADIR%%/alsa-module.widget
%%DATADIR%%/alsa.widget
-%%DATADIR%%/battery-svg.widget
+%%DATADIR%%/backlight.source
+%%DATADIR%%/backlight.widget
+%%DATADIR%%/battery.source
%%DATADIR%%/battery.widget
%%DATADIR%%/bluez-popup.widget
%%DATADIR%%/bluez.widget
@@ -38,7 +43,6 @@ share/man/man1/sfwbar.1.gz
%%DATADIR%%/cpu-temp.widget
%%DATADIR%%/cpu.source
%%DATADIR%%/cpu.widget
-%%DATADIR%%/fan-rpm.widget
%%DATADIR%%/desktop-directories/AudioVideo.directory
%%DATADIR%%/desktop-directories/Development.directory
%%DATADIR%%/desktop-directories/Education.directory
@@ -50,19 +54,24 @@ share/man/man1/sfwbar.1.gz
%%DATADIR%%/desktop-directories/System-Tools.directory
%%DATADIR%%/desktop-directories/Utility-Accessibility.directory
%%DATADIR%%/desktop-directories/Utility.directory
+%%DATADIR%%/fan-rpm.widget
%%DATADIR%%/icons/misc/comp.svg
%%DATADIR%%/icons/misc/cpu.svg
+%%DATADIR%%/icons/misc/dialog-cancel-symbolic.svg
+%%DATADIR%%/icons/misc/dialog-ok-symbolic.svg
%%DATADIR%%/icons/misc/fan.svg
%%DATADIR%%/icons/misc/fforward.svg
+%%DATADIR%%/icons/misc/hibernate-symbolic.svg
%%DATADIR%%/icons/misc/lan.svg
-%%DATADIR%%/icons/misc/lock.svg
+%%DATADIR%%/icons/misc/lock-symbolic.svg
%%DATADIR%%/icons/misc/missing.svg
%%DATADIR%%/icons/misc/music-player-symbolic.svg
%%DATADIR%%/icons/misc/music-player.svg
%%DATADIR%%/icons/misc/play.svg
%%DATADIR%%/icons/misc/rewind.svg
%%DATADIR%%/icons/misc/stop.svg
-%%DATADIR%%/icons/misc/unlock.svg
+%%DATADIR%%/icons/misc/suspend-symbolic.svg
+%%DATADIR%%/icons/misc/unlock-symbolic.svg
%%DATADIR%%/icons/weather/LICENSE
%%DATADIR%%/icons/weather/clearsky_day.svg
%%DATADIR%%/icons/weather/clearsky_night.svg
@@ -147,36 +156,38 @@ share/man/man1/sfwbar.1.gz
%%DATADIR%%/icons/weather/snowshowersandthunder_day.svg
%%DATADIR%%/icons/weather/snowshowersandthunder_night.svg
%%DATADIR%%/icons/weather/snowshowersandthunder_polartwilight.svg
-%%DATADIR%%/idle.widget
+%%DATADIR%%/idleinhibit.widget
%%DATADIR%%/lan-bps.widget
+%%DATADIR%%/language.widget
%%DATADIR%%/mb-temp.widget
%%DATADIR%%/memory.source
%%DATADIR%%/memory.widget
+%%DATADIR%%/mpd-browser.widget
%%DATADIR%%/mpd-intmod.widget
%%DATADIR%%/mpd-mini.widget
%%DATADIR%%/mpd-module.widget
%%DATADIR%%/mpd.source
%%DATADIR%%/mpd.widget
%%DATADIR%%/ncenter.widget
-%%DATADIR%%/network-module.widget
+%%DATADIR%%/network.widget
%%DATADIR%%/oneline.config
+%%DATADIR%%/privacy.widget
%%DATADIR%%/rfkill-bt.widget
%%DATADIR%%/rfkill-wifi.widget
%%DATADIR%%/rfkill.source
+%%DATADIR%%/session.widget
%%DATADIR%%/sfwbar.config
%%DATADIR%%/showdesktop.widget
%%DATADIR%%/startmenu.source
%%DATADIR%%/startmenu.widget
%%DATADIR%%/swap.source
-%%DATADIR%%/sway-lang.widget
%%DATADIR%%/switcher.config
%%DATADIR%%/t2.config
-%%DATADIR%%/test.config
-%%DATADIR%%/test.widget
-%%DATADIR%%/test2.config
%%DATADIR%%/twoline.config
+%%DATADIR%%/upower.widget
%%DATADIR%%/usage.widget
%%DATADIR%%/vertical.config
+%%DATADIR%%/volume-popup.widget
%%DATADIR%%/volume.widget
%%DATADIR%%/w10.config
%%DATADIR%%/wbar-backlight.widget
@@ -192,5 +203,6 @@ share/man/man1/sfwbar.1.gz
%%DATADIR%%/wbar-temp.widget
%%DATADIR%%/wbar.config
%%DATADIR%%/weather.widget
+%%DATADIR%%/wifi-secret.widget
%%DATADIR%%/wifi.widget
%%DATADIR%%/winops.widget
--
2.53.0