From nobody Sun Nov 03 18:04:56 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XhMvD6D76z5cXhB; Sun, 03 Nov 2024 18:04:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XhMvD5c6Zz4kjP; Sun, 3 Nov 2024 18:04:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730657096; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XQ8g5KdkcNNcpJ1A1nc0o/+uTTQ0OrHnGu/NJ9WbQUk=; b=MYlsCZ423fg1slDcwxp45YRauWA5p/zkGGqhUPMNi9I/ol5SRSdCAgIQobOAxwu/s66M3e TAK62SabKQqbVEl4OLXFwjaTFHN7C3vJeUqvbte1cfUVAjtXWLYt6B4AYkxI3F9kpXjrNj a052cjECV5ZKLcMI/+zStwNYXuD351KiwZVGha79/ZOuyc1/HAlg7Cea2hHOc58yYb+0+h 9pDfgdYONKxcd1cd5wznXyGSYB6OZYcXnr2ntFKI8xXB9ii+CTwmqGJ1FbCqVLxLMiBLsz 1fP+BcN5eLLyzSXxbAfoH1fsl2FxBzuY4VczpHO8ElJeEKPncg7YWx4i6mS59A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730657096; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XQ8g5KdkcNNcpJ1A1nc0o/+uTTQ0OrHnGu/NJ9WbQUk=; b=RVjZio7mKfAFX2+IQRl2HhFF8mTaNWHGPs4geUL1K0JpSxVtuNsR6ITaDzD4nRiDzqgn6k 1Y+cnhNshpj2Ov2jlsl0b0kSziYXPvvum+UZXXX1Uk5nLOmblFGzsNOYdAyBbhbKlAxzUU LL2cDoJkZb2km18+Fr+vNe/48dPl5pEiJlse2bzzw3XN7mSa9QPie7nsWqgqylMQSkUvR0 Lx5dNiidlb8m58PSXa/VP4I/f5VDtnEfTN+dUrcXSf4AXOld4NXxHYG+YbeDUsG35AEymG nUAq52KJWoD6/ZG4M4iwWn+OaADi3hmz2mMNh+kxxV9JJugJt0m84yDpxE8bAw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730657096; a=rsa-sha256; cv=none; b=BK8jHedPyz4oUV5UZwsuDC/VYKEq5co61KShk3Z7OMkFZA/RQG98jyE7iW8BLFzwBC4jVp 31GIgAaQrLleHPrSKwYBUwtwGHjxhaEeIssDzZUDDfIFUcODzmxFtdXI1IpJacQcSgZsfD aqdjMcNONk9l5pGO5BLFXyZXCUp/dMLdFIX+b+todjjRnype1JFExfWnP8UI+vc38eu/Hl cZu4owmK0lm0tvDsOuRlGoC9HqXjjY3sb6sWhGdVNTn8avA0t1mA0lOUiT2u6N/wyLBXVY Ls0J/CKLDTqealbYA4+DkL4bsiNRC7rJa8sp/7dpltbZaGmAPPlYSc2/gfaQqA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XhMvD5CRRz10B1; Sun, 3 Nov 2024 18:04:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A3I4uGS041593; Sun, 3 Nov 2024 18:04:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A3I4u9M041590; Sun, 3 Nov 2024 18:04:56 GMT (envelope-from git) Date: Sun, 3 Nov 2024 18:04:56 GMT Message-Id: <202411031804.4A3I4u9M041590@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Vladimir Druzenko Subject: git: 1d79839756ef - main - x11/sfwbar: Update 1.0_beta14 =?utf-8?Q?=E2=86=92?= 1.0_beta15 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1d79839756efee86c6d807a684f97f7b0b01f335 Auto-Submitted: auto-generated The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=1d79839756efee86c6d807a684f97f7b0b01f335 commit 1d79839756efee86c6d807a684f97f7b0b01f335 Author: Tino Engel AuthorDate: 2024-11-03 17:59:30 +0000 Commit: Vladimir Druzenko CommitDate: 2024-11-03 18:04:40 +0000 x11/sfwbar: Update 1.0_beta14 → 1.0_beta15 Changelog: https://github.com/LBCrion/sfwbar/releases/tag/v1.0_beta15 PR: 282519 --- x11/sfwbar/Makefile | 30 ++++++++++++++++++++++-------- x11/sfwbar/distinfo | 6 +++--- x11/sfwbar/pkg-plist | 13 +++++++------ 3 files changed, 32 insertions(+), 17 deletions(-) diff --git a/x11/sfwbar/Makefile b/x11/sfwbar/Makefile index e9e981ed9599..ea003fc4c84f 100644 --- a/x11/sfwbar/Makefile +++ b/x11/sfwbar/Makefile @@ -1,7 +1,6 @@ PORTNAME= sfwbar DISTVERSIONPREFIX= v -DISTVERSION= 1.0_beta14 -PORTREVISION= 1 +DISTVERSION= 1.0_beta15 CATEGORIES= x11 wayland MAINTAINER= tino.engel@mail.de @@ -11,7 +10,8 @@ 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 @@ -23,17 +23,21 @@ 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 @@ -43,10 +47,20 @@ 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,23 +1,23 @@ 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 @@ -141,7 +141,6 @@ share/man/man1/sfwbar.1.gz %%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 @@ -150,6 +149,7 @@ share/man/man1/sfwbar.1.gz %%DATADIR%%/startmenu.widget %%DATADIR%%/swap.source %%DATADIR%%/sway-lang.widget +%%DATADIR%%/switcher.config %%DATADIR%%/t2.config %%DATADIR%%/test.config %%DATADIR%%/test.widget @@ -157,6 +157,7 @@ share/man/man1/sfwbar.1.gz %%DATADIR%%/twoline.config %%DATADIR%%/usage.widget %%DATADIR%%/vertical.config +%%DATADIR%%/volume.widget %%DATADIR%%/w10.config %%DATADIR%%/wbar-backlight.widget %%DATADIR%%/wbar-battery.widget @@ -171,5 +172,5 @@ share/man/man1/sfwbar.1.gz %%DATADIR%%/wbar-temp.widget %%DATADIR%%/wbar.config %%DATADIR%%/weather.widget -%%DATADIR%%/wifi-iwd.widget +%%DATADIR%%/wifi.widget %%DATADIR%%/winops.widget