Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package wireplumber for openSUSE:Factory
checked in at 2022-07-18 18:32:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/wireplumber (Old)
and /work/SRC/openSUSE:Factory/.wireplumber.new.1523 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "wireplumber"
Mon Jul 18 18:32:53 2022 rev:16 rq:989117 version:0.4.11
Changes:
--------
--- /work/SRC/openSUSE:Factory/wireplumber/wireplumber.changes 2022-07-09
16:59:13.920453648 +0200
+++ /work/SRC/openSUSE:Factory/.wireplumber.new.1523/wireplumber.changes
2022-07-18 18:32:59.565676871 +0200
@@ -1,0 +2,6 @@
+Thu Jul 14 08:35:10 UTC 2022 - Fabian Vogt <fv...@suse.com>
+
+- Add patch to fix crash on session end:
+ * 0001-dbus-fix-crash-when-trying-to-reconnect.patch
+
+-------------------------------------------------------------------
New:
----
0001-dbus-fix-crash-when-trying-to-reconnect.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ wireplumber.spec ++++++
--- /var/tmp/diff_new_pack.Msf98G/_old 2022-07-18 18:33:00.449678129 +0200
+++ /var/tmp/diff_new_pack.Msf98G/_new 2022-07-18 18:33:00.453678134 +0200
@@ -34,6 +34,7 @@
Patch0: reduce-meson-required-version.patch
# PATCH-FIX-UPSTREAM
Patch1: fix-alsa.patch
+Patch2: 0001-dbus-fix-crash-when-trying-to-reconnect.patch
# docs
BuildRequires: doxygen
BuildRequires: graphviz
@@ -143,6 +144,7 @@
%patch0 -p1
%endif
%patch1 -p1
+%patch2 -p1
pushd src/config/main.lua.d
python3 %{SOURCE1}
++++++ 0001-dbus-fix-crash-when-trying-to-reconnect.patch ++++++
>From eb406bdb2cbbcd49c55c71285f8f2eddb624d24b Mon Sep 17 00:00:00 2001
From: George Kiagiadakis <george.kiagiada...@collabora.com>
Date: Wed, 13 Jul 2022 13:38:14 +0300
Subject: [PATCH] dbus: fix crash when trying to reconnect
When coming from on_sync_reconnect, data points to the WpDBus object
instead of the activation transition.
Fixes: #305
---
lib/wp/dbus.c | 20 ++++++++++++++++----
1 file changed, 16 insertions(+), 4 deletions(-)
diff --git a/lib/wp/dbus.c b/lib/wp/dbus.c
index 01a3b21..7c2d023 100644
--- a/lib/wp/dbus.c
+++ b/lib/wp/dbus.c
@@ -58,14 +58,26 @@ wp_dbus_set_state (WpDbus *self, WpDBusState new_state)
static void
on_got_bus (GObject * obj, GAsyncResult * res, gpointer data)
{
- WpTransition *transition = WP_TRANSITION (data);
- WpDbus *self = wp_transition_get_source_object (transition);
+ WpTransition *transition;
+ WpDbus *self;
g_autoptr (GError) error = NULL;
+ if (WP_IS_TRANSITION (data)) {
+ // coming from wp_dbus_enable
+ transition = WP_TRANSITION (data);
+ self = wp_transition_get_source_object (transition);
+ } else {
+ // coming from on_sync_reconnect
+ transition = NULL;
+ self = WP_DBUS (data);
+ }
+
self->connection = g_dbus_connection_new_for_address_finish (res, &error);
if (!self->connection) {
- g_prefix_error (&error, "Failed to connect to bus: ");
- wp_transition_return_error (transition, g_steal_pointer (&error));
+ if (transition) {
+ g_prefix_error (&error, "Failed to connect to bus: ");
+ wp_transition_return_error (transition, g_steal_pointer (&error));
+ }
return;
}
--
2.36.1
