forked from pool/tigervnc
0b229476b8
- Updated to tigervnc 1.6.0. - Removed patches: * N_tigervnc_revert_fltk_1_3_3_requirements.patch * U_tigervnc-fix-reversed-logic-in-vncIsTCPPortUsed.patch * u_tigervnc-display-SHA-1-fingerprint-of-untrusted-certificate.patch * u_tigervnc-use-default-trust-manager-in-java-viewer-if-custom.patch * u_tigervnc-use_preferred_mode.patch * u_tigervnc-vncserver-clean-pid-files.patch - Updated patches: * n_tigervnc-date-time.patch * u_tigervnc-add-autoaccept-parameter.patch * u_tigervnc_update_default_vncxstartup.patch OBS-URL: https://build.opensuse.org/request/show/353245 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/tigervnc?expand=0&rev=80
56 lines
2.0 KiB
Diff
56 lines
2.0 KiB
Diff
Author: Michal Srb <msrb@suse.com>
|
|
References: bnc#956537
|
|
Subject: Update default vnc xstartup script.
|
|
|
|
Index: tigervnc-1.6.0/unix/vncserver
|
|
===================================================================
|
|
--- tigervnc-1.6.0.orig/unix/vncserver
|
|
+++ tigervnc-1.6.0/unix/vncserver
|
|
@@ -61,27 +61,31 @@ $defaultXStartup
|
|
= ("#!/bin/sh\n\n".
|
|
"unset SESSION_MANAGER\n".
|
|
"unset DBUS_SESSION_BUS_ADDRESS\n".
|
|
- "OS=`uname -s`\n".
|
|
- "if [ \$OS = 'Linux' ]; then\n".
|
|
- " case \"\$WINDOWMANAGER\" in\n".
|
|
- " \*gnome\*)\n".
|
|
- " if [ -e /etc/SuSE-release ]; then\n".
|
|
- " PATH=\$PATH:/opt/gnome/bin\n".
|
|
- " export PATH\n".
|
|
- " fi\n".
|
|
- " ;;\n".
|
|
- " esac\n".
|
|
+ "\n".
|
|
+ "userclientrc=\$HOME/.xinitrc\n".
|
|
+ "sysclientrc=/etc/X11/xinit/xinitrc\n".
|
|
+ "\n".
|
|
+ "if [ -f \"\$userclientrc\" ]; then\n".
|
|
+ " client=\"\$userclientrc\"\n".
|
|
+ "elif [ -f \"\$sysclientrc\" ]; then\n".
|
|
+ " client=\"\$sysclientrc\"\n".
|
|
"fi\n".
|
|
- "if [ -x /etc/X11/xinit/xinitrc ]; then\n".
|
|
- " exec /etc/X11/xinit/xinitrc\n".
|
|
+ "\n".
|
|
+ "if [ -x \"\$client\" ]; then\n".
|
|
+ " exec \"\$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".
|
|
"fi\n".
|
|
+ "\n".
|
|
"[ -r \$HOME/.Xresources ] && xrdb \$HOME/.Xresources\n".
|
|
"xsetroot -solid grey\n".
|
|
"xterm -geometry 80x24+10+10 -ls -title \"\$VNCDESKTOP Desktop\" &\n".
|
|
- "twm &\n");
|
|
+ "if [ -x /usr/bin/twm ]; then\n".
|
|
+ " /usr/bin/twm &\n".
|
|
+ "else\n".
|
|
+ " echo \"No window manager found. You should install a window manager to get properly working VNC session.\"\n".
|
|
+ "fi\n");
|
|
|
|
$defaultConfig
|
|
= ("## Supported server options to pass to vncserver upon invocation can be listed\n".
|