SHA256
1
0
forked from pool/tigervnc

Accepting request 835044 from X11:XOrg

- vnserver: fix startup of Plasma desktop (boo#1176571)

OBS-URL: https://build.opensuse.org/request/show/835044
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/tigervnc?expand=0&rev=69
This commit is contained in:
Dominique Leuenberger 2020-09-18 12:33:10 +00:00 committed by Git OBS Bridge
commit 567167de1d
2 changed files with 7 additions and 2 deletions

View File

@ -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> Wed Aug 19 09:51:43 UTC 2020 - Callum Farmer <callumjfarmer13@gmail.com>

View File

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