16031761 Update to FreeType 2.4.11 s11u2_07
authorAlan Coopersmith <Alan.Coopersmith@Oracle.COM>
Thu, 27 Dec 2012 15:24:39 -0800
changeset 1327 e952de59d4dc
parent 1326 6a1e00ec49a2
child 1328 39bcdbd469b2
16031761 Update to FreeType 2.4.11 16031865 problem in X11/FONT
open-src/lib/freetype/Makefile
open-src/lib/freetype/freetype-GS-conflict.patch
pkg/manifests/system-library-freetype-2.p5m
--- a/open-src/lib/freetype/Makefile	Fri Jan 11 12:15:15 2013 -0800
+++ b/open-src/lib/freetype/Makefile	Thu Dec 27 15:24:39 2012 -0800
@@ -63,12 +63,12 @@
 LIBNAME=freetype
 
 # Version number (used in path names)
-MODULE_VERSION=2.4.9
+MODULE_VERSION=2.4.11
 
 # Checksums for upstream tarball
-TARBALL_MD5   = 77a893dae81fd5b896632715ca041179
-TARBALL_SHA1  = 5cb80ab9d369c4e81a2221bcf45adcea2c996b9b
-TARBALL_SHA256= c4204ac1d48e99d4375a2f32bf4f3f92780a9d9f015e64e57e852f6c004859b9
+TARBALL_MD5   = b93435488942486c8d0ca22e8f768034
+TARBALL_SHA1  = b15e5a0b30c1e854484b410340f6429ad1253c74
+TARBALL_SHA256= ef9d0bcb64647d9e5125dc7534d7ca371c98310fec87677c410f397f71ffbe3f
 
 # Download site for source
 SOURCE_URL=http://download.savannah.gnu.org/releases/freetype/$(SOURCE_TARBALL_NAME)
--- a/open-src/lib/freetype/freetype-GS-conflict.patch	Fri Jan 11 12:15:15 2013 -0800
+++ b/open-src/lib/freetype/freetype-GS-conflict.patch	Thu Dec 27 15:24:39 2012 -0800
@@ -1,8 +1,8 @@
 diff --git a/src/truetype/ttinterp.h b/src/truetype/ttinterp.h
-index 6d0fc03..5c21a36 100644
+index f433612..5ed3790 100644
 --- a/src/truetype/ttinterp.h
 +++ b/src/truetype/ttinterp.h
-@@ -139,6 +139,8 @@ FT_BEGIN_HEADER
+@@ -181,6 +181,8 @@ FT_BEGIN_HEADER
      FT_Size_Metrics    metrics;
      TT_Size_Metrics    tt_metrics; /* size metrics */
  
@@ -12,10 +12,10 @@
  
      FT_Int             curRange;  /* current code range number   */
 diff --git a/src/truetype/ttobjs.h b/src/truetype/ttobjs.h
-index 47e4129..adf5920 100644
+index 5c3cb06..6b52e80 100644
 --- a/src/truetype/ttobjs.h
 +++ b/src/truetype/ttobjs.h
-@@ -312,6 +312,8 @@ FT_BEGIN_HEADER
+@@ -313,6 +313,8 @@ FT_BEGIN_HEADER
  
      TT_CodeRangeTable  codeRangeTable;
  
--- a/pkg/manifests/system-library-freetype-2.p5m	Fri Jan 11 12:15:15 2013 -0800
+++ b/pkg/manifests/system-library-freetype-2.p5m	Thu Dec 27 15:24:39 2012 -0800
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -35,6 +35,7 @@
 file path=usr/include/freetype2/freetype/config/ftstdlib.h
 file path=usr/include/freetype2/freetype/freetype.h
 file path=usr/include/freetype2/freetype/ftadvanc.h
+file path=usr/include/freetype2/freetype/ftautoh.h
 file path=usr/include/freetype2/freetype/ftbbox.h
 file path=usr/include/freetype2/freetype/ftbdf.h
 file path=usr/include/freetype2/freetype/ftbitmap.h
@@ -86,6 +87,7 @@
 dir  path=usr/share/doc/freetype
 file path=usr/share/doc/freetype/VERSION.DLL
 file path=usr/share/doc/freetype/formats.txt
+file path=usr/share/doc/freetype/ft2-auto_hinter.html
 file path=usr/share/doc/freetype/ft2-base_interface.html
 file path=usr/share/doc/freetype/ft2-basic_types.html
 file path=usr/share/doc/freetype/ft2-bdf_fonts.html