rpms/xorg-x11-server/F-12 xserver-1.7.1-multilib.patch, NONE, 1.1 xorg-x11-server.spec, 1.497, 1.498

[Adam Jackson]

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-server/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22783

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xserver-1.7.1-multilib.patch 
Log Message:
* Thu Oct 29 2009 Adam Jackson <ajax at redhat.com> 1.7.1-2
- xserver-1.7.1-multilib.patch: Fix silly multilib issue. (#470885)


xserver-1.7.1-multilib.patch:
 colormapst.h     |    6 ++++--
 xorg-server.h.in |    4 ----
 2 files changed, 4 insertions(+), 6 deletions(-)

--- NEW FILE xserver-1.7.1-multilib.patch ---
>From 566ed8932ab153e8918b4496a0ac1765beb4e7e9 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax at redhat.com>
Date: Thu, 29 Oct 2009 19:04:10 -0400
Subject: [PATCH] multilib fix for -devel subpackage

---
 include/colormapst.h     |    6 ++++--
 include/xorg-server.h.in |    3 ---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/include/colormapst.h b/include/colormapst.h
index f1fc8eb..c4a1710 100644
--- a/include/colormapst.h
+++ b/include/colormapst.h
@@ -99,16 +99,18 @@ typedef struct _CMEntry
  * The padN variables are unfortunate ABI BC. See fdo bug #6924.
  */
 
+#define LP64 (__SIZEOF_LONG__ == 8)
+
 typedef struct _ColormapRec
 {
     VisualPtr	pVisual;
     short	class;		/* PseudoColor or DirectColor */
-#if defined(_XSERVER64)
+#if LP64
     short	pad0;
     XID		pad1;
 #endif
     XID		mid;		/* client's name for colormap */
-#if defined(_XSERVER64) && (X_BYTE_ORDER == X_LITTLE_ENDIAN)
+#if LP64 && (X_BYTE_ORDER == X_LITTLE_ENDIAN)
     XID		pad2;
 #endif
     ScreenPtr	pScreen;	/* screen map is associated with */
diff --git a/include/xorg-server.h.in b/include/xorg-server.h.in
index 76cab16..3e79529 100644
--- a/include/xorg-server.h.in
+++ b/include/xorg-server.h.in
@@ -157,9 +157,6 @@
 /* Name of X server */
 #undef __XSERVERNAME__
 
-/* Define to 1 if unsigned long is 64 bits. */
-#undef _XSERVER64
-
 /* Building vgahw module */
 #undef WITH_VGAHW
 
-- 
1.6.4.4



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-12/xorg-x11-server.spec,v
retrieving revision 1.497
retrieving revision 1.498
diff -u -p -r1.497 -r1.498
--- xorg-x11-server.spec	26 Oct 2009 15:46:03 -0000	1.497
+++ xorg-x11-server.spec	29 Oct 2009 23:09:47 -0000	1.498
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.7.1
-Release:   1%{dist}
+Release:   2%{dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -76,6 +76,7 @@ Patch6045: xserver-1.7.0-randr-gamma-res
 
 Patch6047: xserver-1.7.0-glx-versioning.patch
 Patch6048: xserver-1.7.0-exa-fix-mixed.patch
+Patch6049: xserver-1.7.1-multilib.patch
 
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
@@ -504,6 +505,9 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
+* Thu Oct 29 2009 Adam Jackson <ajax at redhat.com> 1.7.1-2
+- xserver-1.7.1-multilib.patch: Fix silly multilib issue. (#470885)
+
 * Mon Oct 26 2009 Adam Jackson <ajax at redhat.com> 1.7.1-1
 - xserver 1.7.1