rpms/xorg-x11-server/devel xserver-1.3.0-accidental-abi.patch, NONE, 1.1 xorg-x11-server.spec, 1.253, 1.254

[Adam Jackson (ajax)]

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5826

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xserver-1.3.0-accidental-abi.patch 
Log Message:
* Wed Oct 03 2007 Adam Jackson <ajax at redhat.com> 1.3.0.0-28
- xserver-1.3.0-accidental-abi.patch: Make sure some symbols from parser/
  get exported, since apparently the intel driver uses them despite their
  not being in the documented ABI list.  Thanks guys.


xserver-1.3.0-accidental-abi.patch:

--- NEW FILE xserver-1.3.0-accidental-abi.patch ---
diff -up xorg-server-1.3.0.0/hw/xfree86/parser/Flags.c.jx xorg-server-1.3.0.0/hw/xfree86/parser/Flags.c
--- xorg-server-1.3.0.0/hw/xfree86/parser/Flags.c.jx	2006-09-18 02:04:18.000000000 -0400
+++ xorg-server-1.3.0.0/hw/xfree86/parser/Flags.c	2007-10-03 11:08:01.000000000 -0400
@@ -330,7 +330,7 @@ xf86findOption (XF86OptionPtr list, cons
  * returned.  If the option is not found, a NULL is returned.
  */
 
-char *
+_X_EXPORT char *
 xf86findOptionValue (XF86OptionPtr list, const char *name)
 {
 	XF86OptionPtr p = xf86findOption (list, name);
diff -up xorg-server-1.3.0.0/hw/xfree86/parser/scan.c.jx xorg-server-1.3.0.0/hw/xfree86/parser/scan.c
--- xorg-server-1.3.0.0/hw/xfree86/parser/scan.c.jx	2006-10-04 17:46:03.000000000 -0400
+++ xorg-server-1.3.0.0/hw/xfree86/parser/scan.c	2007-10-03 10:57:43.000000000 -0400
@@ -985,7 +985,7 @@ StringToToken (char *str, xf86ConfigSymT
  * Compare two names.  The characters '_', ' ', and '\t' are ignored
  * in the comparison.
  */
-int
+_X_EXPORT int
 xf86nameCompare (const char *s1, const char *s2)
 {
 	char c1, c2;


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.253
retrieving revision 1.254
diff -u -r1.253 -r1.254
--- xorg-x11-server.spec	1 Oct 2007 20:40:23 -0000	1.253
+++ xorg-x11-server.spec	3 Oct 2007 15:30:59 -0000	1.254
@@ -9,7 +9,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.3.0.0
-Release:   27%{?dist}
+Release:   28%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -71,6 +71,7 @@
 Patch2012:  xserver-1.3.0-add-really-slow-bcopy.patch
 Patch2013:  xserver-1.3.0-document-fontpath-correctly.patch
 Patch2014:  xserver-1.3.0-intel-by-default.patch
+Patch2015:  xserver-1.3.0-accidental-abi.patch
 
 # assorted PCI layer shenanigans.  oh the pain.
 Patch2500:  xorg-x11-server-1.2.99-unbreak-domain.patch
@@ -331,6 +332,7 @@
 %patch2012 -p1 -b .slow-bcopy
 %patch2013 -p1 -b .fontpath-doc
 %patch2014 -p1 -b .intel
+%patch2015 -p1 -b .accidental-abi
 
 %patch2500 -p1 -b .unbreak-domains
 %patch2501 -p1 -b .pci-bus-count
@@ -606,6 +608,11 @@
 
 
 %changelog
+* Wed Oct 03 2007 Adam Jackson <ajax at redhat.com> 1.3.0.0-28
+- xserver-1.3.0-accidental-abi.patch: Make sure some symbols from parser/
+  get exported, since apparently the intel driver uses them despite their
+  not being in the documented ABI list.  Thanks guys.
+
 * Mon Oct 01 2007 Adam Jackson <ajax at redhat.com> 1.3.0.0-27
 - BuildReq: mesa-source >= 7.0.1-5.