From e99cca3964f9fa66f12c29f789a8032a03cc9486d54101658bf4610691254113 Mon Sep 17 00:00:00 2001
From: Michal Srb <michalsrb@please-enter-an-email-address>
Date: Thu, 12 Nov 2015 13:12:59 +0000
Subject: [PATCH] Accepting request 344033 from
 home:michalsrb:branches:X11:XOrg

- n_xserver118.patch
  * Build with xserver 1.18.0, everything relevant for VNC is the
    same as in 1.17.0.

OBS-URL: https://build.opensuse.org/request/show/344033
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/tigervnc?expand=0&rev=74
---
 n_xserver118.patch | 16 ++++++++++++++++
 tigervnc.changes   |  7 +++++++
 tigervnc.spec      |  2 ++
 3 files changed, 25 insertions(+)
 create mode 100644 n_xserver118.patch

diff --git a/n_xserver118.patch b/n_xserver118.patch
new file mode 100644
index 0000000..dfa5488
--- /dev/null
+++ b/n_xserver118.patch
@@ -0,0 +1,16 @@
+diff --git a/unix/xserver/hw/vnc/xorg-version.h b/unix/xserver/hw/vnc/xorg-version.h
+index 8cc1c86..60610cb 100644
+--- a/unix/xserver/hw/vnc/xorg-version.h
++++ b/unix/xserver/hw/vnc/xorg-version.h
+@@ -48,8 +48,10 @@
+ #define XORG 116
+ #elif XORG_VERSION_CURRENT < ((1 * 10000000) + (17 * 100000) + (99 * 1000))
+ #define XORG 117
++#elif XORG_VERSION_CURRENT < ((1 * 10000000) + (18 * 100000) + (99 * 1000))
++#define XORG 118
+ #else
+-#error "X.Org newer than 1.17 is not supported"
++#error "X.Org newer than 1.18 is not supported"
+ #endif
+ 
+ #endif
diff --git a/tigervnc.changes b/tigervnc.changes
index c1f523b..94a80cb 100644
--- a/tigervnc.changes
+++ b/tigervnc.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Nov 12 12:51:31 UTC 2015 - msrb@suse.com
+
+- n_xserver118.patch
+  * Build with xserver 1.18.0, everything relevant for VNC is the
+    same as in 1.17.0.
+
 -------------------------------------------------------------------
 Thu Oct  1 23:16:52 UTC 2015 - msrb@suse.com
 
diff --git a/tigervnc.spec b/tigervnc.spec
index b9579d1..b95c722 100644
--- a/tigervnc.spec
+++ b/tigervnc.spec
@@ -120,6 +120,7 @@ Patch10:        u_tigervnc-add-autoaccept-parameter.patch
 Patch11:        N_tigervnc_revert_fltk_1_3_3_requirements.patch
 Patch12:        U_tigervnc-fix-reversed-logic-in-vncIsTCPPortUsed.patch
 Patch13:        u_tigervnc-vncserver-clean-pid-files.patch
+Patch14:        n_xserver118.patch
 
 %description
 TigerVNC is a high-performance, platform-neutral implementation of VNC (Virtual Network Computing), 
@@ -163,6 +164,7 @@ cp -r /usr/src/xserver/* unix/xserver/
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
+%patch14 -p1
 
 pushd unix/xserver
 patch -p1 < ../xserver117.patch