From 740103dd3e31496b08863c0b036bd77d2647081b Mon Sep 17 00:00:00 2001 From: Sebastian Hamann Date: Sun, 13 Sep 2020 12:31:41 +0200 Subject: gui-apps/waybar: Fix runtime crash in v0.9.3 Upstream bug: https://github.com/Alexays/Waybar/issues/810 Patch from: https://github.com/Alexays/Waybar/pull/813 Closes: https://bugs.gentoo.org/742323 Signed-off-by: Sebastian Hamann Closes: https://github.com/gentoo/gentoo/pull/17519 Signed-off-by: Sam James --- .../files/waybar-0.9.3-fix-crash-with-fmt.patch | 22 ++++++++ gui-apps/waybar/waybar-0.9.3-r1.ebuild | 66 ++++++++++++++++++++++ gui-apps/waybar/waybar-0.9.3.ebuild | 62 -------------------- 3 files changed, 88 insertions(+), 62 deletions(-) create mode 100644 gui-apps/waybar/files/waybar-0.9.3-fix-crash-with-fmt.patch create mode 100644 gui-apps/waybar/waybar-0.9.3-r1.ebuild delete mode 100644 gui-apps/waybar/waybar-0.9.3.ebuild (limited to 'gui-apps/waybar') diff --git a/gui-apps/waybar/files/waybar-0.9.3-fix-crash-with-fmt.patch b/gui-apps/waybar/files/waybar-0.9.3-fix-crash-with-fmt.patch new file mode 100644 index 000000000000..73a2d871f2d6 --- /dev/null +++ b/gui-apps/waybar/files/waybar-0.9.3-fix-crash-with-fmt.patch @@ -0,0 +1,22 @@ +From 9b41b9593418772ce578a87de5984d4e37ef7f11 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Thorben=20G=C3=BCnther?= +Date: Mon, 10 Aug 2020 20:53:29 +0200 +Subject: [PATCH] Fix crash with fmt + +--- + include/util/format.hpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/util/format.hpp b/include/util/format.hpp +index 0147701b..288d8f0c 100644 +--- a/include/util/format.hpp ++++ b/include/util/format.hpp +@@ -23,7 +23,7 @@ namespace fmt { + constexpr auto parse(ParseContext& ctx) -> decltype (ctx.begin()) { + auto it = ctx.begin(), end = ctx.end(); + if (it != end && *it == ':') ++it; +- if (*it == '>' || *it == '<' || *it == '=') { ++ if (it && (*it == '>' || *it == '<' || *it == '=')) { + spec = *it; + ++it; + } diff --git a/gui-apps/waybar/waybar-0.9.3-r1.ebuild b/gui-apps/waybar/waybar-0.9.3-r1.ebuild new file mode 100644 index 000000000000..ef873b75a8c1 --- /dev/null +++ b/gui-apps/waybar/waybar-0.9.3-r1.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2020 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 tray +udev" + +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.3.1:= + 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 ) + tray? ( + dev-libs/libdbusmenu[gtk3] + dev-libs/libappindicator + ) + udev? ( virtual/libudev:= ) + " +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}/${PN}-0.9.3-fix-crash-with-fmt.patch" + ) + +src_configure() { + local emesonargs=( + $(meson_feature mpd) + $(meson_feature network libnl) + $(meson_feature popups gtk-layer-shell) + $(meson_feature pulseaudio) + $(meson_feature tray dbusmenu-gtk) + $(meson_feature udev libudev) + ) + meson_src_configure +} diff --git a/gui-apps/waybar/waybar-0.9.3.ebuild b/gui-apps/waybar/waybar-0.9.3.ebuild deleted file mode 100644 index 09983ab3ef51..000000000000 --- a/gui-apps/waybar/waybar-0.9.3.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2020 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 tray +udev" - -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.3.1:= - 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 ) - tray? ( - dev-libs/libdbusmenu[gtk3] - dev-libs/libappindicator - ) - udev? ( virtual/libudev:= ) - " -RDEPEND="${DEPEND}" - -src_configure() { - local emesonargs=( - $(meson_feature mpd) - $(meson_feature network libnl) - $(meson_feature popups gtk-layer-shell) - $(meson_feature pulseaudio) - $(meson_feature tray dbusmenu-gtk) - $(meson_feature udev libudev) - ) - meson_src_configure -} -- cgit v1.2.3-65-gdbad