[freetype/f19] Fix vertical size of emboldened glyphs

[mkasik]

commit e3a95932eb681d9f3b784831c85c745d14832992
Author: Marek Kasik <mkasik at redhat.com>
Date:   Fri Sep 20 16:34:27 2013 +0200

    Fix vertical size of emboldened glyphs

 0001-Fix-vertical-size-of-emboldened-glyphs.patch |   45 +++++++++++++++++++++
 freetype.spec                                     |    9 ++++-
 2 files changed, 53 insertions(+), 1 deletions(-)
---
diff --git a/0001-Fix-vertical-size-of-emboldened-glyphs.patch b/0001-Fix-vertical-size-of-emboldened-glyphs.patch
new file mode 100644
index 0000000..330d1ce
--- /dev/null
+++ b/0001-Fix-vertical-size-of-emboldened-glyphs.patch
@@ -0,0 +1,45 @@
+From 31e726d939e7b79506d11164d259c9789e429761 Mon Sep 17 00:00:00 2001
+From: Behdad Esfahbod <behdad at behdad.org>
+Date: Fri, 20 Sep 2013 07:20:53 +0200
+Subject: [PATCH] Fix vertical size of emboldened glyphs.
+
+Cf. https://bugzilla.gnome.org/show_bug.cgi?id=686709
+
+* src/base/ftsynth.c (FT_GlyphSlot_Embolden): Adjust `horiBearingY'
+also.
+---
+ src/base/ftsynth.c | 11 ++++++-----
+ 1 files changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/src/base/ftsynth.c b/src/base/ftsynth.c
+index 241d37f..3098a60 100644
+--- a/src/base/ftsynth.c
++++ b/src/base/ftsynth.c
+@@ -4,7 +4,7 @@
+ /*                                                                         */
+ /*    FreeType synthesizing code for emboldening and slanting (body).      */
+ /*                                                                         */
+-/*  Copyright 2000-2006, 2010, 2012 by                                     */
++/*  Copyright 2000-2006, 2010, 2012, 2013 by                               */
+ /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
+ /*                                                                         */
+ /*  This file is part of the FreeType project, and may only be used,       */
+@@ -139,10 +139,11 @@
+     if ( slot->advance.y )
+       slot->advance.y += ystr;
+ 
+-    slot->metrics.width       += xstr;
+-    slot->metrics.height      += ystr;
+-    slot->metrics.horiAdvance += xstr;
+-    slot->metrics.vertAdvance += ystr;
++    slot->metrics.width        += xstr;
++    slot->metrics.height       += ystr;
++    slot->metrics.horiAdvance  += xstr;
++    slot->metrics.vertAdvance  += ystr;
++    slot->metrics.horiBearingY += ystr;
+ 
+     /* XXX: 16-bit overflow case must be excluded before here */
+     if ( slot->format == FT_GLYPH_FORMAT_BITMAP )
+-- 
+1.8.3.1
+
diff --git a/freetype.spec b/freetype.spec
index 8d7c720..adedf61 100644
--- a/freetype.spec
+++ b/freetype.spec
@@ -7,7 +7,7 @@
 Summary: A free and portable font rendering engine
 Name: freetype
 Version: 2.4.11
-Release: 6%{?dist}
+Release: 7%{?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
@@ -29,6 +29,9 @@ Patch88:  freetype-multilib.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=891457
 Patch89:  freetype-2.4.11-fix-emboldening.patch
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=686709
+Patch90:  0001-Fix-vertical-size-of-emboldened-glyphs.patch
+
 Buildroot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 
 BuildRequires: libX11-devel
@@ -89,6 +92,7 @@ popd
 
 %patch88 -p1 -b .multilib
 %patch89 -p1 -b .emboldening
+%patch90 -p1 -b .emboldened-glyphs
 
 %build
 
@@ -210,6 +214,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc docs/tutorial
 
 %changelog
+* Fri Sep 20 2013 Marek Kasik <mkasik at redhat.com> - 2.4.11-7
+- Fix vertical size of emboldened glyphs
+
 * Wed May 29 2013 Peter Robinson <pbrobinson at fedoraproject.org> 2.4.11-6
 - Add aarch64 to 64 bit arch list