* [gentoo-commits] repo/gentoo:master commit in: gui-apps/waybar/, gui-apps/waybar/files/
@ 2020-09-14 15:58 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2020-09-14 15:58 UTC (permalink / raw
To: gentoo-commits
commit: 740103dd3e31496b08863c0b036bd77d2647081b
Author: Sebastian Hamann <code <AT> ares-macrotechnology <DOT> com>
AuthorDate: Sun Sep 13 10:31:41 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Sep 14 15:57:57 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=740103dd
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 <code <AT> ares-macrotechnology.com>
Closes: https://github.com/gentoo/gentoo/pull/17519
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/waybar-0.9.3-fix-crash-with-fmt.patch | 22 ++++++++++++++++++++++
...{waybar-0.9.3.ebuild => waybar-0.9.3-r1.ebuild} | 4 ++++
2 files changed, 26 insertions(+)
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 00000000000..73a2d871f2d
--- /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?= <admin@xenrox.net>
+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.ebuild b/gui-apps/waybar/waybar-0.9.3-r1.ebuild
similarity index 95%
rename from gui-apps/waybar/waybar-0.9.3.ebuild
rename to gui-apps/waybar/waybar-0.9.3-r1.ebuild
index 09983ab3ef5..ef873b75a8c 100644
--- a/gui-apps/waybar/waybar-0.9.3.ebuild
+++ b/gui-apps/waybar/waybar-0.9.3-r1.ebuild
@@ -49,6 +49,10 @@ DEPEND="
"
RDEPEND="${DEPEND}"
+PATCHES=(
+ "${FILESDIR}/${PN}-0.9.3-fix-crash-with-fmt.patch"
+ )
+
src_configure() {
local emesonargs=(
$(meson_feature mpd)
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gui-apps/waybar/, gui-apps/waybar/files/
@ 2021-07-12 15:02 Ionen Wolkens
0 siblings, 0 replies; 6+ messages in thread
From: Ionen Wolkens @ 2021-07-12 15:02 UTC (permalink / raw
To: gentoo-commits
commit: 209673f3c76e5589ba6776a81eab44a01daa0cc6
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 12 10:21:02 2021 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Jul 12 14:59:15 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=209673f3
gui-apps/waybar: fix build with libfmt-8
Backport of the upstreamed fix.
(no real credit goes to me, only adjusted PR with maintainer's ack)
Closes: https://bugs.gentoo.org/797649
Closes: https://github.com/gentoo/gentoo/pull/21506
Signed-off-by: Jonas Toth <gentoo <AT> jonas-toth.eu>
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
gui-apps/waybar/files/waybar-0.9.7-libfmt-8.patch | 32 +++++++++++++++++++++++
gui-apps/waybar/waybar-0.9.5-r1.ebuild | 4 +++
gui-apps/waybar/waybar-0.9.7-r1.ebuild | 4 +++
3 files changed, 40 insertions(+)
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
new file mode 100644
index 00000000000..8ffc8a42a9f
--- /dev/null
+++ b/gui-apps/waybar/files/waybar-0.9.7-libfmt-8.patch
@@ -0,0 +1,32 @@
+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
index 3247d86629b..9bc5d7b989d 100644
--- a/gui-apps/waybar/waybar-0.9.5-r1.ebuild
+++ b/gui-apps/waybar/waybar-0.9.5-r1.ebuild
@@ -50,6 +50,10 @@ DEPEND="
"
RDEPEND="${DEPEND}"
+PATCHES=(
+ "${FILESDIR}/${PN}-0.9.7-libfmt-8.patch"
+)
+
src_configure() {
local emesonargs=(
$(meson_feature mpd)
diff --git a/gui-apps/waybar/waybar-0.9.7-r1.ebuild b/gui-apps/waybar/waybar-0.9.7-r1.ebuild
index 3247d86629b..aeaa8117b73 100644
--- a/gui-apps/waybar/waybar-0.9.7-r1.ebuild
+++ b/gui-apps/waybar/waybar-0.9.7-r1.ebuild
@@ -50,6 +50,10 @@ DEPEND="
"
RDEPEND="${DEPEND}"
+PATCHES=(
+ "${FILESDIR}/${P}-libfmt-8.patch"
+)
+
src_configure() {
local emesonargs=(
$(meson_feature mpd)
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gui-apps/waybar/, gui-apps/waybar/files/
@ 2022-01-26 1:09 Ionen Wolkens
0 siblings, 0 replies; 6+ messages in thread
From: Ionen Wolkens @ 2022-01-26 1:09 UTC (permalink / raw
To: gentoo-commits
commit: 853006be9f406d28e19e4bc269e8326ce57451f9
Author: Jonas Toth <gentoo <AT> jonas-toth <DOT> eu>
AuthorDate: Sat Jan 15 17:29:20 2022 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Jan 26 00:57:39 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=853006be
gui-apps/waybar: remove old ebuilds
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Jonas Toth <gentoo <AT> jonas-toth.eu>
Closes: https://github.com/gentoo/gentoo/pull/23808
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
gui-apps/waybar/Manifest | 2 -
gui-apps/waybar/files/waybar-0.9.7-libfmt-8.patch | 32 -----------
gui-apps/waybar/waybar-0.9.5-r1.ebuild | 70 -----------------------
gui-apps/waybar/waybar-0.9.7-r1.ebuild | 70 -----------------------
4 files changed, 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
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gui-apps/waybar/, gui-apps/waybar/files/
@ 2023-02-04 22:50 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2023-02-04 22:50 UTC (permalink / raw
To: gentoo-commits
commit: 0407584355441822379cafc79d11384b22651e60
Author: Julien Roy <julien <AT> jroy <DOT> ca>
AuthorDate: Sun Jan 29 00:30:10 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Feb 4 22:49:40 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04075843
gui-apps/waybar: drop 0.9.13
Signed-off-by: Julien Roy <julien <AT> jroy.ca>
Signed-off-by: Sam James <sam <AT> gentoo.org>
gui-apps/waybar/Manifest | 1 -
.../waybar/files/waybar-0.9.13-libcxx-build.patch | 36 ----------
gui-apps/waybar/waybar-0.9.13.ebuild | 76 ----------------------
3 files changed, 113 deletions(-)
diff --git a/gui-apps/waybar/Manifest b/gui-apps/waybar/Manifest
index 9d73361fd2e8..fb17d858121c 100644
--- a/gui-apps/waybar/Manifest
+++ b/gui-apps/waybar/Manifest
@@ -1,3 +1,2 @@
-DIST waybar-0.9.13.tar.gz 198160 BLAKE2B 222863b1048d2833be393875cad947647eccde3fcae335c48d4606843b3b9445717c18955351c56779196afaf9a5333ae7f718ea590521a79359372450d494a9 SHA512 d0a87044bcccdd16b1bbb20de750804c06335f11e638d37b5b80b72233e513378ba521f5c9d2c121a78a206877487628a6562cb080dd43eadae27e52d4cf6349
DIST waybar-0.9.16.tar.gz 215154 BLAKE2B c1e655dc57d3950472e22b23bd7bb7f96dd5daa1fc1ffee871a3677486f9f41981dbea8f559f8097e9c7bc367b0bcf224119af556ca62006f0e68e380b91fdec SHA512 d89067639de8ad560cd1515bb448f47f5994281b35239f069a2012165c0f83e0a3ae861cffbb93e7636d7d95cece9424e5900d40a06b80e71768aabda5f7b54a
DIST waybar-0.9.17.tar.gz 220836 BLAKE2B 78a9065f4b20c1047ce5296c8eb3b6d05ecb1e4b9994b250937e7f681cf6d7f773a5de59189544eab90ad91cfd2abf170ec76c1b125a1d7b09a22f8a7a9d43e0 SHA512 51aba7649c0e2ad3ccf22f6ede3cdf9be9c84268d31d39c5eac62e150e3b115f5560b70ebd54242fd856abec0cca5eba405f1ec153cac4cd6623523f6b19189f
diff --git a/gui-apps/waybar/files/waybar-0.9.13-libcxx-build.patch b/gui-apps/waybar/files/waybar-0.9.13-libcxx-build.patch
deleted file mode 100644
index ad24e22fc437..000000000000
--- a/gui-apps/waybar/files/waybar-0.9.13-libcxx-build.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-https://github.com/Alexays/Waybar/commit/d25278f710a4932798c98141bcf5b482de0e9166
-
-From: Jan Beich <jbeich@FreeBSD.org>
-Date: Mon, 23 May 2022 16:23:00 +0000
-Subject: [PATCH] fix(upower): add missing include for libc++
-
-In file included from src/modules/upower/upower.cpp:1:
-include/modules/upower/upower.hpp:25:16: error: no template named 'unordered_map' in namespace 'std'
- typedef std::unordered_map<std::string, UpDevice *> Devices;
- ~~~~~^
-In file included from src/modules/upower/upower_tooltip.cpp:1:
-include/modules/upower/upower_tooltip.hpp:13:16: error: no template named 'unordered_map' in namespace 'std'
- typedef std::unordered_map<std::string, UpDevice*> Devices;
- ~~~~~^
---- a/include/modules/upower/upower.hpp
-+++ b/include/modules/upower/upower.hpp
-@@ -5,6 +5,7 @@
- #include <iostream>
- #include <map>
- #include <string>
-+#include <unordered_map>
-
- #include "ALabel.hpp"
- #include "glibconfig.h"
---- a/include/modules/upower/upower_tooltip.hpp
-+++ b/include/modules/upower/upower_tooltip.hpp
-@@ -2,6 +2,8 @@
-
- #include <libupower-glib/upower.h>
-
-+#include <unordered_map>
-+
- #include "gtkmm/box.h"
- #include "gtkmm/label.h"
- #include "gtkmm/window.h"
-
diff --git a/gui-apps/waybar/waybar-0.9.13.ebuild b/gui-apps/waybar/waybar-0.9.13.ebuild
deleted file mode 100644
index c4886a844841..000000000000
--- a/gui-apps/waybar/waybar-0.9.13.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2022 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"
-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
- dev-util/gdbus-codegen
- virtual/pkgconfig
-"
-DEPEND="
- 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/libfmt-9.0.0:=
- >=dev-libs/spdlog-1.8.5:=
- dev-libs/date:=
- dev-libs/wayland
- dev-libs/wayland-protocols
- gui-libs/wlroots:=
- x11-libs/gtk+:3[wayland]
- x11-libs/libxkbcommon
- 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}-libcxx-build.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
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gui-apps/waybar/, gui-apps/waybar/files/
@ 2023-04-10 4:11 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2023-04-10 4:11 UTC (permalink / raw
To: gentoo-commits
commit: 2e4cff0f61c3b37cfd629d668c15cd1859fee4f5
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 10 04:09:51 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Apr 10 04:09:51 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e4cff0f
gui-apps/waybar: fix build w/ gcc 13
Closes: https://bugs.gentoo.org/900729
Signed-off-by: Sam James <sam <AT> gentoo.org>
gui-apps/waybar/files/waybar-0.9.17-gcc13.patch | 31 +++++++++++++++++++++++++
gui-apps/waybar/waybar-0.9.17.ebuild | 1 +
2 files changed, 32 insertions(+)
diff --git a/gui-apps/waybar/files/waybar-0.9.17-gcc13.patch b/gui-apps/waybar/files/waybar-0.9.17-gcc13.patch
new file mode 100644
index 000000000000..831435f50cac
--- /dev/null
+++ b/gui-apps/waybar/files/waybar-0.9.17-gcc13.patch
@@ -0,0 +1,31 @@
+https://bugs.gentoo.org/900729
+https://github.com/Alexays/Waybar/commit/ca9d237b00b4d01f341b0d7bc938afb10a4f8cad
+
+From ca9d237b00b4d01f341b0d7bc938afb10a4f8cad Mon Sep 17 00:00:00 2001
+From: Aleksei Bavshin <alebastr89@gmail.com>
+Date: Mon, 16 Jan 2023 10:27:21 -0800
+Subject: [PATCH] fix(sway): add missing includes for GCC 13
+
+See also: https://gcc.gnu.org/gcc-13/porting_to.html
+--- a/include/modules/sway/ipc/client.hpp
++++ b/include/modules/sway/ipc/client.hpp
+@@ -8,6 +8,7 @@
+ #include <cstring>
+ #include <memory>
+ #include <mutex>
++#include <string>
+
+ #include "ipc.hpp"
+ #include "util/sleeper_thread.hpp"
+--- a/src/modules/sway/ipc/client.cpp
++++ b/src/modules/sway/ipc/client.cpp
+@@ -2,6 +2,8 @@
+
+ #include <fcntl.h>
+
++#include <stdexcept>
++
+ namespace waybar::modules::sway {
+
+ Ipc::Ipc() {
+
diff --git a/gui-apps/waybar/waybar-0.9.17.ebuild b/gui-apps/waybar/waybar-0.9.17.ebuild
index 9d2f830e6558..cd71fa673ed4 100644
--- a/gui-apps/waybar/waybar-0.9.17.ebuild
+++ b/gui-apps/waybar/waybar-0.9.17.ebuild
@@ -59,6 +59,7 @@ RDEPEND="${DEPEND}"
PATCHES=(
"${FILESDIR}/waybar-0.9.17-wireplumber.patch"
+ "${FILESDIR}/waybar-0.9.17-gcc13.patch"
)
src_configure() {
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gui-apps/waybar/, gui-apps/waybar/files/
@ 2023-09-01 17:08 Arthur Zamarin
0 siblings, 0 replies; 6+ messages in thread
From: Arthur Zamarin @ 2023-09-01 17:08 UTC (permalink / raw
To: gentoo-commits
commit: d8823ca3bc962340a07b83dbf03bbc80377e03e1
Author: Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
AuthorDate: Wed Aug 23 15:55:25 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Sep 1 17:08:15 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8823ca3
gui-apps/waybar: drop 0.9.17-r3
Signed-off-by: Takuya Wakazono <pastalian46 <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/32422
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
gui-apps/waybar/Manifest | 1 -
gui-apps/waybar/files/waybar-0.9.17-gcc13.patch | 31 --
.../waybar/files/waybar-0.9.17-wireplumber.patch | 374 ---------------------
gui-apps/waybar/waybar-0.9.17-r3.ebuild | 106 ------
4 files changed, 512 deletions(-)
diff --git a/gui-apps/waybar/Manifest b/gui-apps/waybar/Manifest
index a01ed3b65b5d..954c45c07630 100644
--- a/gui-apps/waybar/Manifest
+++ b/gui-apps/waybar/Manifest
@@ -1,3 +1,2 @@
-DIST waybar-0.9.17.tar.gz 220836 BLAKE2B 78a9065f4b20c1047ce5296c8eb3b6d05ecb1e4b9994b250937e7f681cf6d7f773a5de59189544eab90ad91cfd2abf170ec76c1b125a1d7b09a22f8a7a9d43e0 SHA512 51aba7649c0e2ad3ccf22f6ede3cdf9be9c84268d31d39c5eac62e150e3b115f5560b70ebd54242fd856abec0cca5eba405f1ec153cac4cd6623523f6b19189f
DIST waybar-0.9.19.tar.gz 249917 BLAKE2B f2c5427544e8fe5d76302e34d3d02d214aa447865e1c33c86b21b9f025c8744ae6b95b5456a97f39dfbd12ab4408f9995f823718e0b2a486633f90303af0efa4 SHA512 32120bcf39b3b16d44a42e9121645e6d28c34b73dc54d30f4dcb40cb600865e3948fc839fde2f30c956e58627f7bef7f5e93a537223ca03350a016c77dde70c7
DIST waybar-0.9.22.tar.gz 255896 BLAKE2B 51ad09f401a871f4b17552c85b838be950d52ebab6b2230619cfa95acbbc2f6cbc5ae1cb1228ca4207052397090f9fd4470388808cc81954b59c16f5cc25ed9e SHA512 0cd2d4fdf51528d1246da756ec1d4be5dd897208f4ec1aef5ab2d2801ab72145bcccef68fa62e55f0b1bb9913d471ce5c748de97f9d785d55c06a5f6717c9849
diff --git a/gui-apps/waybar/files/waybar-0.9.17-gcc13.patch b/gui-apps/waybar/files/waybar-0.9.17-gcc13.patch
deleted file mode 100644
index 831435f50cac..000000000000
--- a/gui-apps/waybar/files/waybar-0.9.17-gcc13.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-https://bugs.gentoo.org/900729
-https://github.com/Alexays/Waybar/commit/ca9d237b00b4d01f341b0d7bc938afb10a4f8cad
-
-From ca9d237b00b4d01f341b0d7bc938afb10a4f8cad Mon Sep 17 00:00:00 2001
-From: Aleksei Bavshin <alebastr89@gmail.com>
-Date: Mon, 16 Jan 2023 10:27:21 -0800
-Subject: [PATCH] fix(sway): add missing includes for GCC 13
-
-See also: https://gcc.gnu.org/gcc-13/porting_to.html
---- a/include/modules/sway/ipc/client.hpp
-+++ b/include/modules/sway/ipc/client.hpp
-@@ -8,6 +8,7 @@
- #include <cstring>
- #include <memory>
- #include <mutex>
-+#include <string>
-
- #include "ipc.hpp"
- #include "util/sleeper_thread.hpp"
---- a/src/modules/sway/ipc/client.cpp
-+++ b/src/modules/sway/ipc/client.cpp
-@@ -2,6 +2,8 @@
-
- #include <fcntl.h>
-
-+#include <stdexcept>
-+
- namespace waybar::modules::sway {
-
- Ipc::Ipc() {
-
diff --git a/gui-apps/waybar/files/waybar-0.9.17-wireplumber.patch b/gui-apps/waybar/files/waybar-0.9.17-wireplumber.patch
deleted file mode 100644
index 9db19e2a2b5d..000000000000
--- a/gui-apps/waybar/files/waybar-0.9.17-wireplumber.patch
+++ /dev/null
@@ -1,374 +0,0 @@
-Commit: https://github.com/Alexays/Waybar/commit/4e8ccf36b54cacf5281726d23ea14312a133f977
-Commit: https://github.com/Alexays/Waybar/commit/8da5425189d52ebbaab063c9289c5de5adbe0ca5
-Issue: https://github.com/Alexays/Waybar/issues/1852
-From 4e8ccf36b54cacf5281726d23ea14312a133f977 Mon Sep 17 00:00:00 2001
-From: Sasha Moak <sasha.moak@gmail.com>
-Date: Thu, 12 Jan 2023 16:17:11 -0800
-Subject: [PATCH] fix(wireplumber): waybar crashes when default node changes
-
-In order to fix the issue, the default node name is cached rather than
-the default node id. This is due to ids being unstable. So now when the
-object manager is installed (ie ready), the default node name is
-retrieved and stored for later.
-
-Now when the mixer changed signal is emitted, the id of the changed node
-is used to get the node from the object manager. The nodes name is
-grabbed off that node and compared against the default node name, if
-they match the volume is updated. Some safeguarding has been added such
-that if the node cannot be found off the object manager, it's ignored.
-
-Additionally, the "changed" signal on the default nodes api is now
-utilized to update the default node name if it has changed. This way if
-the default node changes, the module will be updated with the correct
-volume and node.nick.
-
-This adds additional debug logging for helping diagnose wireplumber
-issues.
-
-This also adds the wireplumber man page entry to the main waybar
-supported section.
----
- include/modules/wireplumber.hpp | 10 +-
- man/waybar.5.scd.in | 1 +
- src/modules/wireplumber.cpp | 184 ++++++++++++++++++++++++++------
- 3 files changed, 157 insertions(+), 38 deletions(-)
-
-diff --git a/include/modules/wireplumber.hpp b/include/modules/wireplumber.hpp
-index c0ee7f0be..fa988fcf3 100644
---- a/include/modules/wireplumber.hpp
-+++ b/include/modules/wireplumber.hpp
-@@ -20,15 +20,19 @@ class Wireplumber : public ALabel {
- void loadRequiredApiModules();
- void prepare();
- void activatePlugins();
-- static void updateVolume(waybar::modules::Wireplumber* self);
-- static void updateNodeName(waybar::modules::Wireplumber* self);
-- static uint32_t getDefaultNodeId(waybar::modules::Wireplumber* self);
-+ static void updateVolume(waybar::modules::Wireplumber* self, uint32_t id);
-+ static void updateNodeName(waybar::modules::Wireplumber* self, uint32_t id);
- static void onPluginActivated(WpObject* p, GAsyncResult* res, waybar::modules::Wireplumber* self);
- static void onObjectManagerInstalled(waybar::modules::Wireplumber* self);
-+ static void onMixerChanged(waybar::modules::Wireplumber* self, uint32_t id);
-+ static void onDefaultNodesApiChanged(waybar::modules::Wireplumber* self);
-
- WpCore* wp_core_;
- GPtrArray* apis_;
- WpObjectManager* om_;
-+ WpPlugin* mixer_api_;
-+ WpPlugin* def_nodes_api_;
-+ gchar* default_node_name_;
- uint32_t pending_plugins_;
- bool muted_;
- double volume_;
-diff --git a/man/waybar.5.scd.in b/man/waybar.5.scd.in
-index b1ed4c527..7566dd000 100644
---- a/man/waybar.5.scd.in
-+++ b/man/waybar.5.scd.in
-@@ -277,6 +277,7 @@ A module group is defined by specifying a module named "group/some-group-name".
- - *waybar-sway-scratchpad(5)*
- - *waybar-sway-window(5)*
- - *waybar-sway-workspaces(5)*
-+- *waybar-wireplumber(5)*
- - *waybar-wlr-taskbar(5)*
- - *waybar-wlr-workspaces(5)*
- - *waybar-temperature(5)*
-diff --git a/src/modules/wireplumber.cpp b/src/modules/wireplumber.cpp
-index 9a12a9b5b..9652e1e2b 100644
---- a/src/modules/wireplumber.cpp
-+++ b/src/modules/wireplumber.cpp
-@@ -1,15 +1,22 @@
- #include "modules/wireplumber.hpp"
-
-+#include <spdlog/spdlog.h>
-+
-+bool isValidNodeId(uint32_t id) { return id > 0 && id < G_MAXUINT32; }
-+
- waybar::modules::Wireplumber::Wireplumber(const std::string& id, const Json::Value& config)
- : ALabel(config, "wireplumber", id, "{volume}%"),
- wp_core_(nullptr),
- apis_(nullptr),
- om_(nullptr),
-+ mixer_api_(nullptr),
-+ def_nodes_api_(nullptr),
-+ default_node_name_(nullptr),
- pending_plugins_(0),
- muted_(false),
- volume_(0.0),
- node_id_(0) {
-- wp_init(WP_INIT_ALL);
-+ wp_init(WP_INIT_PIPEWIRE);
- wp_core_ = wp_core_new(NULL, NULL);
- apis_ = g_ptr_array_new_with_free_func(g_object_unref);
- om_ = wp_object_manager_new();
-@@ -18,10 +25,15 @@ waybar::modules::Wireplumber::Wireplumber(const std::string& id, const Json::Val
-
- loadRequiredApiModules();
-
-+ spdlog::debug("[{}]: connecting to pipewire...", this->name_);
-+
- if (!wp_core_connect(wp_core_)) {
-+ spdlog::error("[{}]: Could not connect to PipeWire", this->name_);
- throw std::runtime_error("Could not connect to PipeWire\n");
- }
-
-+ spdlog::debug("[{}]: connected!", this->name_);
-+
- g_signal_connect_swapped(om_, "installed", (GCallback)onObjectManagerInstalled, this);
-
- activatePlugins();
-@@ -33,33 +45,26 @@ waybar::modules::Wireplumber::~Wireplumber() {
- g_clear_pointer(&apis_, g_ptr_array_unref);
- g_clear_object(&om_);
- g_clear_object(&wp_core_);
-+ g_clear_object(&mixer_api_);
-+ g_clear_object(&def_nodes_api_);
-+ g_free(&default_node_name_);
- }
-
--uint32_t waybar::modules::Wireplumber::getDefaultNodeId(waybar::modules::Wireplumber* self) {
-- uint32_t id;
-- g_autoptr(WpPlugin) def_nodes_api = wp_plugin_find(self->wp_core_, "default-nodes-api");
-+void waybar::modules::Wireplumber::updateNodeName(waybar::modules::Wireplumber* self, uint32_t id) {
-+ spdlog::debug("[{}]: updating node name with node.id {}", self->name_, id);
-
-- if (!def_nodes_api) {
-- throw std::runtime_error("Default nodes API is not loaded\n");
-+ if (!isValidNodeId(id)) {
-+ spdlog::warn("[{}]: '{}' is not a valid node ID. Ignoring node name update.", self->name_, id);
-+ return;
- }
-
-- g_signal_emit_by_name(def_nodes_api, "get-default-node", "Audio/Sink", &id);
--
-- if (id <= 0 || id >= G_MAXUINT32) {
-- auto err = fmt::format("'{}' is not a valid ID (returned by default-nodes-api)\n", id);
-- throw std::runtime_error(err);
-- }
--
-- return id;
--}
--
--void waybar::modules::Wireplumber::updateNodeName(waybar::modules::Wireplumber* self) {
-- auto proxy = static_cast<WpProxy*>(
-- wp_object_manager_lookup(self->om_, WP_TYPE_GLOBAL_PROXY, WP_CONSTRAINT_TYPE_G_PROPERTY,
-- "bound-id", "=u", self->node_id_, NULL));
-+ auto proxy = static_cast<WpProxy*>(wp_object_manager_lookup(
-+ self->om_, WP_TYPE_GLOBAL_PROXY, WP_CONSTRAINT_TYPE_G_PROPERTY, "bound-id", "=u", id, NULL));
-
- if (!proxy) {
-- throw std::runtime_error(fmt::format("Object '{}' not found\n", self->node_id_));
-+ auto err = fmt::format("Object '{}' not found\n", id);
-+ spdlog::error("[{}]: {}", self->name_, err);
-+ throw std::runtime_error(err);
- }
-
- g_autoptr(WpProperties) properties =
-@@ -73,15 +78,24 @@ void waybar::modules::Wireplumber::updateNodeName(waybar::modules::Wireplumber*
- auto description = wp_properties_get(properties, "node.description");
-
- self->node_name_ = nick ? nick : description;
-+ spdlog::debug("[{}]: Updating node name to: {}", self->name_, self->node_name_);
- }
-
--void waybar::modules::Wireplumber::updateVolume(waybar::modules::Wireplumber* self) {
-+void waybar::modules::Wireplumber::updateVolume(waybar::modules::Wireplumber* self, uint32_t id) {
-+ spdlog::debug("[{}]: updating volume", self->name_);
- double vol;
- GVariant* variant = NULL;
-- g_autoptr(WpPlugin) mixer_api = wp_plugin_find(self->wp_core_, "mixer-api");
-- g_signal_emit_by_name(mixer_api, "get-volume", self->node_id_, &variant);
-+
-+ if (!isValidNodeId(id)) {
-+ spdlog::error("[{}]: '{}' is not a valid node ID. Ignoring volume update.", self->name_, id);
-+ return;
-+ }
-+
-+ g_signal_emit_by_name(self->mixer_api_, "get-volume", id, &variant);
-+
- if (!variant) {
-- auto err = fmt::format("Node {} does not support volume\n", self->node_id_);
-+ auto err = fmt::format("Node {} does not support volume\n", id);
-+ spdlog::error("[{}]: {}", self->name_, err);
- throw std::runtime_error(err);
- }
-
-@@ -93,22 +107,121 @@ void waybar::modules::Wireplumber::updateVolume(waybar::modules::Wireplumber* se
- self->dp.emit();
- }
-
-+void waybar::modules::Wireplumber::onMixerChanged(waybar::modules::Wireplumber* self, uint32_t id) {
-+ spdlog::debug("[{}]: (onMixerChanged) - id: {}", self->name_, id);
-+
-+ g_autoptr(WpNode) node = static_cast<WpNode*>(wp_object_manager_lookup(
-+ self->om_, WP_TYPE_NODE, WP_CONSTRAINT_TYPE_G_PROPERTY, "bound-id", "=u", id, NULL));
-+
-+ if (!node) {
-+ spdlog::warn("[{}]: (onMixerChanged) - Object with id {} not found", self->name_, id);
-+ return;
-+ }
-+
-+ const gchar* name = wp_pipewire_object_get_property(WP_PIPEWIRE_OBJECT(node), "node.name");
-+
-+ if (g_strcmp0(self->default_node_name_, name) != 0) {
-+ spdlog::debug(
-+ "[{}]: (onMixerChanged) - ignoring mixer update for node: id: {}, name: {} as it is not "
-+ "the default node: {}",
-+ self->name_, id, name, self->default_node_name_);
-+ return;
-+ }
-+
-+ spdlog::debug("[{}]: (onMixerChanged) - Need to update volume for node with id {} and name {}",
-+ self->name_, id, name);
-+ updateVolume(self, id);
-+}
-+
-+void waybar::modules::Wireplumber::onDefaultNodesApiChanged(waybar::modules::Wireplumber* self) {
-+ spdlog::debug("[{}]: (onDefaultNodesApiChanged)", self->name_);
-+
-+ uint32_t default_node_id;
-+ g_signal_emit_by_name(self->def_nodes_api_, "get-default-node", "Audio/Sink", &default_node_id);
-+
-+ if (!isValidNodeId(default_node_id)) {
-+ spdlog::warn("[{}]: '{}' is not a valid node ID. Ignoring node change.", self->name_,
-+ default_node_id);
-+ return;
-+ }
-+
-+ g_autoptr(WpNode) node = static_cast<WpNode*>(
-+ wp_object_manager_lookup(self->om_, WP_TYPE_NODE, WP_CONSTRAINT_TYPE_G_PROPERTY, "bound-id",
-+ "=u", default_node_id, NULL));
-+
-+ if (!node) {
-+ spdlog::warn("[{}]: (onDefaultNodesApiChanged) - Object with id {} not found", self->name_,
-+ default_node_id);
-+ return;
-+ }
-+
-+ const gchar* default_node_name =
-+ wp_pipewire_object_get_property(WP_PIPEWIRE_OBJECT(node), "node.name");
-+
-+ spdlog::debug(
-+ "[{}]: (onDefaultNodesApiChanged) - got the following default node: Node(name: {}, id: {})",
-+ self->name_, default_node_name, default_node_id);
-+
-+ if (g_strcmp0(self->default_node_name_, default_node_name) == 0) {
-+ spdlog::debug(
-+ "[{}]: (onDefaultNodesApiChanged) - Default node has not changed. Node(name: {}, id: {}). "
-+ "Ignoring.",
-+ self->name_, self->default_node_name_, default_node_id);
-+ return;
-+ }
-+
-+ spdlog::debug(
-+ "[{}]: (onDefaultNodesApiChanged) - Default node changed to -> Node(name: {}, id: {})",
-+ self->name_, default_node_name, default_node_id);
-+
-+ self->default_node_name_ = g_strdup(default_node_name);
-+ updateVolume(self, default_node_id);
-+ updateNodeName(self, default_node_id);
-+}
-+
- void waybar::modules::Wireplumber::onObjectManagerInstalled(waybar::modules::Wireplumber* self) {
-- self->node_id_ =
-- self->config_["node-id"].isInt() ? self->config_["node-id"].asInt() : getDefaultNodeId(self);
-+ spdlog::debug("[{}]: onObjectManagerInstalled", self->name_);
-+
-+ self->def_nodes_api_ = wp_plugin_find(self->wp_core_, "default-nodes-api");
-+
-+ if (!self->def_nodes_api_) {
-+ spdlog::error("[{}]: default nodes api is not loaded.", self->name_);
-+ throw std::runtime_error("Default nodes API is not loaded\n");
-+ }
-+
-+ self->mixer_api_ = wp_plugin_find(self->wp_core_, "mixer-api");
-+
-+ if (!self->mixer_api_) {
-+ spdlog::error("[{}]: mixer api is not loaded.", self->name_);
-+ throw std::runtime_error("Mixer api is not loaded\n");
-+ }
-+
-+ uint32_t default_node_id;
-+ g_signal_emit_by_name(self->def_nodes_api_, "get-default-configured-node-name", "Audio/Sink",
-+ &self->default_node_name_);
-+ g_signal_emit_by_name(self->def_nodes_api_, "get-default-node", "Audio/Sink", &default_node_id);
-+
-+ if (self->default_node_name_) {
-+ spdlog::debug("[{}]: (onObjectManagerInstalled) - default configured node name: {} and id: {}",
-+ self->name_, self->default_node_name_, default_node_id);
-+ }
-
-- g_autoptr(WpPlugin) mixer_api = wp_plugin_find(self->wp_core_, "mixer-api");
-+ updateVolume(self, default_node_id);
-+ updateNodeName(self, default_node_id);
-
-- updateVolume(self);
-- updateNodeName(self);
-- g_signal_connect_swapped(mixer_api, "changed", (GCallback)updateVolume, self);
-+ g_signal_connect_swapped(self->mixer_api_, "changed", (GCallback)onMixerChanged, self);
-+ g_signal_connect_swapped(self->def_nodes_api_, "changed", (GCallback)onDefaultNodesApiChanged,
-+ self);
- }
-
- void waybar::modules::Wireplumber::onPluginActivated(WpObject* p, GAsyncResult* res,
- waybar::modules::Wireplumber* self) {
-+ auto plugin_name = wp_plugin_get_name(WP_PLUGIN(p));
-+ spdlog::debug("[{}]: onPluginActivated: {}", self->name_, plugin_name);
- g_autoptr(GError) error = NULL;
-
- if (!wp_object_activate_finish(p, res, &error)) {
-+ spdlog::error("[{}]: error activating plugin: {}", self->name_, error->message);
- throw std::runtime_error(error->message);
- }
-
-@@ -118,6 +231,7 @@ void waybar::modules::Wireplumber::onPluginActivated(WpObject* p, GAsyncResult*
- }
-
- void waybar::modules::Wireplumber::activatePlugins() {
-+ spdlog::debug("[{}]: activating plugins", name_);
- for (uint16_t i = 0; i < apis_->len; i++) {
- WpPlugin* plugin = static_cast<WpPlugin*>(g_ptr_array_index(apis_, i));
- pending_plugins_++;
-@@ -127,13 +241,13 @@ void waybar::modules::Wireplumber::activatePlugins() {
- }
-
- void waybar::modules::Wireplumber::prepare() {
-- wp_object_manager_add_interest(om_, WP_TYPE_NODE, NULL);
-- wp_object_manager_add_interest(om_, WP_TYPE_GLOBAL_PROXY, NULL);
-- wp_object_manager_request_object_features(om_, WP_TYPE_GLOBAL_PROXY,
-- WP_PIPEWIRE_OBJECT_FEATURES_MINIMAL);
-+ spdlog::debug("[{}]: preparing object manager", name_);
-+ wp_object_manager_add_interest(om_, WP_TYPE_NODE, WP_CONSTRAINT_TYPE_PW_PROPERTY, "media.class",
-+ "=s", "Audio/Sink", NULL);
- }
-
- void waybar::modules::Wireplumber::loadRequiredApiModules() {
-+ spdlog::debug("[{}]: loading required modules", name_);
- g_autoptr(GError) error = NULL;
-
- if (!wp_core_load_component(wp_core_, "libwireplumber-module-default-nodes-api", "module", NULL,
-From a9c9f1d705991c7f6ff9de7eac3430a219011978 Mon Sep 17 00:00:00 2001
-From: Sasha Moak <sasha.moak@gmail.com>
-Date: Tue, 31 Jan 2023 17:56:58 -0800
-Subject: [PATCH] fix(wireplumber): free(): invalid pointer
-
-When freeing the `default_node_name_` pointer using `free`, the `&`
-operator was used to try to free the reference rather than the pointer.
-This caused a core dump. In order to fix this, the pointer is freed
-instead (ie the `&` operator is no longer used).
----
- src/modules/wireplumber.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/modules/wireplumber.cpp b/src/modules/wireplumber.cpp
-index fd1a0d389..4c7a2d0b1 100644
---- a/src/modules/wireplumber.cpp
-+++ b/src/modules/wireplumber.cpp
-@@ -47,7 +47,7 @@ waybar::modules::Wireplumber::~Wireplumber() {
- g_clear_object(&wp_core_);
- g_clear_object(&mixer_api_);
- g_clear_object(&def_nodes_api_);
-- g_free(&default_node_name_);
-+ g_free(default_node_name_);
- }
-
- void waybar::modules::Wireplumber::updateNodeName(waybar::modules::Wireplumber* self, uint32_t id) {
diff --git a/gui-apps/waybar/waybar-0.9.17-r3.ebuild b/gui-apps/waybar/waybar-0.9.17-r3.ebuild
deleted file mode 100644
index 165e0dcc1266..000000000000
--- a/gui-apps/waybar/waybar-0.9.17-r3.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# 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/libayatana-appindicator
- )
- 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
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-09-01 17:08 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-01-26 1:09 [gentoo-commits] repo/gentoo:master commit in: gui-apps/waybar/, gui-apps/waybar/files/ Ionen Wolkens
-- strict thread matches above, loose matches on Subject: below --
2023-09-01 17:08 Arthur Zamarin
2023-04-10 4:11 Sam James
2023-02-04 22:50 Sam James
2021-07-12 15:02 Ionen Wolkens
2020-09-14 15:58 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox