# HG changeset patch
# User Stuart Kreitman <Stuart.Kreitman@Oracle.COM>
# Date 1300308569 25200
# Node ID 5f9b839fcbf7b8bb09e794de5f47924afc5d80d0
# Parent  bd372a309a6a1bd9ece57869541af933d8249b0d
7023672 The vncserver is unable to start a typical gnome Solaris 11 desktop, defaults to xterm

diff -r bd372a309a6a -r 5f9b839fcbf7 open-src/app/xinit/7023672.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/app/xinit/7023672.patch	Wed Mar 16 13:49:29 2011 -0700
@@ -0,0 +1,22 @@
+--- xinitrc.cpp.orig	Wed Mar 16 10:11:59 2011
++++ xinitrc.cpp	Wed Mar 16 10:13:12 2011
+@@ -39,6 +39,19 @@
+     XMODMAP "$usermodmap"
+ fi
+ 
++XCOMM
++XCOMM  If OpenSolaris branded desktop is available, run it
++XCOMM
++if [ -x /etc/gdm/Xsession ] && [ -x /usr/bin/dtstart ] ; then
++  exec /etc/gdm/Xsession /usr/bin/dtstart jds
++fi
++if [ -x /etc/X11/gdm/Xsession ] && [ -x /usr/bin/dtstart ] ; then
++  exec /etc/X11/gdm/Xsession /usr/bin/dtstart jds
++fi
++if [ -x /usr/dt/config/Xsession.jds ]; then
++  exec /usr/dt/config/Xsession.jds
++fi
++
+ XCOMM start some nice programs
+ 
+ #if defined(__SCO__) || defined(__UNIXWARE__)
diff -r bd372a309a6a -r 5f9b839fcbf7 open-src/app/xinit/Makefile
--- a/open-src/app/xinit/Makefile	Tue Mar 15 16:38:15 2011 -0700
+++ b/open-src/app/xinit/Makefile	Wed Mar 16 13:49:29 2011 -0700
@@ -36,7 +36,7 @@
 TARBALL_SHA1 = 6437292214bbca6efad8889c68e72a1ca584928b
 
 # Patches to apply to source after unpacking, in order
-SOURCE_PATCHES = 6714067.patch
+SOURCE_PATCHES = 6714067.patch 7023672.patch
 
 # pkg(5) name we deliver the files in (override default)
 MODULE_PKGNAME=x11/session/$(MODULE_NAME)