From 8d5b83c04eafed28c97d9ef5909f7eaedbb69078 Mon Sep 17 00:00:00 2001 From: Julien Roy Date: Sat, 15 Apr 2023 11:20:59 -0400 Subject: 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 Signed-off-by: Sam James --- gui-apps/waybar/metadata.xml | 2 +- gui-apps/waybar/waybar-0.9.17-r2.ebuild | 106 ++++++++++++++++++++++++++++++++ gui-apps/waybar/waybar-9999.ebuild | 15 ++--- 3 files changed, 115 insertions(+), 8 deletions(-) create mode 100644 gui-apps/waybar/waybar-0.9.17-r2.ebuild (limited to 'gui-apps') 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-0.9.17-r2.ebuild b/gui-apps/waybar/waybar-0.9.17-r2.ebuild new file mode 100644 index 000000000000..1fa63f14125b --- /dev/null +++ b/gui-apps/waybar/waybar-0.9.17-r2.ebuild @@ -0,0 +1,106 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit meson + +DESCRIPTION="Highly customizable Wayland bar for Sway and Wlroots based compositors" +HOMEPAGE="https://github.com/Alexays/Waybar" + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/Alexays/${PN^}.git" +else + SRC_URI="https://github.com/Alexays/${PN^}/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64" + S="${WORKDIR}/${PN^}-${PV}" +fi + +LICENSE="MIT" +SLOT="0" +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 )" + +BDEPEND=" + >=app-text/scdoc-1.9.2 + dev-util/gdbus-codegen + virtual/pkgconfig +" +RDEPEND=" + dev-cpp/cairomm:0 + dev-cpp/glibmm:2 + dev-cpp/gtkmm:3.0 + dev-libs/glib:2 + dev-libs/jsoncpp:= + dev-libs/libinput:= + dev-libs/libsigc++:2 + >=dev-libs/libfmt-7.0.0:= + >=dev-libs/spdlog-1.8.5:= + dev-libs/date:= + dev-libs/wayland + gui-libs/wlroots:= + x11-libs/gtk+:3[wayland] + x11-libs/libxkbcommon + evdev? ( dev-libs/libevdev:= ) + jack? ( virtual/jack ) + libinput? ( dev-libs/libinput:= ) + logind? ( + || ( sys-apps/systemd + sys-auth/elogind ) + ) + mpd? ( media-libs/libmpdclient ) + mpris? ( >=media-sound/playerctl-2 ) + network? ( dev-libs/libnl:3 ) + popups? ( gui-libs/gtk-layer-shell ) + pipewire? ( media-video/wireplumber:0/0.4 ) + pulseaudio? ( media-libs/libpulse ) + sndio? ( media-sound/sndio:= ) + systemd? ( sys-apps/systemd:= ) + tray? ( + dev-libs/libdbusmenu[gtk3] + dev-libs/libappindicator + ) + udev? ( virtual/libudev:= ) + upower? ( sys-power/upower ) + wifi? ( sys-apps/util-linux ) +" +DEPEND="${RDEPEND} + dev-libs/wayland-protocols + test? ( dev-cpp/catch:0 ) +" + +PATCHES=( + "${FILESDIR}/waybar-0.9.17-wireplumber.patch" + "${FILESDIR}/waybar-0.9.17-gcc13.patch" +) + +src_configure() { + local emesonargs=( + -Dman-pages=enabled + $(meson_feature evdev libevdev) + $(meson_feature jack) + $(meson_feature libinput) + $(meson_feature logind) + $(meson_feature mpd) + $(meson_feature mpris) + $(meson_feature network libnl) + $(meson_feature popups gtk-layer-shell) + $(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) + $(meson_feature upower upower_glib) + $(meson_feature wifi rfkill) + $(meson_use experimental) + ) + meson_src_configure +} 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) -- cgit v1.2.3-65-gdbad