[xorg-x11-server] Restore XkbCopyDeviceKeymap for (older) tigervnc

[Adam Jackson]

commit 178065c4b82a568f55170ea4023375691069b619
Author: Adam Jackson <ajax at redhat.com>
Date:   Fri Nov 8 09:53:28 2013 -0500

    Restore XkbCopyDeviceKeymap for (older) tigervnc

 0001-mustard-Restore-XkbCopyDeviceKeymap.patch |   47 ++++++++++++++++++++++++
 xorg-x11-server.spec                           |    7 +++-
 2 files changed, 53 insertions(+), 1 deletions(-)
---
diff --git a/0001-mustard-Restore-XkbCopyDeviceKeymap.patch b/0001-mustard-Restore-XkbCopyDeviceKeymap.patch
new file mode 100644
index 0000000..c51a9b3
--- /dev/null
+++ b/0001-mustard-Restore-XkbCopyDeviceKeymap.patch
@@ -0,0 +1,47 @@
+From abdbfba12e439d6c27156b1f4a773d68337e30c0 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax at redhat.com>
+Date: Fri, 8 Nov 2013 09:44:24 -0500
+Subject: [PATCH] mustard: Restore XkbCopyDeviceKeymap
+
+xwayland series takes this out, tigervnc 1.2.80 needs it
+
+Signed-off-by: Adam Jackson <ajax at redhat.com>
+---
+ include/xkbsrv.h | 3 +++
+ xkb/xkbUtils.c   | 6 ++++++
+ 2 files changed, 9 insertions(+)
+
+diff --git a/include/xkbsrv.h b/include/xkbsrv.h
+index 6a2e96e..d5a4eb6 100644
+--- a/include/xkbsrv.h
++++ b/include/xkbsrv.h
+@@ -812,6 +812,9 @@ extern _X_EXPORT void XkbSendNewKeyboardNotify(DeviceIntPtr /* kbd */ ,
+ extern Bool XkbCopyKeymap(XkbDescPtr /* dst */ ,
+                           XkbDescPtr /* src */ );
+ 
++extern _X_EXPORT Bool XkbCopyDeviceKeymap(DeviceIntPtr /* dst */,
++					  DeviceIntPtr /* src */);
++
+ extern _X_EXPORT Bool XkbDeviceApplyKeymap(DeviceIntPtr /* dst */ ,
+                                            XkbDescPtr /* src */ );
+ 
+diff --git a/xkb/xkbUtils.c b/xkb/xkbUtils.c
+index 6cf6e79..c14a790 100644
+--- a/xkb/xkbUtils.c
++++ b/xkb/xkbUtils.c
+@@ -2027,6 +2027,12 @@ XkbDeviceApplyKeymap(DeviceIntPtr dst, XkbDescPtr desc)
+     return ret;
+ }
+ 
++Bool
++XkbCopyDeviceKeymap(DeviceIntPtr dst, DeviceIntPtr src)
++{
++    return XkbDeviceApplyKeymap(dst, src->key->xkbInfo->desc);
++}
++
+ int
+ XkbGetEffectiveGroup(XkbSrvInfoPtr xkbi, XkbStatePtr xkbState, CARD8 keycode)
+ {
+-- 
+1.8.3.1
+
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 8a1f3f1..96a00fb 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -42,7 +42,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.14.99.901
-Release:   4%{?gitdate:.%{gitdate}}%{dist}
+Release:   5%{?gitdate:.%{gitdate}}%{dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -122,6 +122,8 @@ Patch0136: 0036-xwayland-Fix-hidden-cursor.patch
 Patch0137: 0037-xkb-Repurpose-XkbCopyDeviceKeymap-to-apply-a-given-k.patch
 Patch0138: 0038-xkb-Factor-out-a-function-to-copy-a-keymap-s-control.patch
 Patch0139: 0039-xwayland-Handle-keymap-changes.patch
+# restore ABI
+Patch0200: 0001-mustard-Restore-XkbCopyDeviceKeymap.patch
 
 # Trivial things to never merge upstream ever:
 # This really could be done prettier.
@@ -662,6 +664,9 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
+* Fri Nov 08 2013 Adam Jackson <ajax at redhat.com> 1.14.99.901-5
+- Restore XkbCopyDeviceKeymap for (older) tigervnc
+
 * Fri Nov 08 2013 Adam Jackson <ajax at redhat.com> 1.14.99.901-4
 - Explicitly enable DRI2