[Debian-on-mobile-maintainers] [Git][DebianOnMobile-team/phoc][debian/master] 3 commits: desktop: Don't remove startup-id listener when not connected

[Guido Günther (@agx)]

Guido Günther pushed to branch debian/master at Debian On Mobile / phoc


Commits:
679ba67e by Guido Günther at 2021-12-31T12:49:16+01:00
desktop: Don't remove startup-id listener when not connected

- - - - -
c8af2886 by Guido Günther at 2021-12-31T12:49:24+01:00
Document changes and release 0.11.0-2

- - - - -
a3d5b199 by Guido Günther at 2021-12-31T12:05:13+00:00
Merge branch 'shutdown-crash' into 'debian/master'

Fix a crash on shutdown

See merge request DebianOnMobile-team/phoc!9
- - - - -


3 changed files:

- debian/changelog
- + debian/patches/forwarded/desktop-Don-t-remove-startup-id-listener-when-not-connect.patch
- + debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+phoc (0.11.0-2) unstable; urgency=medium
+
+  * Don't remove startup-id listener when not connected This fixes a crash on
+    shutdown.
+
+ -- Guido Günther <agx at sigxcpu.org>  Fri, 31 Dec 2021 12:48:27 +0100
+
 phoc (0.11.0-1) unstable; urgency=medium
 
   * New upstream version 0.11.0


=====================================
debian/patches/forwarded/desktop-Don-t-remove-startup-id-listener-when-not-connect.patch
=====================================
@@ -0,0 +1,31 @@
+From: =?utf-8?q?Guido_G=C3=BCnther?= <agx at sigxcpu.org>
+Date: Fri, 31 Dec 2021 12:37:09 +0100
+Subject: desktop: Don't remove startup-id listener when not connected
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+This can lead to crashes on shutdown otherwise.
+
+Fixes 61324853 ("desktop: Handle xwayland startup-id removal")
+
+Forwarded: https://gitlab.gnome.org/World/Phosh/phoc/-/merge_requests/326
+Signed-off-by: Guido Günther <agx at sigxcpu.org>
+---
+ src/desktop.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/desktop.c b/src/desktop.c
+index f708dca..d459cd2 100644
+--- a/src/desktop.c
++++ b/src/desktop.c
+@@ -744,7 +744,9 @@ phoc_desktop_finalize (GObject *object)
+   if (self->config->xwayland) {
+     wl_list_remove (&self->xwayland_surface.link);
+     wl_list_remove (&self->xwayland_ready.link);
++#ifdef PHOC_HAVE_WLR_REMOVE_STARTUP_INFO
+     wl_list_remove (&self->xwayland_remove_startup_id.link);
++#endif
+   }
+ 
+   // We need to shutdown Xwayland before disconnecting all clients, otherwise


=====================================
debian/patches/series
=====================================
@@ -0,0 +1 @@
+forwarded/desktop-Don-t-remove-startup-id-listener-when-not-connect.patch



View it on GitLab: https://salsa.debian.org/DebianOnMobile-team/phoc/-/compare/5006299dd07e8021971c3b641accf188d04fb9a2...a3d5b199bebdaf73ea539846881ef4600bcbcf06

-- 
View it on GitLab: https://salsa.debian.org/DebianOnMobile-team/phoc/-/compare/5006299dd07e8021971c3b641accf188d04fb9a2...a3d5b199bebdaf73ea539846881ef4600bcbcf06
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-on-mobile-maintainers/attachments/20211231/5d119bc4/attachment-0001.htm>