Punt patches

(Portage version: 2.2_rc17/cvs/Linux 2.6.28-rc6 x86_64)

8 files changed, 11 insertions, 423 deletions

diff --git a/media-libs/freetype/ChangeLog b/media-libs/freetype/ChangeLog
index 3f00441bb526..fd131f22547d 100644
--- a/media-libs/freetype/ChangeLog
+++ b/media-libs/freetype/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for media-libs/freetype
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v 1.202 2008/12/20 01:26:08 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v 1.203 2008/12/20 01:32:24 loki_val Exp $
+
+  20 Dec 2008; Peter Alfredsen <loki_val@gentoo.org>
+  -files/freetype-1.3.1-malloc.patch,
+  -files/freetype-2.1.10-fix_synth.patch,
+  -files/freetype-2.1.10-internal_header.patch,
+  -files/freetype-2.1.10-revert_pointer.patch,
+  -files/freetype-2.3.2-bdflib.patch,
+  -files/freetype-2.3.5-crossbuild.patch,
+  -files/freetype-2.3.6-incorect-font-scaling.patch:
+  Punt patches
 
   20 Dec 2008; Peter Alfredsen <loki_val@gentoo.org>
   -freetype-1.3.1-r5.ebuild, -freetype-1.4_pre20080316.ebuild,
diff --git a/media-libs/freetype/files/freetype-1.3.1-malloc.patch b/media-libs/freetype/files/freetype-1.3.1-malloc.patch
deleted file mode 100644
index bf69c7f56339..000000000000
--- a/media-libs/freetype/files/freetype-1.3.1-malloc.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: freetype-1.3.1/contrib/ttfbanner/ttfbanner.c
-===================================================================
---- freetype-1.3.1.orig/contrib/ttfbanner/ttfbanner.c
-+++ freetype-1.3.1/contrib/ttfbanner/ttfbanner.c
-@@ -4,7 +4,6 @@
- 
- #include <stdlib.h>
- #include <stdio.h>
--#include <malloc.h>
- #include <string.h>
- #include "freetype.h"
- #include "ttfbanner.h"
-Index: freetype-1.3.1/freetype1-contrib/ttfbanner/ttfbanner.c
-===================================================================
---- freetype-1.3.1.orig/freetype1-contrib/ttfbanner/ttfbanner.c
-+++ freetype-1.3.1/freetype1-contrib/ttfbanner/ttfbanner.c
-@@ -4,7 +4,6 @@
- 
- #include <stdlib.h>
- #include <stdio.h>
--#include <malloc.h>
- #include <string.h>
- #include "freetype.h"
- #include "ttfbanner.h"
diff --git a/media-libs/freetype/files/freetype-2.1.10-fix_synth.patch b/media-libs/freetype/files/freetype-2.1.10-fix_synth.patch
deleted file mode 100644
index f39442e74b0b..000000000000
--- a/media-libs/freetype/files/freetype-2.1.10-fix_synth.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-===================================================================
-RCS file: /var/lib/cvs/sources/freetype/freetype2/src/base/ftsynth.c,v
-retrieving revision 1.27
-retrieving revision 1.28
-diff -u -r1.27 -r1.28
---- freetype/freetype2/src/base/ftsynth.c	2005/05/30 07:54:20	1.27
-+++ freetype/freetype2/src/base/ftsynth.c	2005/06/16 19:07:08	1.28
-@@ -81,7 +81,7 @@
- 
-     /* some reasonable strength */
-     xstr = FT_MulFix( face->units_per_EM,
--                      face->size->metrics.y_scale ) / 42;
-+                      face->size->metrics.y_scale ) / 24;
-     ystr = xstr;
- 
-     if ( slot->format == FT_GLYPH_FORMAT_OUTLINE )
-@@ -122,8 +122,8 @@
-     /* modify the metrics accordingly */
-     if ( !error )
-     {
-+      /* assume the layout is horizontal */
-       slot->advance.x += xstr;
--      slot->advance.y += ystr;
- 
-       slot->metrics.width        += xstr;
-       slot->metrics.height       += ystr;
diff --git a/media-libs/freetype/files/freetype-2.1.10-internal_header.patch b/media-libs/freetype/files/freetype-2.1.10-internal_header.patch
deleted file mode 100644
index 22e752726e04..000000000000
--- a/media-libs/freetype/files/freetype-2.1.10-internal_header.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uNr freetype-2.1.10/include/freetype/internal/ftmemory.h freetype-2.1.10.patched/include/freetype/internal/ftmemory.h
---- freetype-2.1.10/include/freetype/internal/ftmemory.h	2005-06-04 07:17:10.000000000 +0200
-+++ freetype-2.1.10.patched/include/freetype/internal/ftmemory.h	2005-07-12 18:57:44.000000000 +0200
-@@ -430,7 +430,7 @@
-           FT_ALLOC( _pointer_, (_count_) * sizeof ( _type_ ) )
- 
- #define FT_REALLOC_ARRAY( _pointer_, _old_, _new_, _type_ )   \
--          FT_REALLOC( _pointer, (_old_) * sizeof ( _type_ ),  \
-+          FT_REALLOC( _pointer_, (_old_) * sizeof ( _type_ ),  \
-                                 (_new_) * sizeof ( _type_ ) )
- 
- 
diff --git a/media-libs/freetype/files/freetype-2.1.10-revert_pointer.patch b/media-libs/freetype/files/freetype-2.1.10-revert_pointer.patch
deleted file mode 100644
index 43bc0ddd03dc..000000000000
--- a/media-libs/freetype/files/freetype-2.1.10-revert_pointer.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ur freetype-2.1.10/src/sfnt/sfdriver.c freetype-2.1.10-r1/src/sfnt/sfdriver.c
---- freetype-2.1.10/src/sfnt/sfdriver.c	2005-09-05 11:07:57.532473793 +0200
-+++ freetype-2.1.10-r1/src/sfnt/sfdriver.c	2005-09-05 11:08:21.586881788 +0200
-@@ -367,8 +367,8 @@
-     /* see `ttsbit.h' and `sfnt.h' */
-     tt_face_set_sbit_strike,
-     tt_face_load_sbit_strikes,
--    0 /* tt_find_sbit_image */,
--    0 /* tt_load_sbit_metrics */,
-+    tt_find_sbit_image,
-+    tt_load_sbit_metrics,
-     tt_face_load_sbit_image,
-     tt_face_free_sbit_strikes,
- 
diff --git a/media-libs/freetype/files/freetype-2.3.2-bdflib.patch b/media-libs/freetype/files/freetype-2.3.2-bdflib.patch
deleted file mode 100644
index b0f3e1900573..000000000000
--- a/media-libs/freetype/files/freetype-2.3.2-bdflib.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-===================================================================
-RCS file: /sources/freetype/freetype2/src/bdf/bdflib.c,v
-retrieving revision 1.33
-retrieving revision 1.34
-diff -u -r1.33 -r1.34
---- freetype2/src/bdf/bdflib.c	2007/02/12 21:44:09	1.33
-+++ freetype2/src/bdf/bdflib.c	2007/03/28 07:17:17	1.34
-@@ -385,8 +385,10 @@
-   } _bdf_parse_t;
- 
- 
--#define setsbit( m, cc )  ( m[(cc) >> 3] |= (FT_Byte)( 1 << ( (cc) & 7 ) ) )
--#define sbitset( m, cc )  ( m[(cc) >> 3]  & ( 1 << ( (cc) & 7 ) ) )
-+#define setsbit( m, cc ) \
-+          ( m[(FT_Byte)(cc) >> 3] |= (FT_Byte)( 1 << ( (cc) & 7 ) ) )
-+#define sbitset( m, cc ) \
-+          ( m[(FT_Byte)(cc) >> 3]  & ( 1 << ( (cc) & 7 ) ) )
- 
- 
-   static void
-@@ -1130,7 +1132,7 @@
-                             bdf_options_t*  opts )
-   {
-     unsigned long  len;
--    char           name[128];
-+    char           name[256];
-     _bdf_list_t    list;
-     FT_Memory      memory;
-     FT_Error       error = BDF_Err_Ok;
-@@ -1149,6 +1151,13 @@
-     font->spacing = opts->font_spacing;
- 
-     len = (unsigned long)( ft_strlen( font->name ) + 1 );
-+    /* Limit ourselves to 256 characters in the font name. */
-+    if ( len >= 256 )
-+    {
-+      error = BDF_Err_Invalid_Argument;
-+      goto Exit;
-+    }
-+
-     FT_MEM_COPY( name, font->name, len );
- 
-     error = _bdf_list_split( &list, (char *)"-", name, len );
-@@ -1467,6 +1476,14 @@
-       if ( p->cnt == 0 )
-         font->glyphs_size = 64;
- 
-+      /* Limit ourselves to 1,114,112 glyphs in the font (this is the */
-+      /* number of code points available in Unicode).                 */
-+      if ( p->cnt >= 1114112UL )
-+      {
-+        error = BDF_Err_Invalid_Argument;
-+        goto Exit;
-+      }
-+
-       if ( FT_NEW_ARRAY( font->glyphs, font->glyphs_size ) )
-         goto Exit;
- 
diff --git a/media-libs/freetype/files/freetype-2.3.5-crossbuild.patch b/media-libs/freetype/files/freetype-2.3.5-crossbuild.patch
deleted file mode 100644
index 32e6ce7642d0..000000000000
--- a/media-libs/freetype/files/freetype-2.3.5-crossbuild.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Naur freetype-2.3.5-orig/builds/unix/configure freetype-2.3.5/builds/unix/configure
---- freetype-2.3.5-orig/builds/unix/configure	2007-07-17 22:53:10.000000000 -0600
-+++ freetype-2.3.5/builds/unix/configure	2007-07-17 22:54:53.000000000 -0600
-@@ -3270,7 +3270,7 @@
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
--    ac_cv_prog_CC_BUILD="${build-gcc}"
-+    ac_cv_prog_CC_BUILD="${build}-gcc"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
-diff -Naur freetype-2.3.5-orig/builds/unix/configure.ac freetype-2.3.5/builds/unix/configure.ac
---- freetype-2.3.5-orig/builds/unix/configure.ac	2007-07-02 15:41:39.000000000 -0600
-+++ freetype-2.3.5/builds/unix/configure.ac	2007-07-17 22:54:26.000000000 -0600
-@@ -40,7 +40,7 @@
- # checks for native programs to generate building tool
- 
- if test ${cross_compiling} = yes; then
--  AC_CHECK_PROG(CC_BUILD, ${build}-gcc, ${build-gcc})
-+  AC_CHECK_PROG(CC_BUILD, ${build}-gcc, ${build}-gcc)
-   test -z "${CC_BUILD}" && AC_CHECK_PROG(CC_BUILD, gcc, gcc)
-   test -z "${CC_BUILD}" && AC_CHECK_PROG(CC_BUILD, cc, cc, , , /usr/ucb/cc)
-   test -z "${CC_BUILD}" && AC_MSG_ERROR([cannot find native C compiler])
-diff -Naur freetype-2.3.5-orig/builds/unix/configure.raw freetype-2.3.5/builds/unix/configure.raw
---- freetype-2.3.5-orig/builds/unix/configure.raw	2007-07-02 15:13:50.000000000 -0600
-+++ freetype-2.3.5/builds/unix/configure.raw	2007-07-17 22:54:47.000000000 -0600
-@@ -40,7 +40,7 @@
- # checks for native programs to generate building tool
- 
- if test ${cross_compiling} = yes; then
--  AC_CHECK_PROG(CC_BUILD, ${build}-gcc, ${build-gcc})
-+  AC_CHECK_PROG(CC_BUILD, ${build}-gcc, ${build}-gcc)
-   test -z "${CC_BUILD}" && AC_CHECK_PROG(CC_BUILD, gcc, gcc)
-   test -z "${CC_BUILD}" && AC_CHECK_PROG(CC_BUILD, cc, cc, , , /usr/ucb/cc)
-   test -z "${CC_BUILD}" && AC_MSG_ERROR([cannot find native C compiler])
diff --git a/media-libs/freetype/files/freetype-2.3.6-incorect-font-scaling.patch b/media-libs/freetype/files/freetype-2.3.6-incorect-font-scaling.patch
deleted file mode 100644
index 0688bbebaf90..000000000000
--- a/media-libs/freetype/files/freetype-2.3.6-incorect-font-scaling.patch
+++ /dev/null
@@ -1,252 +0,0 @@
-2008-06-19  Werner Lemberg  <wl@gnu.org>
- 
-	* src/cff/cffobjs.c (cff_face_init): Compute final
-	`dict->units_per_em' value before assigning it to
-	`cffface->units_per_EM'.  Otherwise, CFFs without subfonts are be
-	scaled incorrectly if the font matrix is non-standard.  This fixes
-	Savannah bug #23630.
-
-Index: src/cff/cffobjs.c
-===================================================================
-RCS file: /sources/freetype/freetype2/src/cff/cffobjs.c,v
-retrieving revision 1.89
-retrieving revision 1.90
-diff -u -B -r1.89 -r1.90
---- src/cff/cffobjs.c	14 May 2008 23:05:37 -0000	1.89
-+++ src/cff/cffobjs.c	19 Jun 2008 16:23:43 -0000	1.90
-@@ -534,6 +534,111 @@
-         goto Bad_Format;
-       }
- 
-+      if ( !dict->units_per_em )
-+        dict->units_per_em = pure_cff ? 1000 : face->root.units_per_EM;
-+
-+      /* Normalize the font matrix so that `matrix->xx' is 1; the */
-+      /* scaling is done with `units_per_em' then (at this point, */
-+      /* it already contains the scaling factor, but without      */
-+      /* normalization of the matrix).                            */
-+      /*                                                          */
-+      /* Note that the offsets must be expressed in integer font  */
-+      /* units.                                                   */
-+
-+      {
-+        FT_Matrix*  matrix = &dict->font_matrix;
-+        FT_Vector*  offset = &dict->font_offset;
-+        FT_ULong*   upm    = &dict->units_per_em;
-+        FT_Fixed    temp   = FT_ABS( matrix->yy );
-+
-+
-+        if ( temp != 0x10000L )
-+        {
-+          *upm = FT_DivFix( *upm, temp );
-+
-+          matrix->xx = FT_DivFix( matrix->xx, temp );
-+          matrix->yx = FT_DivFix( matrix->yx, temp );
-+          matrix->xy = FT_DivFix( matrix->xy, temp );
-+          matrix->yy = FT_DivFix( matrix->yy, temp );
-+          offset->x  = FT_DivFix( offset->x,  temp );
-+          offset->y  = FT_DivFix( offset->y,  temp );
-+        }
-+
-+        offset->x >>= 16;
-+        offset->y >>= 16;
-+      }
-+
-+      for ( i = cff->num_subfonts; i > 0; i-- )
-+      {
-+        CFF_FontRecDict  sub = &cff->subfonts[i - 1]->font_dict;
-+        CFF_FontRecDict  top = &cff->top_font.font_dict;
-+
-+        FT_Matrix*  matrix;
-+        FT_Vector*  offset;
-+        FT_ULong*   upm;
-+        FT_Fixed    temp;
-+
-+
-+        if ( sub->units_per_em )
-+        {
-+          FT_Int  scaling;
-+
-+
-+          if ( top->units_per_em > 1 && sub->units_per_em > 1 )
-+            scaling = FT_MIN( top->units_per_em, sub->units_per_em );
-+          else
-+            scaling = 1;
-+
-+          FT_Matrix_Multiply_Scaled( &top->font_matrix,
-+                                     &sub->font_matrix,
-+                                     scaling );
-+          FT_Vector_Transform_Scaled( &sub->font_offset,
-+                                      &top->font_matrix,
-+                                      scaling );
-+
-+          sub->units_per_em = FT_MulDiv( sub->units_per_em,
-+                                         top->units_per_em,
-+                                         scaling );
-+        }
-+        else
-+        {
-+          sub->font_matrix = top->font_matrix;
-+          sub->font_offset = top->font_offset;
-+
-+          sub->units_per_em = top->units_per_em;
-+        }
-+
-+        matrix = &sub->font_matrix;
-+        offset = &sub->font_offset;
-+        upm    = &sub->units_per_em;
-+        temp   = FT_ABS( matrix->yy );
-+
-+        if ( temp != 0x10000L )
-+        {
-+          *upm = FT_DivFix( *upm, temp );
-+
-+          /* if *upm is larger than 100*1000 we divide by 1000 --     */
-+          /* this can happen if e.g. there is no top-font FontMatrix  */
-+          /* and the subfont FontMatrix already contains the complete */
-+          /* scaling for the subfont (see section 5.11 of the PLRM)   */
-+
-+          /* 100 is a heuristic value */
-+
-+          if ( *upm > 100L * 1000L )
-+            *upm = ( *upm + 500 ) / 1000;
-+
-+          matrix->xx = FT_DivFix( matrix->xx, temp );
-+          matrix->yx = FT_DivFix( matrix->yx, temp );
-+          matrix->xy = FT_DivFix( matrix->xy, temp );
-+          matrix->yy = FT_DivFix( matrix->yy, temp );
-+          offset->x  = FT_DivFix( offset->x,  temp );
-+          offset->y  = FT_DivFix( offset->y,  temp );
-+        }
-+
-+        offset->x >>= 16;
-+        offset->y >>= 16;
-+      }
-+
-       if ( pure_cff )
-       {
-         char*  style_name = NULL;
-@@ -554,8 +659,6 @@
-         cffface->bbox.xMax = ( dict->font_bbox.xMax + 0xFFFFU ) >> 16;
-         cffface->bbox.yMax = ( dict->font_bbox.yMax + 0xFFFFU ) >> 16;
- 
--        if ( !dict->units_per_em )
--          dict->units_per_em = 1000;
- 
-         cffface->units_per_EM = dict->units_per_em;
- 
-@@ -711,114 +814,8 @@
- 
-         cffface->style_flags = flags;
-       }
--      else
--      {
--        if ( !dict->units_per_em )
--          dict->units_per_em = face->root.units_per_EM;
--      }
--
--      /* Normalize the font matrix so that `matrix->xx' is 1; the */
--      /* scaling is done with `units_per_em' then (at this point, */
--      /* it already contains the scaling factor, but without      */
--      /* normalization of the matrix).                            */
--      /*                                                          */
--      /* Note that the offsets must be expressed in integer font  */
--      /* units.                                                   */
--
--      {
--        FT_Matrix*  matrix = &dict->font_matrix;
--        FT_Vector*  offset = &dict->font_offset;
--        FT_ULong*   upm    = &dict->units_per_em;
--        FT_Fixed    temp   = FT_ABS( matrix->yy );
--
--
--        if ( temp != 0x10000L )
--        {
--          *upm = FT_DivFix( *upm, temp );
--
--          matrix->xx = FT_DivFix( matrix->xx, temp );
--          matrix->yx = FT_DivFix( matrix->yx, temp );
--          matrix->xy = FT_DivFix( matrix->xy, temp );
--          matrix->yy = FT_DivFix( matrix->yy, temp );
--          offset->x  = FT_DivFix( offset->x,  temp );
--          offset->y  = FT_DivFix( offset->y,  temp );
--        }
--
--        offset->x >>= 16;
--        offset->y >>= 16;
--      }
--
--      for ( i = cff->num_subfonts; i > 0; i-- )
--      {
--        CFF_FontRecDict  sub = &cff->subfonts[i - 1]->font_dict;
--        CFF_FontRecDict  top = &cff->top_font.font_dict;
--
--        FT_Matrix*  matrix;
--        FT_Vector*  offset;
--        FT_ULong*   upm;
--        FT_Fixed    temp;
- 
- 
--        if ( sub->units_per_em )
--        {
--          FT_Int  scaling;
--
--
--          if ( top->units_per_em > 1 && sub->units_per_em > 1 )
--            scaling = FT_MIN( top->units_per_em, sub->units_per_em );
--          else
--            scaling = 1;
--
--          FT_Matrix_Multiply_Scaled( &top->font_matrix,
--                                     &sub->font_matrix,
--                                     scaling );
--          FT_Vector_Transform_Scaled( &sub->font_offset,
--                                      &top->font_matrix,
--                                      scaling );
--
--          sub->units_per_em = FT_MulDiv( sub->units_per_em,
--                                         top->units_per_em,
--                                         scaling );
--        }
--        else
--        {
--          sub->font_matrix = top->font_matrix;
--          sub->font_offset = top->font_offset;
--
--          sub->units_per_em = top->units_per_em;
--        }
--
--        matrix = &sub->font_matrix;
--        offset = &sub->font_offset;
--        upm    = &sub->units_per_em;
--        temp   = FT_ABS( matrix->yy );
--
--        if ( temp != 0x10000L )
--        {
--          *upm = FT_DivFix( *upm, temp );
--
--          /* if *upm is larger than 100*1000 we divide by 1000 --     */
--          /* this can happen if e.g. there is no top-font FontMatrix  */
--          /* and the subfont FontMatrix already contains the complete */
--          /* scaling for the subfont (see section 5.11 of the PLRM)   */
--
--          /* 100 is a heuristic value */
--
--          if ( *upm > 100L * 1000L )
--            *upm = ( *upm + 500 ) / 1000;
--
--          matrix->xx = FT_DivFix( matrix->xx, temp );
--          matrix->yx = FT_DivFix( matrix->yx, temp );
--          matrix->xy = FT_DivFix( matrix->xy, temp );
--          matrix->yy = FT_DivFix( matrix->yy, temp );
--          offset->x  = FT_DivFix( offset->x,  temp );
--          offset->y  = FT_DivFix( offset->y,  temp );
--        }
--
--        offset->x >>= 16;
--        offset->y >>= 16;
--      }
--
- #ifndef FT_CONFIG_OPTION_NO_GLYPH_NAMES
-       /* CID-keyed CFF fonts don't have glyph names -- the SFNT loader */
-       /* has unset this flag because of the 3.0 `post' table.          */