- bit more fixing for xserver 1.16

diff --git a/tigervnc-xserver-1.16.patch b/tigervnc-xserver-1.16.patch
index 9956147bd5f2ca9dc3827149c5b20b21a82ec5a6..349e693c4280d19d847bbd74c35cc5ca12d38d1e 100644 (file)
--- 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

diff --git a/tigervnc.spec b/tigervnc.spec
index 4d1463f2f8808290c75c5c0f33c06b99a7e12e04..b95877d9c369855bdac2b78952ee2bbfae9138ad 100644 (file)
--- 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