Author: branden
Date: 2004-02-09 01:11:52 -0500 (Mon, 09 Feb 2004)
New Revision: 1013

Added:
   branches/4.3.0/sid/debian/patches/201_alpha_freetype_gcc_2.95_bugfix.diff
Modified:
   branches/4.3.0/sid/debian/TODO
Log:
Forward-port another patch from the trunk that was lost.


Modified: branches/4.3.0/sid/debian/TODO
===================================================================
--- branches/4.3.0/sid/debian/TODO      2004-02-09 05:57:37 UTC (rev 1012)
+++ branches/4.3.0/sid/debian/TODO      2004-02-09 06:11:52 UTC (rev 1013)
@@ -7,7 +7,6 @@
     http://lists.debian.org/debian-x/2004/debian-x-200401/msg00475.html
     * PATCH APPLIED, FIX NEEDS TESTING
 * Investigate/forward-port the following patches from trunk:
-  + 201_alpha_truetype_gcc_bugfix.diff
   + 203_Xpm_wordsize.diff
   + 351_newport_range.diff
   + 906_debian_xfs
@@ -194,7 +193,7 @@
 103_type6_xkb_support.diff                             unchanged       
101_type6_xkb_support
 150_powerpc_build_nv_driver.diff                       merged
 200_alpha_GLX_align_fix.diff                           irrelevant      
according to Mike Harris (according to Daniel Stone)
-201_alpha_truetype_gcc_bugfix.diff                     NOT MERGED      
compiler version check should be added
+201_alpha_truetype_gcc_bugfix.diff                     merged          
201_alpha_freetype_gcc_2.95_bugfix
 202_saverproto_datatypes.diff                          upstream        
comments were stripped out
 203_Xpm_wordsize.diff                                  INCOMPLETE      
200_alpha_xpm_get_long64; restore patch annotation
 311_arm_compiler_h.diff                                        merged          
part of 302_arm_compiler_h

Added: branches/4.3.0/sid/debian/patches/201_alpha_freetype_gcc_2.95_bugfix.diff
===================================================================
--- branches/4.3.0/sid/debian/patches/201_alpha_freetype_gcc_2.95_bugfix.diff   
2004-02-09 05:57:37 UTC (rev 1012)
+++ branches/4.3.0/sid/debian/patches/201_alpha_freetype_gcc_2.95_bugfix.diff   
2004-02-09 06:11:52 UTC (rev 1013)
@@ -0,0 +1,33 @@
+$Id$
+
+This patch by Juliusz Chroboczek and Branden Robinson.
+
+Not submitted upstream.
+
+--- xc/lib/font/Imakefile~     2004-02-09 00:59:22.000000000 -0500
++++ xc/lib/font/Imakefile      2004-02-09 01:03:23.000000000 -0500
+@@ -68,6 +68,24 @@
+   FREETYPEDEBUGOBJS = FreeType/debugger/?*.o
+ FREETYPEPROFILEOBJS = FreeType/profiled/?*.o
+       FREETYPEDONES = FreeType/DONE
++/*
++ * Work around apparent bug in GCC 2.95; according to Doug Larrick
++ * <[EMAIL PROTECTED]>:
++ *
++ * "Due to what appears to be a code generation issue, libttf2
++ * 1.4pre.20011029-1 and XFree86 4.2 segfault on Alpha when attempting to
++ * render some TrueType fonts.  I have not fully traced this code gen error
++ * to the source that triggers it in libttf2, but it appears to be similar
++ * to the one in gtk+ where adjacent 'short' fields in a struct get
++ * corrupted when writing into one or the other."
++ */
++# ifdef AlphaArchitecture
++#  if HasGcc
++#   if GccMajorVersion < 3
++CDEBUGFLAGS = /**/
++#   endif
++#  endif
++# endif
+ #endif
+ #if BuildXTrueType
+             XTTDIRS = X-TrueType


Property changes on: 
branches/4.3.0/sid/debian/patches/201_alpha_freetype_gcc_2.95_bugfix.diff
___________________________________________________________________
Name: svn:keywords
   + Id

Reply via email to