diff --git a/x11/sfwbar/Makefile b/x11/sfwbar/Makefile index e9e981ed9599..ea003fc4c84f 100644 --- a/x11/sfwbar/Makefile +++ b/x11/sfwbar/Makefile @@ -1,52 +1,66 @@ PORTNAME= sfwbar DISTVERSIONPREFIX= v -DISTVERSION= 1.0_beta14 -PORTREVISION= 1 +DISTVERSION= 1.0_beta15 CATEGORIES= x11 wayland 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= wayland-protocols>0:graphics/wayland-protocols +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 USES= gnome meson pkgconfig python:run USE_GITHUB= yes GH_ACCOUNT= LBCrion USE_GNOME= cairo gdkpixbuf2 gtk30 -MESON_ARGS= -Dbluez=enabled -Dbsdctl=enabled -Didleinhibit=enabled \ - -Diwd=enabled -Dnetwork=enabled +MESON_ARGS= -Dbluez=enabled \ + -Dbsdctl=enabled \ + -Didleinhibit=enabled \ + -Diwd=enabled \ + -Dnetwork=enabled SUB_FILES= pkg-message -OPTIONS_DEFINE= ALSA MPD PULSEAUDIO XKB -OPTIONS_DEFAULT= ALSA MPD PULSEAUDIO XKB +OPTIONS_DEFINE= ALSA MPD NM PULSEAUDIO XKB +OPTIONS_DEFAULT= ALSA MPD NM PULSEAUDIO XKB 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 +NM_MESON_ENABLED= nm + 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 diff --git a/x11/sfwbar/distinfo b/x11/sfwbar/distinfo index 080440e1b9a3..3a6b9b1ab92b 100644 --- a/x11/sfwbar/distinfo +++ b/x11/sfwbar/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1704306918 -SHA256 (LBCrion-sfwbar-v1.0_beta14_GH0.tar.gz) = e5fa6147e3a58e9440b24b8f1ef2378ae088631b8013ecf7770e984f97c5eeb4 -SIZE (LBCrion-sfwbar-v1.0_beta14_GH0.tar.gz) = 386347 +TIMESTAMP = 1730625550 +SHA256 (LBCrion-sfwbar-v1.0_beta15_GH0.tar.gz) = e7b45b810659ddb4c1877c486e6c2e40830473ff2e562a9176b149eae1fa8b5f +SIZE (LBCrion-sfwbar-v1.0_beta15_GH0.tar.gz) = 405881 diff --git a/x11/sfwbar/pkg-plist b/x11/sfwbar/pkg-plist index ab062e2ea03e..91236aac1626 100644 --- a/x11/sfwbar/pkg-plist +++ b/x11/sfwbar/pkg-plist @@ -1,175 +1,176 @@ bin/sfwbar -lib/libsfwbar.so %%ALSA%%lib/sfwbar/alsactl.so lib/sfwbar/bluez.so lib/sfwbar/bsdctl.so lib/sfwbar/idleinhibit.so +lib/sfwbar/libsfwbar.so %%MPD%%lib/sfwbar/mpd.so lib/sfwbar/network.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 -%%ALSA%%share/man/man1/sfwbar-alsa.1.gz share/man/man1/sfwbar-bluez.1.gz share/man/man1/sfwbar-bsdctl.1.gz share/man/man1/sfwbar-idleinhibit.1.gz %%MPD%%share/man/man1/sfwbar-mpd.1.gz share/man/man1/sfwbar-network.1.gz -%%PULSEAUDIO%%share/man/man1/sfwbar-pulse.1.gz -share/man/man1/sfwbar-wifi-iwd.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%%/battery.widget %%DATADIR%%/bluez-popup.widget %%DATADIR%%/bluez.widget %%DATADIR%%/clock.widget %%DATADIR%%/cpu-temp.source %%DATADIR%%/cpu-temp.widget %%DATADIR%%/cpu.source %%DATADIR%%/cpu.widget %%DATADIR%%/fan-rpm.widget %%DATADIR%%/icons/misc/comp.svg %%DATADIR%%/icons/misc/cpu.svg %%DATADIR%%/icons/misc/fan.svg %%DATADIR%%/icons/misc/fforward.svg %%DATADIR%%/icons/misc/lan.svg %%DATADIR%%/icons/misc/lock.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/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%%/lan-bps.widget %%DATADIR%%/mb-temp.widget %%DATADIR%%/memory.source %%DATADIR%%/memory.widget %%DATADIR%%/mpd-intmod.widget %%DATADIR%%/mpd-mini.widget %%DATADIR%%/mpd-module.widget %%DATADIR%%/mpd.source %%DATADIR%%/mpd.widget %%DATADIR%%/network-module.widget %%DATADIR%%/oneline.config -%%DATADIR%%/pulse-module.widget %%DATADIR%%/rfkill-bt.widget %%DATADIR%%/rfkill-wifi.widget %%DATADIR%%/rfkill.source %%DATADIR%%/sfwbar.config %%DATADIR%%/showdesktop.widget %%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%%/usage.widget %%DATADIR%%/vertical.config +%%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-iwd.widget +%%DATADIR%%/wifi.widget %%DATADIR%%/winops.widget