From 7c529ef24db783f364f32f0c37305097d8edda9eb7ace003ea4a1fb6b53f1832 Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.com>
Date: Wed, 16 Sep 2020 10:09:49 +0000
Subject: [PATCH 1/2] - vnserver: fix startup of Plasma desktop (boo#1176571)

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/tigervnc?expand=0&rev=186
---
 tigervnc.changes                            | 5 +++++
 u_tigervnc_update_default_vncxstartup.patch | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/tigervnc.changes b/tigervnc.changes
index 21c74e6..dd8854d 100644
--- a/tigervnc.changes
+++ b/tigervnc.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Sep 16 10:01:17 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>
+
+- vnserver: fix startup of Plasma desktop (boo#1176571)
+
 -------------------------------------------------------------------
 Wed Aug 19 09:51:43 UTC 2020 - Callum Farmer <callumjfarmer13@gmail.com>
 
diff --git a/u_tigervnc_update_default_vncxstartup.patch b/u_tigervnc_update_default_vncxstartup.patch
index 3cb7a60..c641974 100644
--- a/u_tigervnc_update_default_vncxstartup.patch
+++ b/u_tigervnc_update_default_vncxstartup.patch
@@ -33,12 +33,12 @@ Index: b/unix/vncserver
 -       "  exec /etc/X11/xinit/xinitrc\n".
 +       "\n".
 +       "if [ -x \"\$client\" ]; then\n".
-+       "  exec \"\$client\"\n".
++       "  exec dbus-launch \"\$client\"\n".
         "fi\n".
 -       "if [ -f /etc/X11/xinit/xinitrc ]; then\n".
 -       "  exec sh /etc/X11/xinit/xinitrc\n".
 +       "if [ -f \"\$client\" ]; then\n".
-+       "  exec sh \"\$client\"\n".
++       "  exec dbus-launch sh \"\$client\"\n".
         "fi\n".
 +       "\n".
         "[ -r \$HOME/.Xresources ] && xrdb \$HOME/.Xresources\n".

From 522fe20d648f75428b84a9c891322c1b326d6e35b24bafdcaec4917b27fe4ad0 Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.com>
Date: Thu, 17 Sep 2020 02:27:59 +0000
Subject: [PATCH 2/2] start dbus-launch with --exit-with-x11 option

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/tigervnc?expand=0&rev=187
---
 u_tigervnc_update_default_vncxstartup.patch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/u_tigervnc_update_default_vncxstartup.patch b/u_tigervnc_update_default_vncxstartup.patch
index c641974..9d3985e 100644
--- a/u_tigervnc_update_default_vncxstartup.patch
+++ b/u_tigervnc_update_default_vncxstartup.patch
@@ -33,12 +33,12 @@ Index: b/unix/vncserver
 -       "  exec /etc/X11/xinit/xinitrc\n".
 +       "\n".
 +       "if [ -x \"\$client\" ]; then\n".
-+       "  exec dbus-launch \"\$client\"\n".
++       "  exec dbus-launch --exit-with-x11 \"\$client\"\n".
         "fi\n".
 -       "if [ -f /etc/X11/xinit/xinitrc ]; then\n".
 -       "  exec sh /etc/X11/xinit/xinitrc\n".
 +       "if [ -f \"\$client\" ]; then\n".
-+       "  exec dbus-launch sh \"\$client\"\n".
++       "  exec dbus-launch --exit-with-x11 sh \"\$client\"\n".
         "fi\n".
 +       "\n".
         "[ -r \$HOME/.Xresources ] && xrdb \$HOME/.Xresources\n".