[94381] trunk/dports/print/freetype

[ryandesign at macports.org]

Revision: 94381
          https://trac.macports.org/changeset/94381
Author:   ryandesign at macports.org
Date:     2012-06-17 03:38:18 -0700 (Sun, 17 Jun 2012)
Log Message:
-----------
freetype: update to 2.4.10

Modified Paths:
--------------
    trunk/dports/print/freetype/Portfile

Removed Paths:
-------------
    trunk/dports/print/freetype/files/patch-src_type1_t1load.c.diff

Modified: trunk/dports/print/freetype/Portfile
===================================================================
--- trunk/dports/print/freetype/Portfile	2012-06-17 08:13:20 UTC (rev 94380)
+++ trunk/dports/print/freetype/Portfile	2012-06-17 10:38:18 UTC (rev 94381)
@@ -6,8 +6,7 @@
 PortGroup               archcheck 1.0
 
 name                    freetype
-version                 2.4.9
-revision                1
+version                 2.4.10
 categories              print graphics
 maintainers             ryandesign
 license                 {FreeType GPL-2}
@@ -38,15 +37,14 @@
 
 checksums \
     [suffix ${distname}] \
-        rmd160  a420df999f2c73ddd44641462281ae86845472bb \
-        sha256  c4204ac1d48e99d4375a2f32bf4f3f92780a9d9f015e64e57e852f6c004859b9 \
+        rmd160  9da7fcde9c42f81c399201d055d85109b2ae7814 \
+        sha256  0c8e242c33c45928de560d7d595db06feb41d1b22167e37260ceabe72f9e992f \
     [suffix ${docdistname}] \
-        rmd160  df6cdc55cc822770a1690c989a147c382223a190 \
-        sha256  138ec5c5081c2c0d1d4624e83bf3797a27271fdb5218deff6599f2d23b66438a
+        rmd160  8272137b331e0396023d33d495358c82bddf1fbe \
+        sha256  b83b46fd02d00c256eea12bddf598454f95858dbeaa853b76dac5974f0321fd8
 
 patchfiles \
     patch-src_base_ftrfork.c.diff \
-    patch-src_type1_t1load.c.diff \
     patch-modules.cfg.diff
 
 depends_lib             port:zlib \

Deleted: trunk/dports/print/freetype/files/patch-src_type1_t1load.c.diff
===================================================================
--- trunk/dports/print/freetype/files/patch-src_type1_t1load.c.diff	2012-06-17 08:13:20 UTC (rev 94380)
+++ trunk/dports/print/freetype/files/patch-src_type1_t1load.c.diff	2012-06-17 10:38:18 UTC (rev 94381)
@@ -1,89 +0,0 @@
-https://savannah.nongnu.org/bugs/?func=detailitem&item_id=35833
---- src/type1/t1load.c.orig
-+++ src/type1/t1load.c
-@@ -71,6 +71,13 @@
- #include "t1errors.h"
- 
- 
-+#ifdef FT_CONFIG_OPTION_INCREMENTAL
-+#define IS_INCREMENTAL  ( face->root.internal->incremental_interface != 0 )
-+#else
-+#define IS_INCREMENTAL  0
-+#endif
-+
-+
-   /*************************************************************************/
-   /*                                                                       */
-   /* The macro FT_COMPONENT is used in trace mode.  It is an implicit      */
-@@ -1030,7 +1037,8 @@
-   static int
-   read_binary_data( T1_Parser  parser,
-                     FT_Long*   size,
--                    FT_Byte**  base )
-+                    FT_Byte**  base,
-+                    FT_Bool    incremental )
-   {
-     FT_Byte*  cur;
-     FT_Byte*  limit = parser->root.limit;
-@@ -1065,8 +1073,12 @@
-       }
-     }
- 
--    FT_ERROR(( "read_binary_data: invalid size field\n" ));
--    parser->root.error = T1_Err_Invalid_File_Format;
-+    if( !incremental )
-+    {
-+      FT_ERROR(( "read_binary_data: invalid size field\n" ));
-+      parser->root.error = T1_Err_Invalid_File_Format;
-+    }
-+
-     return 0;
-   }
- 
-@@ -1396,7 +1408,7 @@
- 
-       idx = T1_ToInt( parser );
- 
--      if ( !read_binary_data( parser, &size, &base ) )
-+      if ( !read_binary_data( parser, &size, &base, IS_INCREMENTAL ) )
-         return;
- 
-       /* The binary string is followed by one token, e.g. `NP' */
-@@ -1582,7 +1594,7 @@
-         cur++;                              /* skip `/' */
-         len = parser->root.cursor - cur;
- 
--        if ( !read_binary_data( parser, &size, &base ) )
-+        if ( !read_binary_data( parser, &size, &base, IS_INCREMENTAL ) )
-           return;
- 
-         /* for some non-standard fonts like `Optima' which provides */
-@@ -1871,7 +1883,7 @@
- 
- 
-         parser->root.cursor = start_binary;
--        if ( !read_binary_data( parser, &s, &b ) )
-+        if ( !read_binary_data( parser, &s, &b, IS_INCREMENTAL ) )
-           return T1_Err_Invalid_File_Format;
-         have_integer = 0;
-       }
-@@ -1884,7 +1896,7 @@
- 
- 
-         parser->root.cursor = start_binary;
--        if ( !read_binary_data( parser, &s, &b ) )
-+        if ( !read_binary_data( parser, &s, &b, IS_INCREMENTAL ) )
-           return T1_Err_Invalid_File_Format;
-         have_integer = 0;
-       }
-@@ -2160,9 +2172,7 @@
-       type1->subrs_len   = loader.subrs.lengths;
-     }
- 
--#ifdef FT_CONFIG_OPTION_INCREMENTAL
--    if ( !face->root.internal->incremental_interface )
--#endif
-+    if ( !IS_INCREMENTAL )
-       if ( !loader.charstrings.init )
-       {
-         FT_ERROR(( "T1_Open_Face: no `/CharStrings' array in face\n" ));
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120617/6f8d5c8d/attachment.html>