pool/tigervnc
SHA256
4
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- u_tigervnc_update_default_vncxstartup.patch

Browse Source 
* check first for /usr/libexec/xinit/xinitrc, then 
    /etc/X11/xinit/xinitrc (reported by aschnell @SUSE)

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/tigervnc?expand=0&rev=195
This commit is contained in:
Stefan Dirsch 2020-11-25 16:30:04 +00:00 committed by Git OBS Bridge
parent a6789f802c
commit b15510ffe7
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tigervnc.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Nov 25 16:28:09 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>
- u_tigervnc_update_default_vncxstartup.patch
* check first for /usr/libexec/xinit/xinitrc, then
/etc/X11/xinit/xinitrc (reported by aschnell @SUSE)
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Nov 19 13:43:27 UTC 2020 - Stefan Dirsch <sndirsch@suse.com> Thu Nov 19 13:43:27 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>

12
u_tigervnc_update_default_vncxstartup.patch
View File

@ -2,11 +2,11 @@ Author: Michal Srb <msrb@suse.com>
References: bnc#956537 References: bnc#956537
Subject: Update default vnc xstartup script. Subject: Update default vnc xstartup script.
Index: b/unix/vncserver Index: tigervnc-1.10.1/unix/vncserver
=================================================================== ===================================================================
--- a/unix/vncserver --- tigervnc-1.10.1.orig/unix/vncserver
+++ b/unix/vncserver +++ tigervnc-1.10.1/unix/vncserver
@@ -58,27 +58,31 @@ $defaultXStartup @@ -58,27 +58,33 @@ $defaultXStartup
= ("#!/bin/sh\n\n". = ("#!/bin/sh\n\n".
"unset SESSION_MANAGER\n". "unset SESSION_MANAGER\n".
"unset DBUS_SESSION_BUS_ADDRESS\n". "unset DBUS_SESSION_BUS_ADDRESS\n".
@ -22,12 +22,14 @@ Index: b/unix/vncserver
- " esac\n". - " esac\n".
+ "\n". + "\n".
+ "userclientrc=\$HOME/.xinitrc\n". + "userclientrc=\$HOME/.xinitrc\n".
+ "sysclientrc=/etc/X11/xinit/xinitrc\n". + "sysclientrc=/usr/libexec/xinit/xinitrc\n".
+ "\n". + "\n".
+ "if [ -f \"\$userclientrc\" ]; then\n". + "if [ -f \"\$userclientrc\" ]; then\n".
+ " client=\"\$userclientrc\"\n". + " client=\"\$userclientrc\"\n".
+ "elif [ -f \"\$sysclientrc\" ]; then\n". + "elif [ -f \"\$sysclientrc\" ]; then\n".
+ " client=\"\$sysclientrc\"\n". + " client=\"\$sysclientrc\"\n".
+ "elif [ -f \"/etc/X11/xinit/xinitrc\" ]; then\n".
+ " client=\"/etc/X11/xinit/xinitrc\"\n".
"fi\n". "fi\n".
- "if [ -x /etc/X11/xinit/xinitrc ]; then\n". - "if [ -x /etc/X11/xinit/xinitrc ]; then\n".
- " exec /etc/X11/xinit/xinitrc\n". - " exec /etc/X11/xinit/xinitrc\n".