From c24ee1db42e857cf99a12f7fbea3f33bc2d3b74a4ec5c2fbfaa1d6d17fad5eda Mon Sep 17 00:00:00 2001
From: Michal Srb <michalsrb@please-enter-an-email-address>
Date: Thu, 12 Nov 2015 15:30:34 +0000
Subject: [PATCH] - Fix support for xserver 1.18.0

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/tigervnc?expand=0&rev=75
---
 tigervnc.changes                         |  2 +-
 tigervnc.spec                            |  2 +-
 n_xserver118.patch => u_xserver118.patch | 19 +++++++++++++++++++
 3 files changed, 21 insertions(+), 2 deletions(-)
 rename n_xserver118.patch => u_xserver118.patch (51%)

diff --git a/tigervnc.changes b/tigervnc.changes
index 94a80cb..98ac414 100644
--- a/tigervnc.changes
+++ b/tigervnc.changes
@@ -1,7 +1,7 @@
 -------------------------------------------------------------------
 Thu Nov 12 12:51:31 UTC 2015 - msrb@suse.com
 
-- n_xserver118.patch
+- u_xserver118.patch
   * Build with xserver 1.18.0, everything relevant for VNC is the
     same as in 1.17.0.
 
diff --git a/tigervnc.spec b/tigervnc.spec
index b95c722..a328c75 100644
--- a/tigervnc.spec
+++ b/tigervnc.spec
@@ -120,7 +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
+Patch14:        u_xserver118.patch
 
 %description
 TigerVNC is a high-performance, platform-neutral implementation of VNC (Virtual Network Computing), 
diff --git a/n_xserver118.patch b/u_xserver118.patch
similarity index 51%
rename from n_xserver118.patch
rename to u_xserver118.patch
index dfa5488..72c32ec 100644
--- a/n_xserver118.patch
+++ b/u_xserver118.patch
@@ -1,3 +1,7 @@
+Subject: Support X server 1.18.0
+Author: Michal Srb <msrb@suse.com>
+Patch-Mainline: To be upstreamed
+
 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
@@ -14,3 +18,18 @@ index 8cc1c86..60610cb 100644
  #endif
  
  #endif
+index 4c90a95..55befa7 100644
+--- a/unix/xserver/hw/vnc/Input.c
++++ b/unix/xserver/hw/vnc/Input.c
+@@ -300,8 +300,10 @@ static inline void pressKey(DeviceIntPtr dev, int kc, Bool down, const char *msg
+ #if XORG < 111
+ 	n = GetKeyboardEvents(eventq, dev, action, kc);
+ 	enqueueEvents(dev, n);
+-#else
++#elif XORG < 118
+ 	QueueKeyboardEvents(dev, action, kc, NULL);
++#else
++	QueueKeyboardEvents(dev, action, kc);
+ #endif
+ }
+