--- a/open-src/xserver/xvnc/Makefile	Fri Jan 11 14:50:22 2013 -0800
+++ b/open-src/xserver/xvnc/Makefile	Wed Jan 16 10:58:18 2013 -0800
@@ -70,6 +70,7 @@
 SOURCE_PATCHES += no-nasm.patch,-p1
 SOURCE_PATCHES += applet-html.patch
 SOURCE_PATCHES += icon.patch,-p1
+SOURCE_PATCHES += jdk17.patch,-p1
 SOURCE_PATCHES += solaris-libraries.patch,-p1
 SOURCE_PATCHES += vnc-nobuildtime.patch,-p1
 SOURCE_PATCHES += vnc-nohttpd.patch,-p1
@@ -197,9 +198,6 @@
 	-I$(PWD)/$(SOURCE_DIR)/unix/vncconfig \
 	-I$(PWD)/$(SOURCE_DIR)/unix/xserver/miext/damage \
 
-# Workaround for Java failure with JDK 7 in S11U1b12 - continue using JDK 6 for now
-MODULE_BUILD_ENV = PATH="/usr/jdk/instances/jdk1.6.0/bin:$$PATH"
-
 CFLAGS_gcc += -fPIC
 
 # Needed by unix/xorg-x11-server-source/hw/vnc/Makefile.am to find libpixman

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/xserver/xvnc/jdk17.patch	Wed Jan 16 10:58:18 2013 -0800
@@ -0,0 +1,11 @@
+--- a/java/src/com/tigervnc/vncviewer/Makefile	Tue Jan 15 10:12:51 2013
++++ b/java/src/com/tigervnc/vncviewer/Makefile	Tue Jan 15 10:13:05 2013
+@@ -4,7 +4,7 @@
+ 
+ CP = cp
+ JC = javac
+-JCFLAGS = -target 1.5 -classpath ../../../
++JCFLAGS = -target 1.7 -classpath ../../../
+ JAR = jar
+ ARCHIVE = VncViewer.jar
+ MANIFEST = MANIFEST.MF

--- a/open-src/xserver/xvnc/sun-src/java/src/com/tigervnc/decoder/Makefile	Fri Jan 11 14:50:22 2013 -0800
+++ b/open-src/xserver/xvnc/sun-src/java/src/com/tigervnc/decoder/Makefile	Wed Jan 16 10:58:18 2013 -0800
@@ -1,6 +1,6 @@
 
 JC = javac
-JCFLAGS = -target 1.5 -classpath ../../../
+JCFLAGS = -target 1.7 -classpath ../../../
 
 SOURCES = \
 	common/Repaintable.java \