gentoo auto-resync : 01:09:2023 - 22:14:42

5 files changed, 3 insertions, 414 deletions

diff --git a/gui-apps/Manifest.gz b/gui-apps/Manifest.gz
index e2d2076ff3e0..a77e8b69aa44 100644
--- a/gui-apps/Manifest.gz
+++ b/gui-apps/Manifest.gz
diff --git a/gui-apps/waybar/Manifest b/gui-apps/waybar/Manifest
index 6ad59ea701dc..1177ebb13920 100644
--- a/gui-apps/waybar/Manifest
+++ b/gui-apps/waybar/Manifest
@@ -1,8 +1,6 @@
-AUX waybar-0.9.17-gcc13.patch 808 BLAKE2B 21f746710d1db1d064f58f0c78da281ef9fd68ba16184cc255a7f557f2faec75d625462d833aec3ba2f3dc64c249bb6785a7791f7429d85f65e0050d102d43b1 SHA512 91edbb60aef10fad5259e73daec98baf026f85f38dc4a646cccf5cdccc438857de2f66ad9b1fb1f53e1e1aa4cc1db572609661e2b27e9f5e4773c326d2c2b9f9
-AUX waybar-0.9.17-wireplumber.patch 15607 BLAKE2B eb5ad8d86cf5881bcaa4bcde7baee10c0c0c6add3005c0e13dcc86fa0e6212d1e49900642edb8ddaff14ee1cfdf338c16e6b06e8c9a94309f0220c1a39dc5703 SHA512 1ab4da1c0f1c5c62a8054a7e7ce8c81141a15abc053fbff8c3d98e78d6934b6dcacd04d52841d0ea98fe7507298d33bf896f0a4ba3a55f4610aec0f9c8e3045b
-DIST waybar-0.9.17.tar.gz 220836 BLAKE2B 78a9065f4b20c1047ce5296c8eb3b6d05ecb1e4b9994b250937e7f681cf6d7f773a5de59189544eab90ad91cfd2abf170ec76c1b125a1d7b09a22f8a7a9d43e0 SHA512 51aba7649c0e2ad3ccf22f6ede3cdf9be9c84268d31d39c5eac62e150e3b115f5560b70ebd54242fd856abec0cca5eba405f1ec153cac4cd6623523f6b19189f
 DIST waybar-0.9.19.tar.gz 249917 BLAKE2B f2c5427544e8fe5d76302e34d3d02d214aa447865e1c33c86b21b9f025c8744ae6b95b5456a97f39dfbd12ab4408f9995f823718e0b2a486633f90303af0efa4 SHA512 32120bcf39b3b16d44a42e9121645e6d28c34b73dc54d30f4dcb40cb600865e3948fc839fde2f30c956e58627f7bef7f5e93a537223ca03350a016c77dde70c7
-EBUILD waybar-0.9.17-r3.ebuild 2550 BLAKE2B cbe76e06b3f8ab339189c1f30e5a9165eb51a8d0afbd8399973108c4b3992384a265c667cf922e5d76ca9591fdf3d0e4562f93872b1d3d57fceac268e6c0fc18 SHA512 7df28544ebf7f8eded5071478da6281cf5d5489c5d06c7b53a675234f76f0db969ddd8cc018ee8db1172752d9e5308fb021aec6abb6e0dae5c26a9cda77db747
+DIST waybar-0.9.22.tar.gz 255896 BLAKE2B 51ad09f401a871f4b17552c85b838be950d52ebab6b2230619cfa95acbbc2f6cbc5ae1cb1228ca4207052397090f9fd4470388808cc81954b59c16f5cc25ed9e SHA512 0cd2d4fdf51528d1246da756ec1d4be5dd897208f4ec1aef5ab2d2801ab72145bcccef68fa62e55f0b1bb9913d471ce5c748de97f9d785d55c06a5f6717c9849
 EBUILD waybar-0.9.19.ebuild 2467 BLAKE2B da14e960b484f95c186da98a5bb1a4808c398a0b21596413cb427f72ef31a2598e4f63c019613904aa63a7f9310165f545c9989fc3260c4661d7a9db14ce63c2 SHA512 e0691ea4568e1fb00613d39a1b5422d4a9b7b07f0c229deb11c716f1c67088a51af185ba47e052e53c84ee07d083edb0964a3acf505035bef045ce4ab0c56c2c
+EBUILD waybar-0.9.22.ebuild 2467 BLAKE2B da14e960b484f95c186da98a5bb1a4808c398a0b21596413cb427f72ef31a2598e4f63c019613904aa63a7f9310165f545c9989fc3260c4661d7a9db14ce63c2 SHA512 e0691ea4568e1fb00613d39a1b5422d4a9b7b07f0c229deb11c716f1c67088a51af185ba47e052e53c84ee07d083edb0964a3acf505035bef045ce4ab0c56c2c
 EBUILD waybar-9999.ebuild 2467 BLAKE2B da14e960b484f95c186da98a5bb1a4808c398a0b21596413cb427f72ef31a2598e4f63c019613904aa63a7f9310165f545c9989fc3260c4661d7a9db14ce63c2 SHA512 e0691ea4568e1fb00613d39a1b5422d4a9b7b07f0c229deb11c716f1c67088a51af185ba47e052e53c84ee07d083edb0964a3acf505035bef045ce4ab0c56c2c
 MISC metadata.xml 1677 BLAKE2B 2b44ed5a0b97760447698334b10e227c73436a1ba8a76da7c48933a2d7edbeb92f5dfe52ac6d8e8071b66c60703c1be88850d83035218a99ebeceae18e4b1660 SHA512 3e47ec2a12c58cb0f450c77b2ebfa9a521d9ca998bbf99b671b2b1c3d000eedeaeb7578e98d374d1a6db40120d05c5dae3b772c5e150a72b8a70c4435b899720
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.22.ebuild
index 165e0dcc1266..8fcd80c7603f 100644
--- a/gui-apps/waybar/waybar-0.9.17-r3.ebuild
+++ b/gui-apps/waybar/waybar-0.9.22.ebuild
@@ -75,14 +75,10 @@ DEPEND="${RDEPEND}
 	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
+		-Dcava=disabled
 		$(meson_feature evdev libevdev)
 		$(meson_feature jack)
 		$(meson_feature libinput)