From 9496ba14ab97d6fb2ed264eaca5dc461eb6cb9dc Mon Sep 17 00:00:00 2001
From: Marek Kasik <mkasik@redhat.com>
Date: Tue, 28 Jul 2015 15:38:33 +0200
Subject: [PATCH] Don't use `hmtx' table for LSB

---
 ...f-Don-t-use-hmtx-table-for-LSB-45520.patch | 26 +++++++++++++++++++
 freetype.spec                                 |  9 ++++++-
 2 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 0001-cff-Don-t-use-hmtx-table-for-LSB-45520.patch

diff --git a/0001-cff-Don-t-use-hmtx-table-for-LSB-45520.patch b/0001-cff-Don-t-use-hmtx-table-for-LSB-45520.patch
new file mode 100644
index 0000000..cd289b4
--- /dev/null
+++ b/0001-cff-Don-t-use-hmtx-table-for-LSB-45520.patch
@@ -0,0 +1,26 @@
+From b650dfbb0b0700440cc88da31f97cec45b4140de Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <matthias.clasen@gmail.com>
+Date: Sun, 26 Jul 2015 21:08:34 +0200
+Subject: [PATCH] [cff] Don't use `hmtx' table for LSB (#45520).
+
+* src/cff/cffgload.c (cff_slot_load): Use `htmx' table for advance
+width only.  Bug introduced 2015-04-10.
+
+diff --git a/src/cff/cffgload.c b/src/cff/cffgload.c
+index 43054f8..a075ddc 100644
+--- a/src/cff/cffgload.c
++++ b/src/cff/cffgload.c
+@@ -3064,9 +3064,7 @@
+         metrics->width  = cbox.xMax - cbox.xMin;
+         metrics->height = cbox.yMax - cbox.yMin;
+ 
+-        if ( !face->horizontal.number_Of_HMetrics )
+-          metrics->horiBearingX = cbox.xMin;
+-
++        metrics->horiBearingX = cbox.xMin;
+         metrics->horiBearingY = cbox.yMax;
+ 
+         if ( has_vertical_info )
+-- 
+2.4.3
+
diff --git a/freetype.spec b/freetype.spec
index e0c01a0..4bea3c2 100644
--- a/freetype.spec
+++ b/freetype.spec
@@ -9,7 +9,7 @@
 Summary: A free and portable font rendering engine
 Name: freetype
 Version: 2.6.0
-Release: 2%{?dist}
+Release: 3%{?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
@@ -18,6 +18,8 @@ Source1: http://download.savannah.gnu.org/releases/freetype/freetype-doc-%{versi
 Source2: http://download.savannah.gnu.org/releases/freetype/ft2demos-%{version26}.tar.bz2
 Source3: ftconfig.h
 
+Patch0:   0001-cff-Don-t-use-hmtx-table-for-LSB-45520.patch
+
 Patch21:  freetype-2.3.0-enable-spr.patch
 
 # Enable otvalid and gxvalid modules
@@ -80,6 +82,8 @@ FreeType.
 %prep
 %setup -q -b 1 -a 2 -n %{name}-%{version26}
 
+%patch0  -p1 -b .hmtx-table
+
 %if %{?_with_subpixel_rendering:1}%{!?_with_subpixel_rendering:0}
 %patch21  -p1 -b .enable-spr
 %endif
@@ -214,6 +218,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*
 
 %changelog
+* Tue Jul 28 2015 Marek Kasik <mkasik@redhat.com> - 2.6.0-3
+- Don't use `hmtx' table for LSB
+
 * Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.6.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild