From 8dd1ebcac35490d8564ada9bcf000bee4ff712d9 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Thu, 7 Nov 2013 12:40:24 -0500
Subject: [PATCH] Rebuild against xserver 1.15RC1

---
 tigervnc-1.3.0-xserver-1.15.patch | 26 ++++++++++++++++++++++++++
 tigervnc.spec                     | 12 +++++++++++-
 2 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 tigervnc-1.3.0-xserver-1.15.patch

diff --git a/tigervnc-1.3.0-xserver-1.15.patch b/tigervnc-1.3.0-xserver-1.15.patch
new file mode 100644
index 0000000..627cd33
--- /dev/null
+++ b/tigervnc-1.3.0-xserver-1.15.patch
@@ -0,0 +1,26 @@
+diff -up tigervnc-1.3.0/unix/xserver/configure.ac.jx tigervnc-1.3.0/unix/xserver/configure.ac
+--- tigervnc-1.3.0/unix/xserver/configure.ac.jx	2013-11-07 11:39:49.000000000 -0500
++++ tigervnc-1.3.0/unix/xserver/configure.ac	2013-11-07 11:40:17.215043570 -0500
+@@ -1028,7 +1028,6 @@ fi
+ if test "x$WAYLAND" = xyes; then
+         PKG_CHECK_MODULES(XWAYLAND, $WAYLAND_MODULES)
+ 	AC_DEFINE(XORG_WAYLAND, 1, [Support wayland mode])
+-	WAYLAND_SCANNER_RULES(['$(top_srcdir)/hw/xfree86/xwayland'])
+ fi
+ AM_CONDITIONAL(WAYLAND, [test "x$WAYLAND" = xyes])
+ 
+diff -up tigervnc-1.3.0/unix/xserver/hw/vnc/xorg-version.h.jx tigervnc-1.3.0/unix/xserver/hw/vnc/xorg-version.h
+--- tigervnc-1.3.0/unix/xserver/hw/vnc/xorg-version.h.jx	2013-07-01 08:41:24.000000000 -0400
++++ tigervnc-1.3.0/unix/xserver/hw/vnc/xorg-version.h	2013-11-07 11:39:49.749992669 -0500
+@@ -44,8 +44,10 @@
+ #define XORG 113
+ #elif XORG_VERSION_CURRENT < ((1 * 10000000) + (14 * 100000) + (99 * 1000))
+ #define XORG 114
++#elif XORG_VERSION_CURRENT < ((1 * 10000000) + (15 * 100000) + (99 * 1000))
++#define XORG 115
+ #else
+-#error "X.Org newer than 1.14 is not supported"
++#error "X.Org newer than 1.15 is not supported"
+ #endif
+ 
+ #endif
diff --git a/tigervnc.spec b/tigervnc.spec
index 905dc36..91dc677 100644
--- a/tigervnc.spec
+++ b/tigervnc.spec
@@ -1,6 +1,6 @@
 Name:		tigervnc
 Version:	1.3.0
-Release:	7%{?dist}
+Release:	8%{?dist}
 Summary:	A TigerVNC remote display system
 
 Group:		User Interface/Desktops
@@ -46,6 +46,7 @@ Patch6:		tigervnc-setcursor-crash.patch
 Patch7:		tigervnc-manpages.patch
 Patch8:		tigervnc-getmaster.patch
 Patch9:		tigervnc-shebang.patch
+Patch10:	tigervnc-1.3.0-xserver-1.15.patch
 
 %description
 Virtual Network Computing (VNC) is a remote display system which
@@ -168,6 +169,8 @@ popd
 # Don't use shebang in vncserver script.
 %patch9 -p1 -b .shebang
 
+%patch10 -p1 -b .115
+
 %build
 %ifarch sparcv9 sparc64 s390 s390x
 export CFLAGS="$RPM_OPT_FLAGS -fPIC"
@@ -179,6 +182,7 @@ export CXXFLAGS="$CFLAGS"
 %{cmake} .
 make %{?_smp_mflags}
 
+# XXX revisit --disable-present
 pushd unix/xserver
 autoreconf -fiv
 %configure \
@@ -190,6 +194,9 @@ autoreconf -fiv
 	--with-xkb-output=%{_localstatedir}/lib/xkb \
 	--enable-install-libxf86config \
 	--enable-glx --disable-dri --enable-dri2 \
+	--disable-wayland \
+	--disable-present \
+	--disable-unit-tests \
 	--disable-config-dbus \
 	--disable-config-hal \
 	--disable-config-udev \
@@ -336,6 +343,9 @@ fi
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Thu Nov 07 2013 Adam Jackson <ajax@redhat.com> 1.3.0-8
+- Rebuild against xserver 1.15RC1
+
 * Tue Sep 24 2013 Tim Waugh <twaugh@redhat.com> 1.3.0-7
 - Removed incorrect patch (for unexpected key_is_down). Fixes stuck
   keys bug (bug #989502).