diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index b5fd542..6ec6bfa 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -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 @@ Patch2010: xserver-1.3.0-idletime.patch 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 @@ Xserver source code needed to build VNC server (Xvnc) %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 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Oct 03 2007 Adam Jackson 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 1.3.0.0-27 - BuildReq: mesa-source >= 7.0.1-5. diff --git a/xserver-1.3.0-accidental-abi.patch b/xserver-1.3.0-accidental-abi.patch new file mode 100644 index 0000000..74cdda1 --- /dev/null +++ b/xserver-1.3.0-accidental-abi.patch @@ -0,0 +1,24 @@ +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;