[114465] trunk/dports/print/freetype

ryandesign at macports.org ryandesign at macports.org
Mon Dec 9 04:28:52 PST 2013


Revision: 114465
          https://trac.macports.org/changeset/114465
Author:   ryandesign at macports.org
Date:     2013-12-09 04:28:51 -0800 (Mon, 09 Dec 2013)
Log Message:
-----------
freetype: update to 2.5.2

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

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

Modified: trunk/dports/print/freetype/Portfile
===================================================================
--- trunk/dports/print/freetype/Portfile	2013-12-09 12:17:50 UTC (rev 114464)
+++ trunk/dports/print/freetype/Portfile	2013-12-09 12:28:51 UTC (rev 114465)
@@ -5,8 +5,7 @@
 PortGroup               muniversal 1.0
 
 name                    freetype
-version                 2.5.1
-revision                1
+version                 2.5.2
 categories              print graphics
 maintainers             ryandesign
 license                 {FreeType GPL-2}
@@ -36,15 +35,14 @@
                         ${docdistname}${extract.suffix}:docs
 
 checksums               ${distname}${extract.suffix} \
-                        rmd160  08d6bf4376daed191a6907c49c9a3cb69276203b \
-                        sha256  d715faa92b37980280c857ce9d356fff4361c5a7bd9b5c3f867fc24f598d8f45 \
+                        rmd160  f25ec3d1bee11cb07f4a8c6ae11483837daa14db \
+                        sha256  4ff4bd393aa01071ec7b849d035508a505a78f88b2bcf25ff11e58e43c0b9def \
                         ${docdistname}${extract.suffix} \
-                        rmd160  aa2fc47c92a8fdf4c006e4a28c2ef6d236a9ae32 \
-                        sha256  57891fa2caf0185bca5d2641ae6715a6e9675fcb83976d4b1838cce02b540f01
+                        rmd160  44923b8d52edeb5ff1db3ae4c594d377296acb94 \
+                        sha256  47915cdb956a4984e90de81181925386eac1a20a23df1932770de1e6790989ba
 
 patchfiles \
     patch-src_base_ftrfork.c.diff \
-    patch-TT_Load_Simple_Glyph.diff \
     patch-modules.cfg.diff
 
 depends_lib             port:bzip2 \

Deleted: trunk/dports/print/freetype/files/patch-TT_Load_Simple_Glyph.diff
===================================================================
--- trunk/dports/print/freetype/files/patch-TT_Load_Simple_Glyph.diff	2013-12-09 12:17:50 UTC (rev 114464)
+++ trunk/dports/print/freetype/files/patch-TT_Load_Simple_Glyph.diff	2013-12-09 12:28:51 UTC (rev 114465)
@@ -1,86 +0,0 @@
-Fix crash in TT_Load_Simple_Glyph
-https://savannah.nongnu.org/bugs/?40797
-http://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=64872a50165d842d72c520f5f7e19124dbf7822d
---- ChangeLog.orig	2013-11-24 17:27:44.000000000 -0600
-+++ ChangeLog	2013-12-03 23:58:38.000000000 -0600
-@@ -1,3 +1,16 @@
-+2013-12-02  Werner Lemberg  <wl at gnu.org>
-+
-+	[truetype] Fix change from 2013-11-20.
-+
-+	Problem reported by Akira Kakuto <kakuto at fuk.kindai.ac.jp>.
-+
-+	* src/truetype/ttgload.c (TT_Load_Simple_Glyph): Protect call to
-+	`Update_Max' with both a TT_USE_BYTECODE_INTERPRETER guard and a
-+	`IS_HINTED' clause.
-+	Also remove redundant check using `maxSizeOfInstructions' – in
-+	simple glyphs, the bytecode data comes before the outline data, and
-+	a validity test for this is already present.
-+
- 2013-11-25  Werner Lemberg  <wl at gnu.org>
- 
- 	* Version 2.5.1 released.
---- src/truetype/ttgload.c.orig	2013-11-20 14:03:17.000000000 -0600
-+++ src/truetype/ttgload.c	2013-12-03 23:54:56.000000000 -0600
-@@ -348,8 +348,7 @@
-     FT_GlyphLoader  gloader    = load->gloader;
-     FT_Int          n_contours = load->n_contours;
-     FT_Outline*     outline;
--    TT_Face         face       = (TT_Face)load->face;
--    FT_UShort       n_ins, max_ins;
-+    FT_UShort       n_ins;
-     FT_Int          n_points;
-     FT_ULong        tmp;
- 
-@@ -418,30 +417,6 @@
-     FT_TRACE5(( "  Instructions size: %u\n", n_ins ));
- 
-     /* check it */
--    max_ins = face->max_profile.maxSizeOfInstructions;
--    if ( n_ins > max_ins )
--    {
--      /* don't trust `maxSizeOfInstructions'; */
--      /* only do a rough safety check         */
--      if ( (FT_Int)n_ins > load->byte_len )
--      {
--        FT_TRACE1(( "TT_Load_Simple_Glyph:"
--                    " too many instructions (%d) for glyph with length %d\n",
--                    n_ins, load->byte_len ));
--        return FT_THROW( Too_Many_Hints );
--      }
--
--      tmp = load->exec->glyphSize;
--      error = Update_Max( load->exec->memory,
--                          &tmp,
--                          sizeof ( FT_Byte ),
--                          (void*)&load->exec->glyphIns,
--                          n_ins );
--      load->exec->glyphSize = (FT_UShort)tmp;
--      if ( error )
--        return error;
--    }
--
-     if ( ( limit - p ) < n_ins )
-     {
-       FT_TRACE0(( "TT_Load_Simple_Glyph: instruction count mismatch\n" ));
-@@ -453,6 +428,20 @@
- 
-     if ( IS_HINTED( load->load_flags ) )
-     {
-+      /* we don't trust `maxSizeOfInstructions' in the `maxp' table */
-+      /* and thus update the bytecode array size by ourselves       */
-+
-+      tmp   = load->exec->glyphSize;
-+      error = Update_Max( load->exec->memory,
-+                          &tmp,
-+                          sizeof ( FT_Byte ),
-+                          (void*)&load->exec->glyphIns,
-+                          n_ins );
-+
-+      load->exec->glyphSize = (FT_UShort)tmp;
-+      if ( error )
-+        return error;
-+
-       load->glyph->control_len  = n_ins;
-       load->glyph->control_data = load->exec->glyphIns;
- 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20131209/94b28977/attachment.html>


More information about the macports-changes mailing list