[gentoo-commits] repo/gentoo:master commit in: gui-apps/waybar/files/

[gentoo-commits] repo/gentoo:master commit in: gui-apps/waybar/files/

[Joonas Niilola]

commit:     7f12dcc7b749552a0fd8aa60d6e0803eb49e8653
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Mon Mar 22 08:45:40 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Mar 22 14:01:04 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f12dcc7

gui-apps/waybar: remove unused patch(es)

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/20053
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 .../files/waybar-0.9.3-fix-crash-with-fmt.patch    | 22 ----------------------
 1 file changed, 22 deletions(-)

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
deleted file mode 100644
index 73a2d871f2d..00000000000
--- a/gui-apps/waybar/files/waybar-0.9.3-fix-crash-with-fmt.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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;
-           }

[gentoo-commits] repo/gentoo:master commit in: gui-apps/waybar/files/

[Sam James]

commit:     9fb0158600483ccbaaf3c86acbd775a216f05278
Author:     Julien Roy <julien <AT> jroy <DOT> ca>
AuthorDate: Sat Feb  4 22:23:29 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Feb  4 22:49:43 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fb01586

gui-apps/waybar: include another patch for wireplumber

Signed-off-by: Julien Roy <julien <AT> jroy.ca>
Closes: https://github.com/gentoo/gentoo/pull/29065
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../waybar/files/waybar-0.9.17-wireplumber.patch   | 29 ++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/gui-apps/waybar/files/waybar-0.9.17-wireplumber.patch b/gui-apps/waybar/files/waybar-0.9.17-wireplumber.patch
index bca3c259ae82..9db19e2a2b5d 100644
--- a/gui-apps/waybar/files/waybar-0.9.17-wireplumber.patch
+++ b/gui-apps/waybar/files/waybar-0.9.17-wireplumber.patch
@@ -1,3 +1,6 @@
+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
@@ -343,3 +346,29 @@ index 9a12a9b5b..9652e1e2b 100644
    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) {

[gentoo-commits] repo/gentoo:master commit in: gui-apps/waybar/files/

[Conrad Kostecki]

commit:     125eb342e969cfe7f99581d617669b5b0e74bb0d
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Mon Apr 17 18:38:30 2023 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Tue Apr 18 13:36:23 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=125eb342

gui-apps/waybar: remove unused patch

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/30632
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 gui-apps/waybar/files/systemd-0.9.17.patch | 35 ------------------------------
 1 file changed, 35 deletions(-)

diff --git a/gui-apps/waybar/files/systemd-0.9.17.patch b/gui-apps/waybar/files/systemd-0.9.17.patch
deleted file mode 100644
index 7d6c8dd10b38..000000000000
--- a/gui-apps/waybar/files/systemd-0.9.17.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff --git a/meson.build b/meson.build
-index ebf68d4..3c2a7fd 100644
---- a/meson.build
-+++ b/meson.build
-@@ -122,7 +122,6 @@ endif
- gtk_layer_shell = dependency('gtk-layer-shell-0',
-         required: get_option('gtk-layer-shell'),
-         fallback : ['gtk-layer-shell', 'gtk_layer_shell_dep'])
--systemd = dependency('systemd', required: get_option('systemd'))
- tz_dep = dependency('date',
-     required: false,
-     default_options : [ 'use_system_tzdb=true' ],
-@@ -136,16 +135,12 @@ conf_data.set('prefix', prefix)
- 
- add_project_arguments('-DSYSCONFDIR="/@0@"'.format(join_paths(prefix, sysconfdir)), language : 'cpp')
- 
--if systemd.found()
--  user_units_dir = systemd.get_pkgconfig_variable('systemduserunitdir')
--
--  configure_file(
--    configuration: conf_data,
--    input: './resources/waybar.service.in',
--    output: '@BASENAME@',
--    install_dir: user_units_dir
--  )
--endif
-+configure_file(
-+  configuration: conf_data,
-+  input: './resources/waybar.service.in',
-+  output: '@BASENAME@',
-+  install_dir: '/usr/lib/systemd/user'
-+)
- 
- src_files = files(
-     'src/factory.cpp',