[xorg-x11-server/f18] Fix differing sizeof XGCValues in xdmxconfig (#903986)

[Peter Hutterer]

commit 1bea67f97d361a179e1a8aca635d484223c41b0d
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Sat Jan 26 14:23:17 2013 +1000

    Fix differing sizeof XGCValues in xdmxconfig (#903986)

 ...nclude-dmx-config.h-from-xdmxconfig-37502.patch |   37 ++++++++++++++++++++
 xorg-x11-server.spec                               |    8 ++++-
 2 files changed, 44 insertions(+), 1 deletions(-)
---
diff --git a/0001-dmx-don-t-include-dmx-config.h-from-xdmxconfig-37502.patch b/0001-dmx-don-t-include-dmx-config.h-from-xdmxconfig-37502.patch
new file mode 100644
index 0000000..f11ddef
--- /dev/null
+++ b/0001-dmx-don-t-include-dmx-config.h-from-xdmxconfig-37502.patch
@@ -0,0 +1,37 @@
+From 8b74d4165c62c9b5b5c84ef92485a8ff8ae600e8 Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer at who-t.net>
+Date: Sat, 26 Jan 2013 14:13:33 +1000
+Subject: [PATCH] dmx: don't include dmx-config.h from xdmxconfig (#37502)
+
+dmx-config.h is a server header which includes dix-config.h. That again
+defines a bunch of server-specifics, including setting the size of XID to
+32 bit.
+
+libX11 uses unsigned long (8 bits on x86_64). XGCValues thus ends up being
+16 bytes smaller in xdmxconfig than in the library, causing garbage to be
+sent to the server.
+
+X.Org Bug 37502 <http://bugs.freedesktop.org/show_bug.cgi?id=37502>
+
+Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
+---
+ hw/dmx/config/xdmxconfig.c | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/hw/dmx/config/xdmxconfig.c b/hw/dmx/config/xdmxconfig.c
+index f308412..2121dd7 100644
+--- a/hw/dmx/config/xdmxconfig.c
++++ b/hw/dmx/config/xdmxconfig.c
+@@ -31,9 +31,6 @@
+  *
+  */
+ 
+-#ifdef HAVE_DMX_CONFIG_H
+-#include <dmx-config.h>
+-#endif
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
+-- 
+1.8.1
+
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 5674a73..116b744 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -43,7 +43,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.13.2
-Release:   1%{?gitdate:.%{gitdate}}%{dist}
+Release:   2%{?gitdate:.%{gitdate}}%{dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -128,6 +128,9 @@ Patch8003: 0001-randr-cleanup-provider-properly.patch
 
 Patch8010: 0001-autoconfig-fixup-tell-changed-so-randr-clients-can-t.patch
 
+# Bug 903986 - xdmxconfig will not run
+Patch8011: 0001-dmx-don-t-include-dmx-config.h-from-xdmxconfig-37502.patch
+
 %global moduledir	%{_libdir}/xorg/modules
 %global drimoduledir	%{_libdir}/dri
 %global sdkdir		%{_includedir}/xorg
@@ -600,6 +603,9 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
+* Sat Jan 26 2013 Peter Hutterer <peter.hutterer at redhat.com> 1.13.2-2
+- Fix differing sizeof XGCValues in xdmxconfig (#903986)
+
 * Sat Jan 26 2013 Peter Hutterer <peter.hutterer at redhat.com> 1.13.2-1
 - server 1.13.2