From 44058e99786214fdfafdb7cc4b797ef107a818f1 Mon Sep 17 00:00:00 2001
From: Adam Tkac <atkac@fedoraproject.org>
Date: Apr 14 2010 11:28:39 +0000
Subject: * Wed Apr 14 2010 Adam Tkac <atkac redhat com> 1.7.6-3

- xserver-1.7.6-export-more-dix-functions.patch: export XkbCopyDeviceKeymap
  function, needed by VNC

---

diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 0beac91..55120ae 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.7.6
-Release:   2%{dist}
+Release:   3%{dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -94,6 +94,7 @@ Patch6076: xserver-1.7.4-dpms-timeouts.patch
 Patch6078: xserver-1.7.4-owner-events.patch
 # VNC needs some functions exported to link.
 Patch6079: xserver-1.7.6-export-dix-functions.patch
+Patch6080: xserver-1.7.6-export-more-dix-functions.patch
 
 
 Patch7000: xserver-1.7.5-exa-mixed.patch
@@ -528,6 +529,10 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
+* Wed Apr 14 2010 Adam Tkac <atkac redhat com> 1.7.6-3
+- xserver-1.7.6-export-more-dix-functions.patch: export XkbCopyDeviceKeymap
+  function, needed by VNC
+
 * Mon Apr 12 2010 Peter Hutterer <peter.hutterer@redhat.com> 1.7.6-2
 - xserver-1.7.6-export-dix-functions: export some more functions for use by
   VNC.
diff --git a/xserver-1.7.6-export-more-dix-functions.patch b/xserver-1.7.6-export-more-dix-functions.patch
new file mode 100644
index 0000000..9592a95
--- /dev/null
+++ b/xserver-1.7.6-export-more-dix-functions.patch
@@ -0,0 +1,26 @@
+From 6db7cc3d3f750bbb1c170f8fe538e9fb75bc5b34 Mon Sep 17 00:00:00 2001
+From: Adam Tkac <atkac@redhat.com>
+Date: Wed, 14 Apr 2010 12:16:26 +0200
+Subject: [PATCH] Export XkbCopyDeviceKeymap from Xorg, it is needed by VNC.
+
+Signed-off-by: Adam Tkac <atkac@redhat.com>
+---
+ include/xkbsrv.h |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/include/xkbsrv.h b/include/xkbsrv.h
+index ebc7cdb..dc3142a 100644
+--- a/include/xkbsrv.h
++++ b/include/xkbsrv.h
+@@ -936,7 +936,7 @@ extern Bool XkbCopyKeymap(
+         XkbDescPtr              /* dst */,
+         XkbDescPtr              /* src */);
+ 
+-extern Bool XkbCopyDeviceKeymap(
++extern _X_EXPORT Bool XkbCopyDeviceKeymap(
+         DeviceIntPtr            /* dst */,
+         DeviceIntPtr            /* src */);
+ 
+-- 
+1.7.0.1
+