[packages/tigervnc] - bit more fixing for xserver 1.16

[baggins]

commit 33b6d1f13b4d69fbb78cbf1933b23fa28e631904
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sun Aug 3 13:04:17 2014 +0200

    - bit more fixing for xserver 1.16

 tigervnc-xserver-1.16.patch | 15 +++++++++++++++
 tigervnc.spec               |  4 +---
 2 files changed, 16 insertions(+), 3 deletions(-)
---
diff --git a/tigervnc.spec b/tigervnc.spec
index 4d1463f..b95877d 100644
--- a/tigervnc.spec
+++ b/tigervnc.spec
@@ -199,15 +199,13 @@ pozwalający na zdalny dostęp do pulpitu.
 %patch9 -p1
 %patch11 -p1
 %patch12 -p1
+%patch13 -p1
 %patch14 -p1
 %patch15 -p1
 %patch16 -p1
 %patch17 -p1
 
 cp -a %{_usrsrc}/xorg-xserver-server-%{_xserverver}/* unix/xserver
-
-%patch13 -p1
-
 cd unix/xserver
 %patch10 -p1
 
diff --git a/tigervnc-xserver-1.16.patch b/tigervnc-xserver-1.16.patch
index 9956147..349e693 100644
--- a/tigervnc-xserver-1.16.patch
+++ b/tigervnc-xserver-1.16.patch
@@ -1,3 +1,18 @@
+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 114
+ #elif XORG_VERSION_CURRENT < ((1 * 10000000) + (15 * 100000) + (99 * 1000))
+ #define XORG 115
++#elif XORG_VERSION_CURRENT < ((1 * 10000000) + (16 * 100000) + (99 * 1000))
++#define XORG 116
+ #else
+-#error "X.Org newer than 1.15 is not supported"
++#error "X.Org newer than 1.16 is not supported"
+ #endif
+ 
+ #endif
 diff -up tigervnc-1.3.1/unix/xserver/hw/vnc/Input.cc.116 tigervnc-1.3.1/unix/xserver/hw/vnc/Input.cc
 --- tigervnc-1.3.1/unix/xserver/hw/vnc/Input.cc.116	2013-05-30 16:53:40.000000000 +0200
 +++ tigervnc-1.3.1/unix/xserver/hw/vnc/Input.cc	2014-04-28 16:55:02.591440218 +0200
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/tigervnc.git/commitdiff/33b6d1f13b4d69fbb78cbf1933b23fa28e631904