]> TLD Linux GIT Repositories - packages/tigervnc.git/blob - tigervnc-xstartup.patch
- updated to 1.10.1, updated patches from Fedora
[packages/tigervnc.git] / tigervnc-xstartup.patch
1 diff -urpa tigervnc-1.8.0.orig/unix/vncserver tigervnc-1.8.0/unix/vncserver
2 --- tigervnc-1.8.0.orig/unix/vncserver  2017-05-16 13:53:28.000000000 +0000
3 +++ tigervnc-1.8.0/unix/vncserver       2018-03-14 13:35:05.810893666 +0000
4 @@ -61,27 +61,13 @@ $xauthorityFile = "$ENV{XAUTHORITY}" ||
5  $xstartupFile = $vncUserDir . "/xstartup";
6  $defaultXStartup
7      = ("#!/bin/sh\n\n".
8 -       "unset SESSION_MANAGER\n".
9 -       "unset DBUS_SESSION_BUS_ADDRESS\n".
10 -       "OS=`uname -s`\n".
11 -       "if [ \$OS = 'Linux' ]; then\n".
12 -       "  case \"\$WINDOWMANAGER\" in\n".
13 -       "    \*gnome\*)\n".
14 -       "      if [ -e /etc/SuSE-release ]; then\n".
15 -       "        PATH=\$PATH:/opt/gnome/bin\n".
16 -       "        export PATH\n".
17 -       "      fi\n".
18 -       "      ;;\n".
19 -       "  esac\n".
20 -       "fi\n".
21 -       "if [ -x /etc/X11/xinit/xinitrc ]; then\n".
22 -       "  exec /etc/X11/xinit/xinitrc\n".
23 -       "fi\n".
24 -       "if [ -f /etc/X11/xinit/xinitrc ]; then\n".
25 -       "  exec sh /etc/X11/xinit/xinitrc\n".
26 -       "fi\n".
27 -       "[ -r \$HOME/.Xresources ] && xrdb \$HOME/.Xresources\n".
28 +       "# Uncomment the following two lines for normal desktop:\n\n".
29 +       "# unset SESSION_MANAGER\n".
30 +       "# exec /etc/X11/xinit/xinitrc\n\n".
31 +       "[ -x /etc/vnc/xstartup ] && exec /etc/vnc/xstartup\n".
32 +       "[ -r $HOME/.Xresources ] && xrdb $HOME/.Xresources\n\n".
33         "xsetroot -solid grey\n".
34 +       "vncconfig -iconic &\n".
35         "xterm -geometry 80x24+10+10 -ls -title \"\$VNCDESKTOP Desktop\" &\n".
36         "twm &\n");
37