diff --git a/x11/sfwbar/Makefile b/x11/sfwbar/Makefile index 1ba675629c33..665cd5800d09 100644 --- a/x11/sfwbar/Makefile +++ b/x11/sfwbar/Makefile @@ -1,77 +1,79 @@ 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 LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= rst2man:textproc/py-docutils@${PY_FLAVOR} \ wayland-protocols>0:graphics/wayland-protocols LIB_DEPENDS= libgtk-layer-shell.so:x11-toolkits/gtk-layer-shell \ libjson-c.so:devel/json-c \ libwayland-client.so:graphics/wayland -FLAVORS= default nopulse +FLAVORS= default lite +FLAVOR?= ${FLAVORS:[1]} +lite_PKGNAMESUFFIX= -lite USES= gnome meson pkgconfig python:run USE_GITHUB= yes GH_ACCOUNT= LBCrion USE_GNOME= cairo gdkpixbuf gtk30 MESON_ARGS= -Dbluez=enabled \ -Dbsdctl=enabled \ -Didleinhibit=enabled \ -Diwd=enabled \ -Dnetwork=enabled SUB_FILES= pkg-message -OPTIONS_DEFINE= ALSA MPD NM PULSEAUDIO XKB -OPTIONS_DEFAULT= ALSA MPD NM PULSEAUDIO XKB -.if ${FLAVOR:U:M*nopulse} -OPTIONS_EXCLUDE+= PULSEAUDIO +OPTIONS_DEFINE= ALSA MPD NLS NM PIPEWIRE PULSEAUDIO XKB +OPTIONS_DEFAULT= ALSA MPD NM PIPEWIRE PULSEAUDIO XKB +.if ${FLAVOR} == lite +OPTIONS_EXCLUDE= PIPEWIRE PULSEAUDIO .endif OPTIONS_SUB= yes ALSA_DESC= ALSA audio volume control MPD_DESC= Music player daemon control NM_DESC= Network manager module PULSEAUDIO_DESC= Pulse audio volume control XKB_DESC= XkbCommon keyboard layout conversion support ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib ALSA_MESON_ENABLED= alsa MPD_LIB_DEPENDS= libmpdclient.so:audio/libmpdclient MPD_MESON_ENABLED= mpd +NLS_USES= gettext-tools +NLS_EXTRA_PATCHES_OFF= ${PATCHDIR}/extra-patch-nls-off + 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 XKB_LIB_DEPENDS= libxkbregistry.so:x11/libxkbcommon XKB_MESON_ENABLED= xkb -.include +.include .if ${PORT_OPTIONS:MALSA} || ${PORT_OPTIONS:MPULSEAUDIO} PLIST_SUB+= VOLUME="" .else PLIST_SUB+= VOLUME="@comment " .endif -.include +.include 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/files/extra-patch-nls-off b/x11/sfwbar/files/extra-patch-nls-off new file mode 100644 index 000000000000..25d7e74e3eac --- /dev/null +++ b/x11/sfwbar/files/extra-patch-nls-off @@ -0,0 +1,11 @@ +--- meson.build.orig 2026-03-18 07:53:36 UTC ++++ meson.build +@@ -132,7 +132,7 @@ doc_list = [ 'sfwbar' ] + deps = [gtk3, glib, gio_unix, gmod, glsh, wayl, json, lbrt ] + doc_list = [ 'sfwbar' ] + +-subdir('po') ++# subdir('po') + + cargs = ['-DGLIB_DISABLE_DEPRECATION_WARNINGS', + '-DGDK_DISABLE_DEPRECATED', diff --git a/x11/sfwbar/pkg-plist b/x11/sfwbar/pkg-plist index af49bae4b6e7..bc03d1b1ff71 100644 --- a/x11/sfwbar/pkg-plist +++ b/x11/sfwbar/pkg-plist @@ -1,196 +1,212 @@ bin/sfwbar %%ALSA%%lib/sfwbar/alsactl.so 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 %%NM%%lib/sfwbar/wifi-nm.so share/icons/hicolor/scalable/apps/sfwbar.svg +%%NLS%%share/locale/pl/LC_MESSAGES/sfwbar.mo +%%NLS%%share/locale/ru/LC_MESSAGES/sfwbar.mo +%%NLS%%share/locale/zh_CN/LC_MESSAGES/sfwbar.mo +%%NLS%%share/locale/zh_TW/LC_MESSAGES/sfwbar.mo 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 %%DATADIR%%/cal.widget %%DATADIR%%/clock.widget %%DATADIR%%/cpu-temp.source %%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 %%DATADIR%%/desktop-directories/Game.directory %%DATADIR%%/desktop-directories/Graphics.directory %%DATADIR%%/desktop-directories/Network.directory %%DATADIR%%/desktop-directories/Office.directory %%DATADIR%%/desktop-directories/Settings.directory %%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 %%DATADIR%%/icons/weather/clearsky_polartwilight.svg %%DATADIR%%/icons/weather/cloudy.svg %%DATADIR%%/icons/weather/fair_day.svg %%DATADIR%%/icons/weather/fair_night.svg %%DATADIR%%/icons/weather/fair_polartwilight.svg %%DATADIR%%/icons/weather/fog.svg %%DATADIR%%/icons/weather/heavyrain.svg %%DATADIR%%/icons/weather/heavyrainandthunder.svg %%DATADIR%%/icons/weather/heavyrainshowers_day.svg %%DATADIR%%/icons/weather/heavyrainshowers_night.svg %%DATADIR%%/icons/weather/heavyrainshowers_polartwilight.svg %%DATADIR%%/icons/weather/heavyrainshowersandthunder_day.svg %%DATADIR%%/icons/weather/heavyrainshowersandthunder_night.svg %%DATADIR%%/icons/weather/heavyrainshowersandthunder_polartwilight.svg %%DATADIR%%/icons/weather/heavysleet.svg %%DATADIR%%/icons/weather/heavysleetandthunder.svg %%DATADIR%%/icons/weather/heavysleetshowers_day.svg %%DATADIR%%/icons/weather/heavysleetshowers_night.svg %%DATADIR%%/icons/weather/heavysleetshowers_polartwilight.svg %%DATADIR%%/icons/weather/heavysleetshowersandthunder_day.svg %%DATADIR%%/icons/weather/heavysleetshowersandthunder_night.svg %%DATADIR%%/icons/weather/heavysleetshowersandthunder_polartwilight.svg %%DATADIR%%/icons/weather/heavysnow.svg %%DATADIR%%/icons/weather/heavysnowandthunder.svg %%DATADIR%%/icons/weather/heavysnowshowers_day.svg %%DATADIR%%/icons/weather/heavysnowshowers_night.svg %%DATADIR%%/icons/weather/heavysnowshowers_polartwilight.svg %%DATADIR%%/icons/weather/heavysnowshowersandthunder_day.svg %%DATADIR%%/icons/weather/heavysnowshowersandthunder_night.svg %%DATADIR%%/icons/weather/heavysnowshowersandthunder_polartwilight.svg %%DATADIR%%/icons/weather/lightrain.svg %%DATADIR%%/icons/weather/lightrainandthunder.svg %%DATADIR%%/icons/weather/lightrainshowers_day.svg %%DATADIR%%/icons/weather/lightrainshowers_night.svg %%DATADIR%%/icons/weather/lightrainshowers_polartwilight.svg %%DATADIR%%/icons/weather/lightrainshowersandthunder_day.svg %%DATADIR%%/icons/weather/lightrainshowersandthunder_night.svg %%DATADIR%%/icons/weather/lightrainshowersandthunder_polartwilight.svg %%DATADIR%%/icons/weather/lightsleet.svg %%DATADIR%%/icons/weather/lightsleetandthunder.svg %%DATADIR%%/icons/weather/lightsleetshowers_day.svg %%DATADIR%%/icons/weather/lightsleetshowers_night.svg %%DATADIR%%/icons/weather/lightsleetshowers_polartwilight.svg %%DATADIR%%/icons/weather/lightsnow.svg %%DATADIR%%/icons/weather/lightsnowandthunder.svg %%DATADIR%%/icons/weather/lightsnowshowers_day.svg %%DATADIR%%/icons/weather/lightsnowshowers_night.svg %%DATADIR%%/icons/weather/lightsnowshowers_polartwilight.svg %%DATADIR%%/icons/weather/lightssleetshowersandthunder_day.svg %%DATADIR%%/icons/weather/lightssleetshowersandthunder_night.svg %%DATADIR%%/icons/weather/lightssleetshowersandthunder_polartwilight.svg %%DATADIR%%/icons/weather/lightssnowshowersandthunder_day.svg %%DATADIR%%/icons/weather/lightssnowshowersandthunder_night.svg %%DATADIR%%/icons/weather/lightssnowshowersandthunder_polartwilight.svg %%DATADIR%%/icons/weather/partlycloudy_day.svg %%DATADIR%%/icons/weather/partlycloudy_night.svg %%DATADIR%%/icons/weather/partlycloudy_polartwilight.svg %%DATADIR%%/icons/weather/rain.svg %%DATADIR%%/icons/weather/rainandthunder.svg %%DATADIR%%/icons/weather/rainshowers_day.svg %%DATADIR%%/icons/weather/rainshowers_night.svg %%DATADIR%%/icons/weather/rainshowers_polartwilight.svg %%DATADIR%%/icons/weather/rainshowersandthunder_day.svg %%DATADIR%%/icons/weather/rainshowersandthunder_night.svg %%DATADIR%%/icons/weather/rainshowersandthunder_polartwilight.svg %%DATADIR%%/icons/weather/sleet.svg %%DATADIR%%/icons/weather/sleetandthunder.svg %%DATADIR%%/icons/weather/sleetshowers_day.svg %%DATADIR%%/icons/weather/sleetshowers_night.svg %%DATADIR%%/icons/weather/sleetshowers_polartwilight.svg %%DATADIR%%/icons/weather/sleetshowersandthunder_day.svg %%DATADIR%%/icons/weather/sleetshowersandthunder_night.svg %%DATADIR%%/icons/weather/sleetshowersandthunder_polartwilight.svg %%DATADIR%%/icons/weather/snow.svg %%DATADIR%%/icons/weather/snowandthunder.svg %%DATADIR%%/icons/weather/snowshowers_day.svg %%DATADIR%%/icons/weather/snowshowers_night.svg %%DATADIR%%/icons/weather/snowshowers_polartwilight.svg %%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 %%DATADIR%%/wbar-battery.widget %%DATADIR%%/wbar-bluetooth.widget %%DATADIR%%/wbar-cpu.widget %%DATADIR%%/wbar-idleinhibit.widget %%DATADIR%%/wbar-memory.widget %%DATADIR%%/wbar-mpd.widget %%DATADIR%%/wbar-net.widget %%DATADIR%%/wbar-pulse.widget %%DATADIR%%/wbar-sway-lang.widget %%DATADIR%%/wbar-temp.widget %%DATADIR%%/wbar.config %%DATADIR%%/weather.widget +%%DATADIR%%/wifi-secret.widget %%DATADIR%%/wifi.widget %%DATADIR%%/winops.widget