- makefile fix transformed to config fix.

Changed files:
    X11-gcc4.patch -> 1.2

diff --git a/X11-gcc4.patch b/X11-gcc4.patch
index cc82bbc4e98ee51c3af60b49ae52510c2138e0ee..a3d8676fbb23d4a9919f1df24e73ea2b69ac4fa4 100644 (file)
--- a/X11-gcc4.patch
+++ b/X11-gcc4.patch
@@ -1,23 +1,20 @@
---- X11-6.8.2/xc/programs/Xserver/fb/Makefile.orig     2005-02-15 02:52:03.000000000 +0100
-+++ X11-6.8.2/xc/programs/Xserver/fb/Makefile  2005-02-15 10:21:09.709904792 +0100
-@@ -291,7 +291,7 @@
-       PROJECTROOT = /usr/X11R6
- 
-       CDEBUGFLAGS = -O2 -fno-strength-reduce -fno-strict-aliasing
--        CCOPTIONS = -ansi -pedantic -Wall -Wpointer-arith -Wundef
-+        CCOPTIONS = -std=gnu9x -pedantic -Wall -Wpointer-arith -Wundef
- 
-       ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(INSTALLED_INCLUDES) $(STD_INCLUDES)
-        ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) $(EXTRA_DEFINES)
-@@ -1076,7 +1076,7 @@
- 
-          CC = gcc -m32
- 
--  CCOPTIONS = -ansi -pedantic -Wall -Wpointer-arith -Wundef
-+  CCOPTIONS = -std=gnu9x -pedantic -Wall -Wpointer-arith -Wundef
- 
- STD_DEFINES = -Dlinux -D__i386__ -D_POSIX_C_SOURCE=199309L                            -D_POSIX_SOURCE -D_XOPEN_SOURCE                                 -D_BSD_SOURCE -D_SVID_SOURCE                             -D_GNU_SOURCE                           -DSHAPE -DXINPUT -DXKB -DLBX -DXAPPGROUP       -DXCSECURITY -DTOGCUP   -DXF86BIGFONT -DDPMSExtension    -DPIXPRIV -DPANORAMIX   -DRENDER -DRANDR       -DXFIXES -DDAMAGE -DCOMPOSITE -DXEVIE    -DGCCUSESGAS -DAVOID_GLYPHBLT -DPIXPRIV -DSINGLEDEPTH                          -DXFreeXDGA -DXvExtension                               -DXFree86LOADER  -DXFree86Server                                -DXF86VIDMODE                           -DXvMCExtension                                 -DSMART_SCHEDULE                                -DBUILDDEBUG -DXResExtension                            -DX_BYTE_ORDER=$(X_BYTE_ORDER)                          -DXORG_VERSION_CURRENT="$(XORG_VERSION_CURRENT)" -DNDEBUG  $(SERVER_THREAD_DEFINES)
- CDEBUGFLAGS = -O2 -fno-strength-reduce -fno-strict-aliasing
+
+ config/cf/xorg.cf                                        |    2 +-
+ programs/Xserver/fb/fbmmx.c                              |   13 +++++++------
+ programs/Xserver/hw/xfree86/drivers/ati/radeon_chipset.h |    2 +-
+ 3 files changed, 9 insertions(+), 8 deletions(-)
+
+--- X11-6.8.2/xc/config/cf/xorg.cf.orig        2005-03-21 19:11:42.000000000 +0100
++++ X11-6.8.2/xc/config/cf/xorg.cf     2005-03-21 23:03:46.000000000 +0100
+@@ -1541,7 +1541,7 @@
+ #  if defined(UseInstalled)
+ #   define DefaultCCOptions /* -ansi */
+ #  else
+-#   define DefaultCCOptions -ansi -pedantic GccWarningOptions
++#   define DefaultCCOptions -std=gnu9x -pedantic GccWarningOptions
+ #  endif
+ # endif
+ # if defined(UseInstalled)
 --- X11-6.8.2/xc/programs/Xserver/fb/fbmmx.c.orig      2004-07-22 21:24:50.000000000 +0200
 +++ X11-6.8.2/xc/programs/Xserver/fb/fbmmx.c   2005-02-15 10:32:50.573357352 +0100
 @@ -23,6 +23,7 @@