From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BEAD715ACFB for ; Sun, 16 Apr 2023 00:11:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8603CE08BB; Sun, 16 Apr 2023 00:11:50 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6585DE08BB for ; Sun, 16 Apr 2023 00:11:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 94CE2340DB5 for ; Sun, 16 Apr 2023 00:11:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2CA83605 for ; Sun, 16 Apr 2023 00:11:47 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1681603830.8d5b83c04eafed28c97d9ef5909f7eaedbb69078.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: gui-apps/waybar/ X-VCS-Repository: repo/gentoo X-VCS-Files: gui-apps/waybar/metadata.xml gui-apps/waybar/waybar-0.9.17-r2.ebuild gui-apps/waybar/waybar-9999.ebuild X-VCS-Directories: gui-apps/waybar/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 8d5b83c04eafed28c97d9ef5909f7eaedbb69078 X-VCS-Branch: master Date: Sun, 16 Apr 2023 00:11:47 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 91d0bdc8-6588-4995-9bd4-2783dc03dc82 X-Archives-Hash: a990ed6d12c8347332cf7ea1dd67484c commit: 8d5b83c04eafed28c97d9ef5909f7eaedbb69078 Author: Julien Roy jroy ca> AuthorDate: Sat Apr 15 15:20:59 2023 +0000 Commit: Sam James gentoo org> CommitDate: Sun Apr 16 00:10:30 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d5b83c0 gui-apps/waybar: add 0.9.17-r2 Fix pulseaudio USE flag dependency Remove systemd patch Improme logind USE flag description Add REQUIRED_USE for mpris and upower Make libinput USE flag enabled by default Bug: https://bugs.gentoo.org/894068 Closes: https://bugs.gentoo.org/904163 Closes: https://bugs.gentoo.org/904165 Signed-off-by: Julien Roy jroy.ca> Signed-off-by: Sam James gentoo.org> gui-apps/waybar/metadata.xml | 2 +- .../{waybar-9999.ebuild => waybar-0.9.17-r2.ebuild} | 14 ++++++++++---- gui-apps/waybar/waybar-9999.ebuild | 15 ++++++++------- 3 files changed, 19 insertions(+), 12 deletions(-) diff --git a/gui-apps/waybar/metadata.xml b/gui-apps/waybar/metadata.xml index 78b89e6579cc..3d66b6c8fda4 100644 --- a/gui-apps/waybar/metadata.xml +++ b/gui-apps/waybar/metadata.xml @@ -17,7 +17,7 @@ Enable experimental features, such as Bluetooth battery reporting Enable libevdev support for evdev related features Enable libinput support for libinput related features - Enable support for logind + Enable support for logind (bluetooth and idle inhibit) Enable support for the Music Player Daemon Enable support for mpris Enable libnl support for network related features diff --git a/gui-apps/waybar/waybar-9999.ebuild b/gui-apps/waybar/waybar-0.9.17-r2.ebuild similarity index 85% copy from gui-apps/waybar/waybar-9999.ebuild copy to gui-apps/waybar/waybar-0.9.17-r2.ebuild index b08f76f5d66f..1fa63f14125b 100644 --- a/gui-apps/waybar/waybar-9999.ebuild +++ b/gui-apps/waybar/waybar-0.9.17-r2.ebuild @@ -19,7 +19,11 @@ fi LICENSE="MIT" SLOT="0" -IUSE="evdev experimental jack libinput logind mpd mpris network +popups pipewire pulseaudio sndio test tray +udev upower wifi" +IUSE="evdev experimental jack +libinput +logind mpd mpris network +popups pipewire pulseaudio sndio systemd test tray +udev upower wifi" +REQUIRED_USE=" + mpris? ( logind ) + upower? ( logind ) +" RESTRICT="!test? ( test )" @@ -55,8 +59,9 @@ RDEPEND=" network? ( dev-libs/libnl:3 ) popups? ( gui-libs/gtk-layer-shell ) pipewire? ( media-video/wireplumber:0/0.4 ) - pulseaudio? ( media-sound/pulseaudio[daemon] ) + pulseaudio? ( media-libs/libpulse ) sndio? ( media-sound/sndio:= ) + systemd? ( sys-apps/systemd:= ) tray? ( dev-libs/libdbusmenu[gtk3] dev-libs/libappindicator @@ -71,13 +76,13 @@ DEPEND="${RDEPEND} " PATCHES=( - "${FILESDIR}/systemd-0.9.17.patch" + "${FILESDIR}/waybar-0.9.17-wireplumber.patch" + "${FILESDIR}/waybar-0.9.17-gcc13.patch" ) src_configure() { local emesonargs=( -Dman-pages=enabled - -Dsystemd=enabled $(meson_feature evdev libevdev) $(meson_feature jack) $(meson_feature libinput) @@ -89,6 +94,7 @@ src_configure() { $(meson_feature pulseaudio) $(meson_feature pipewire wireplumber) $(meson_feature sndio) + $(meson_feature systemd) $(meson_feature test tests) $(meson_feature tray dbusmenu-gtk) $(meson_feature udev libudev) diff --git a/gui-apps/waybar/waybar-9999.ebuild b/gui-apps/waybar/waybar-9999.ebuild index b08f76f5d66f..133e1729c1fe 100644 --- a/gui-apps/waybar/waybar-9999.ebuild +++ b/gui-apps/waybar/waybar-9999.ebuild @@ -19,7 +19,11 @@ fi LICENSE="MIT" SLOT="0" -IUSE="evdev experimental jack libinput logind mpd mpris network +popups pipewire pulseaudio sndio test tray +udev upower wifi" +IUSE="evdev experimental jack +libinput +logind mpd mpris network +popups pipewire pulseaudio sndio systemd test tray +udev upower wifi" +REQUIRED_USE=" + mpris? ( logind ) + upower? ( logind ) +" RESTRICT="!test? ( test )" @@ -55,8 +59,9 @@ RDEPEND=" network? ( dev-libs/libnl:3 ) popups? ( gui-libs/gtk-layer-shell ) pipewire? ( media-video/wireplumber:0/0.4 ) - pulseaudio? ( media-sound/pulseaudio[daemon] ) + pulseaudio? ( media-libs/libpulse ) sndio? ( media-sound/sndio:= ) + systemd? ( sys-apps/systemd:= ) tray? ( dev-libs/libdbusmenu[gtk3] dev-libs/libappindicator @@ -70,14 +75,9 @@ DEPEND="${RDEPEND} test? ( dev-cpp/catch:0 ) " -PATCHES=( - "${FILESDIR}/systemd-0.9.17.patch" -) - src_configure() { local emesonargs=( -Dman-pages=enabled - -Dsystemd=enabled $(meson_feature evdev libevdev) $(meson_feature jack) $(meson_feature libinput) @@ -89,6 +89,7 @@ src_configure() { $(meson_feature pulseaudio) $(meson_feature pipewire wireplumber) $(meson_feature sndio) + $(meson_feature systemd) $(meson_feature test tests) $(meson_feature tray dbusmenu-gtk) $(meson_feature udev libudev)