--- a/open-src/xserver/xvnc/Makefile Wed May 29 11:06:00 2013 -0700
+++ b/open-src/xserver/xvnc/Makefile Thu Jun 06 10:49:39 2013 -0700
@@ -63,9 +63,10 @@
SOURCE_URL_SET=yes
# Patches to apply to source after unpacking, in order
-SOURCE_PATCHES += $(SOURCE_DIR)/unix/xserver110.patch,'-p0 -d unix'
+SOURCE_PATCHES += $(SOURCE_DIR)/unix/xserver114.patch,'-p0 -d unix'
SOURCE_PATCHES += tigervnc11-xorg111.patch,-p1
SOURCE_PATCHES += tigervnc11-xorg112.patch,'-p0 -d unix'
+SOURCE_PATCHES += tigervnc11-xorg114.patch,'-p0 -d unix'
SOURCE_PATCHES += xorg-1.12.1.patch,-p1
SOURCE_PATCHES += no-nasm.patch,-p1
SOURCE_PATCHES += applet-html.patch
@@ -173,6 +174,7 @@
SOURCE_PATCHES="$(XORG_SOURCE_PATCHES:%=../xorg/%)" \
SOURCE_DIR="$(XORG_BUILD_DIR)" \
XORG_BUILD_DIR="$(XORG_BUILD_DIR)"
+ (cd $(SOURCE_DIR) && $(LNDIR) ../../sun-src)
touch $(XORG_PATCHED_TARGET)
# Command line options to GNU autoconf configure script for Xvnc
@@ -194,7 +196,8 @@
-D_XOPEN_SOURCE=500 -D__EXTENSIONS__ \
-D__extension__=\"\" \
-I$(PWD)/$(SOURCE_DIR)/common \
- -I$(PWD)/$(SOURCE_DIR)/unix/vncconfig
+ -I$(PWD)/$(SOURCE_DIR)/unix/vncconfig \
+ -I$(PWD)/$(SOURCE_DIR)/unix/xserver/miext/damage \
CFLAGS_gcc += -fPIC