[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

X Strike Force X.Org X11 SVN commit: r805 - in branches/6.9/debian: . patches patches/alpha



Author: dnusinow
Date: 2005-10-31 11:13:37 -0500 (Mon, 31 Oct 2005)
New Revision: 805

Added:
   branches/6.9/debian/patches/alpha/202_alpha_typedef_card32.diff
Modified:
   branches/6.9/debian/changelog
   branches/6.9/debian/patches/series
Log:
* Add alpha/202_alpha_typedef_card32.diff to correct FTBFS. Thanks to Julien
  Cristau.


Modified: branches/6.9/debian/changelog
===================================================================
--- branches/6.9/debian/changelog	2005-10-31 03:48:47 UTC (rev 804)
+++ branches/6.9/debian/changelog	2005-10-31 16:13:37 UTC (rev 805)
@@ -1,8 +1,9 @@
 xorg-x11 (6.8.99.901.dfsg.1-2+SVN) UNRELEASED; urgency=low
 
-  * 
+  * Add alpha/202_alpha_typedef_card32.diff to correct FTBFS. Thanks to Julien
+    Cristau.
 
- -- David Nusinow <dnusinow@debian.org>  Sun, 30 Oct 2005 20:14:31 -0500
+ -- David Nusinow <dnusinow@debian.org>  Mon, 31 Oct 2005 11:12:10 -0500
 
 xorg-x11 (6.8.99.901.dfsg.1-2) experimental; urgency=low
 

Added: branches/6.9/debian/patches/alpha/202_alpha_typedef_card32.diff
===================================================================
--- branches/6.9/debian/patches/alpha/202_alpha_typedef_card32.diff	2005-10-31 03:48:47 UTC (rev 804)
+++ branches/6.9/debian/patches/alpha/202_alpha_typedef_card32.diff	2005-10-31 16:13:37 UTC (rev 805)
@@ -0,0 +1,13 @@
+Index: xc/programs/Xserver/hw/xfree86/common/compiler.h
+===================================================================
+--- xc/programs/Xserver/hw/xfree86/common/compiler.h.orig	2005-10-31 11:09:39.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/common/compiler.h	2005-10-31 11:10:18.000000000 -0500
+@@ -62,6 +62,8 @@
+ # define DO_PROTOTYPES
+ #endif
+ 
++# include <X11/Xmd.h>
++
+ /* Allow drivers to use the GCC-supported __inline__ and/or __inline. */
+ # ifndef __inline__
+ #  if defined(__GNUC__)

Modified: branches/6.9/debian/patches/series
===================================================================
--- branches/6.9/debian/patches/series	2005-10-31 03:48:47 UTC (rev 804)
+++ branches/6.9/debian/patches/series	2005-10-31 16:13:37 UTC (rev 805)
@@ -78,6 +78,7 @@
 sparc/104_sparc_no_mv8_flag.diff -p0
 sparc/105_ffb_dac_typedef_bool.diff
 alpha/201_alpha_freetype_gcc_2.95_bugfix.diff -p0
+alpha/202_alpha_typedef_card32.diff -p0
 m68k/250_m68k_build_scanpci.diff -p0
 arm/300_riscpc_xkb_keycodes.diff -p0
 arm/303_arm_cache_flush.diff -p0



Reply to: