[freetype] Update to 2.4.12

[mkasik]

commit 9d3d1839675e1597ab9a42f8e9d47c2a75994075
Author: Marek Kasik <mkasik at redhat.com>
Date:   Thu May 9 15:40:34 2013 +0200

    Update to 2.4.12
    
    Enable Adobe CFF engine
    Resolves: #959771

 .gitignore                                    |    3 +
 freetype-2.4.11-fix-emboldening.patch         |  253 -------------------------
 freetype-2.4.12-enable-adobe-cff-engine.patch |   11 +
 freetype-multilib.patch                       |   26 ++--
 freetype.spec                                 |   16 +-
 sources                                       |    6 +-
 6 files changed, 41 insertions(+), 274 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0609c9e..0a652df 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,3 +31,6 @@ ft2demos-2.4.2.tar.bz2
 /freetype-2.4.11.tar.bz2
 /freetype-doc-2.4.11.tar.bz2
 /ft2demos-2.4.11.tar.bz2
+/freetype-2.4.12.tar.bz2
+/freetype-doc-2.4.12.tar.bz2
+/ft2demos-2.4.12.tar.bz2
diff --git a/freetype-2.4.12-enable-adobe-cff-engine.patch b/freetype-2.4.12-enable-adobe-cff-engine.patch
new file mode 100644
index 0000000..db11a44
--- /dev/null
+++ b/freetype-2.4.12-enable-adobe-cff-engine.patch
@@ -0,0 +1,11 @@
+--- freetype-2.4.12/src/cff/cffobjs.c
++++ freetype-2.4.12/src/cff/cffobjs.c
+@@ -1056,7 +1056,7 @@
+ 
+ 
+     /* set default property values */
+-    driver->hinting_engine    = FT_CFF_HINTING_FREETYPE;
++    driver->hinting_engine    = FT_CFF_HINTING_ADOBE;
+     driver->no_stem_darkening = FALSE;
+ 
+     return FT_Err_Ok;
diff --git a/freetype-multilib.patch b/freetype-multilib.patch
index f369adb..e8f40d6 100644
--- a/freetype-multilib.patch
+++ b/freetype-multilib.patch
@@ -1,18 +1,18 @@
---- freetype-2.2.1/builds/unix/freetype-config.in.multilib	2006-07-27 18:50:40.000000000 -0400
-+++ freetype-2.2.1/builds/unix/freetype-config.in	2006-07-27 18:58:13.000000000 -0400
-@@ -9,11 +9,11 @@
- # indicate that you have read the license and understand and accept it
- # fully.
+--- freetype-2.4.12/builds/unix/freetype-config.in
++++ freetype-2.4.12/builds/unix/freetype-config.in
+@@ -12,11 +12,11 @@
+ LC_ALL=C
+ export LC_ALL
  
--prefix=@prefix@
--exec_prefix=@exec_prefix@
+-prefix="%prefix%"
+-exec_prefix="%exec_prefix%"
 +prefix=`pkg-config --variable prefix freetype2`
 +exec_prefix=`pkg-config --variable exec_prefix freetype2`
- exec_prefix_set=no
--includedir=@includedir@
--libdir=@libdir@
+ exec_prefix_set="no"
+-includedir="%includedir%"
+-libdir="%libdir%"
 +includedir=`pkg-config --variable includedir freetype2`
 +libdir=`pkg-config --variable libdir freetype2`
- enable_shared=@build_libtool_libs@
- wl=@wl@
- hardcode_libdir_flag_spec='@hardcode_libdir_flag_spec@'
+ enable_shared="%build_libtool_libs%"
+ 
+ usage()
diff --git a/freetype.spec b/freetype.spec
index 1657990..cd95f4c 100644
--- a/freetype.spec
+++ b/freetype.spec
@@ -6,8 +6,8 @@
 
 Summary: A free and portable font rendering engine
 Name: freetype
-Version: 2.4.11
-Release: 3%{?dist}
+Version: 2.4.12
+Release: 1%{?dist}
 License: (FTL or GPLv2+) and BSD and MIT and Public Domain and zlib with acknowledgement
 Group: System Environment/Libraries
 URL: http://www.freetype.org
@@ -25,8 +25,8 @@ Patch47:  freetype-2.3.11-more-demos.patch
 # Fix multilib conflicts
 Patch88:  freetype-multilib.patch
 
-# https://bugzilla.redhat.com/show_bug.cgi?id=891457
-Patch89:  freetype-2.4.11-fix-emboldening.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=959771
+Patch89:  freetype-2.4.12-enable-adobe-cff-engine.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 
@@ -87,7 +87,8 @@ pushd ft2demos-%{version}
 popd
 
 %patch88 -p1 -b .multilib
-%patch89 -p1 -b .emboldening
+
+%patch89 -p1 -b .adobe-cff
 
 %build
 
@@ -220,6 +221,11 @@ rm -rf $RPM_BUILD_ROOT
 %doc docs/tutorial
 
 %changelog
+* Thu May  9 2013 Marek Kasik <mkasik at redhat.com> - 2.4.12-1
+- Update to 2.4.12
+- Enable Adobe CFF engine
+- Resolves: #959771
+
 * Tue Mar 19 2013 Marek Kasik <mkasik at redhat.com> - 2.4.11-3
 - Fix emboldening:
     - split out MSB function
diff --git a/sources b/sources
index b71ef74..55bb041 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-b93435488942486c8d0ca22e8f768034  freetype-2.4.11.tar.bz2
-20f148103e069093f53584ce5ba16581  freetype-doc-2.4.11.tar.bz2
-4c751f2b02bd181102c377a6396d8454  ft2demos-2.4.11.tar.bz2
+3463102764315eb86c0d3c2e1f3ffb7d  freetype-2.4.12.tar.bz2
+e3955ef324b2ceea74dc849e07fbfb7a  freetype-doc-2.4.12.tar.bz2
+79d2329da1a118d559ec6bd77fddb210  ft2demos-2.4.12.tar.bz2