rpms/freetype-freeworld/F-18 0001-Fix-vertical-size-of-emboldened-glyphs.patch, NONE, 1.1 freetype-freeworld.spec, 1.27, 1.28

[Kevin Kofler]

Author: kkofler

Update of /cvs/free/rpms/freetype-freeworld/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv17728/F-18

Modified Files:
	freetype-freeworld.spec 
Added Files:
	0001-Fix-vertical-size-of-emboldened-glyphs.patch 
Log Message:
* Sun Sep 22 2013 Kevin Kofler <Kevin at tigcc.ticalc.org> 2.4.10-4
- Apply 0001-Fix-vertical-size-of-emboldened-glyphs.patch from Fedora

0001-Fix-vertical-size-of-emboldened-glyphs.patch:
 ftsynth.c |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE 0001-Fix-vertical-size-of-emboldened-glyphs.patch ---
>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



Index: freetype-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/freetype-freeworld/F-18/freetype-freeworld.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- freetype-freeworld.spec	19 Mar 2013 17:27:08 -0000	1.27
+++ freetype-freeworld.spec	22 Sep 2013 00:03:23 -0000	1.28
@@ -1,7 +1,7 @@
 Summary: A free and portable font rendering engine
 Name: freetype-freeworld
 Version: 2.4.10
-Release: 3%{?dist}
+Release: 4%{?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
@@ -19,6 +19,9 @@
 # https://bugzilla.redhat.com/show_bug.cgi?id=891457
 Patch90:  freetype-2.4.10-fix-emboldening.patch
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=686709
+Patch91:  0001-Fix-vertical-size-of-emboldened-glyphs.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 
 Provides: freetype-bytecode
@@ -42,13 +45,14 @@
 %prep
 %setup -q -n freetype-%{version}
 
-%patch21  -p1 -b .enable-spr
+%patch21 -p1 -b .enable-spr
 
-%patch46  -p1 -b .enable-valid
+%patch46 -p1 -b .enable-valid
 
 %patch89 -p1 -b .CVE-2012-5669
 
 %patch90 -p1 -b .fix-emboldening
+%patch91 -p1 -b .emboldened-glyphs
 
 
 %build
@@ -94,6 +98,9 @@
 %config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
 
 %changelog
+* Sun Sep 22 2013 Kevin Kofler <Kevin at tigcc.ticalc.org> 2.4.10-4
+- Apply 0001-Fix-vertical-size-of-emboldened-glyphs.patch from Fedora
+
 * Tue Mar 19 2013 Kevin Kofler <Kevin at tigcc.ticalc.org> 2.4.10-3
 - Add freetype-2.4.10-fix-emboldening.patch from Fedora freetype (rh#891457)
 - Fix License tag