diff options
| -rw-r--r-- | gui-apps/waybar/Manifest | 2 | ||||
| -rw-r--r-- | gui-apps/waybar/files/waybar-0.9.7-libfmt-8.patch | 32 | ||||
| -rw-r--r-- | gui-apps/waybar/waybar-0.9.5-r1.ebuild | 70 | ||||
| -rw-r--r-- | gui-apps/waybar/waybar-0.9.7-r1.ebuild | 70 |
4 files changed, 0 insertions, 174 deletions
diff --git a/gui-apps/waybar/Manifest b/gui-apps/waybar/Manifest index 0a7f4edbb69c..5623f72687e8 100644 --- a/gui-apps/waybar/Manifest +++ b/gui-apps/waybar/Manifest @@ -1,4 +1,2 @@ -DIST waybar-0.9.5.tar.gz 146094 BLAKE2B cd46e308d282df5ba6ce34417c0fe5468c188acb3c0f9bf5b2d4dd4c2c80547cab65172b4f4162c2dde0b78f68d15c8b79be74113cacd2610fd2a48299e14013 SHA512 0bbb9e898e205728fc564389927fec661a8dd6a9995a6c5d318f930f4527d6afd0be11a6b71dfa9aafb05c982e0f131e51eb0eec9a3e92c28f5cb04ff780fa8b -DIST waybar-0.9.7.tar.gz 150768 BLAKE2B 41dbcac30ffc42e04d565a590c1bce086271938936a05599bca6b74bac3fb2a8d1a4a4ddc5bec079dea6963eef8722c2c87a99c066de495caa163b1103a08095 SHA512 731b686235b1f0f94ce263e7ffa854f980fb8fccf30a0bd89e7aa0e1ca2c3fabd6d0df837bace6d6915d7a633500ed1f0497d012e082ca99fb32a78142b99279 DIST waybar-0.9.8.tar.gz 158869 BLAKE2B d5496986e3985747881cb8693b40d92e5c038a0ee55bf32e156efb67f02c46810cc80767635bd83837609b33855feced4f4f476deecbc47dfd43ef82700a87a2 SHA512 5c65b04cf0ae2e4cdff2b58c6b733a10a8b8d8acbb8f4f4519a0542be759fb6e84e46c323e4b8611ed25bda8bd322ee7a09cb697ed378e120841ce324021b104 DIST waybar-0.9.9.tar.gz 181603 BLAKE2B ac0430fef2cc3be3a63ae2e27d6982cdea67ee800db8e9acda2bd8025114c8f065a87a164a787d2c82a00b81012fe2fad91e8adb1b51241bc722355b100fed86 SHA512 c219c55014726d9201031ef4448505de516507a74d840a3f733b1719ae0100d1e882580da8b1490158fff2c3003cf915e04bcdf8a55b757bdb845e29bf705ecd diff --git a/gui-apps/waybar/files/waybar-0.9.7-libfmt-8.patch b/gui-apps/waybar/files/waybar-0.9.7-libfmt-8.patch deleted file mode 100644 index 8ffc8a42a9f1..000000000000 --- a/gui-apps/waybar/files/waybar-0.9.7-libfmt-8.patch +++ /dev/null @@ -1,32 +0,0 @@ -https://bugs.gentoo.org/797649 -https://github.com/Alexays/Waybar/pull/1144 - -From: John Helmert III <jchelmert3@posteo.net> -Date: Tue, 29 Jun 2021 21:29:12 -0500 -Subject: [PATCH] libfmt >=8.0.0 compatibility ---- a/include/util/format.hpp -+++ b/include/util/format.hpp -@@ -35,7 +35,11 @@ namespace fmt { - // The rationale for ignoring it is that the only reason to specify - // an alignment and a with is to get a fixed width bar, and ">" is - // sufficient in this implementation. -+#if FMT_VERSION < 80000 - width = parse_nonnegative_int(it, end, ctx); -+#else -+ width = detail::parse_nonnegative_int(it, end, -1); -+#endif - } - return it; - } ---- a/src/modules/clock.cpp -+++ b/src/modules/clock.cpp -@@ -196,6 +196,9 @@ template <> - struct fmt::formatter<waybar_time> : fmt::formatter<std::tm> { - template <typename FormatContext> - auto format(const waybar_time& t, FormatContext& ctx) { -+#if FMT_VERSION >= 80000 -+ auto& tm_format = specs; -+#endif - return format_to(ctx.out(), "{}", date::format(t.locale, fmt::to_string(tm_format), t.ztime)); - } - }; diff --git a/gui-apps/waybar/waybar-0.9.5-r1.ebuild b/gui-apps/waybar/waybar-0.9.5-r1.ebuild deleted file mode 100644 index fe2a849be6ce..000000000000 --- a/gui-apps/waybar/waybar-0.9.5-r1.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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" -fi -S="${WORKDIR}/${PN^}-${PV}" - -LICENSE="MIT" -SLOT="0" -IUSE="mpd network popups pulseaudio sndio tray +udev wifi" - -BDEPEND=" - >=app-text/scdoc-1.9.2 - virtual/pkgconfig -" -DEPEND=" - dev-cpp/gtkmm:3.0 - dev-libs/jsoncpp:= - dev-libs/libinput:= - dev-libs/libsigc++:2 - >=dev-libs/libfmt-5.3.0:= - >=dev-libs/spdlog-1.8.0:= - dev-libs/date:= - dev-libs/wayland - dev-libs/wayland-protocols - gui-libs/wlroots:= - x11-libs/gtk+:3[wayland] - mpd? ( media-libs/libmpdclient ) - network? ( dev-libs/libnl:3 ) - popups? ( gui-libs/gtk-layer-shell ) - pulseaudio? ( media-sound/pulseaudio ) - sndio? ( media-sound/sndio:= ) - tray? ( - dev-libs/libdbusmenu[gtk3] - dev-libs/libappindicator - ) - udev? ( virtual/libudev:= ) - wifi? ( || ( sys-apps/util-linux net-wireless/rfkill ) ) -" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}/${PN}-0.9.7-libfmt-8.patch" -) - -src_configure() { - local emesonargs=( - $(meson_feature mpd) - $(meson_feature network libnl) - $(meson_feature popups gtk-layer-shell) - $(meson_feature pulseaudio) - $(meson_feature sndio) - $(meson_feature tray dbusmenu-gtk) - $(meson_feature udev libudev) - $(meson_feature wifi rfkill) - ) - meson_src_configure -} diff --git a/gui-apps/waybar/waybar-0.9.7-r1.ebuild b/gui-apps/waybar/waybar-0.9.7-r1.ebuild deleted file mode 100644 index 920ee272bddd..000000000000 --- a/gui-apps/waybar/waybar-0.9.7-r1.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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" -fi -S="${WORKDIR}/${PN^}-${PV}" - -LICENSE="MIT" -SLOT="0" -IUSE="mpd network +popups pulseaudio sndio tray +udev wifi" - -BDEPEND=" - >=app-text/scdoc-1.9.2 - virtual/pkgconfig -" -DEPEND=" - dev-cpp/gtkmm:3.0 - dev-libs/jsoncpp:= - dev-libs/libinput:= - dev-libs/libsigc++:2 - >=dev-libs/libfmt-5.3.0:= - >=dev-libs/spdlog-1.8.0:= - dev-libs/date:= - dev-libs/wayland - dev-libs/wayland-protocols - gui-libs/wlroots:= - x11-libs/gtk+:3[wayland] - mpd? ( media-libs/libmpdclient ) - network? ( dev-libs/libnl:3 ) - popups? ( gui-libs/gtk-layer-shell ) - pulseaudio? ( media-sound/pulseaudio ) - sndio? ( media-sound/sndio:= ) - tray? ( - dev-libs/libdbusmenu[gtk3] - dev-libs/libappindicator - ) - udev? ( virtual/libudev:= ) - wifi? ( || ( sys-apps/util-linux net-wireless/rfkill ) ) -" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}/${P}-libfmt-8.patch" -) - -src_configure() { - local emesonargs=( - $(meson_feature mpd) - $(meson_feature network libnl) - $(meson_feature popups gtk-layer-shell) - $(meson_feature pulseaudio) - $(meson_feature sndio) - $(meson_feature tray dbusmenu-gtk) - $(meson_feature udev libudev) - $(meson_feature wifi rfkill) - ) - meson_src_configure -} |