Author: kkofler Update of /cvs/free/rpms/freetype-freeworld/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv13554/devel Modified Files: freetype-freeworld.spec Added Files: 0001-Fix-vertical-size-of-emboldened-glyphs.patch Log Message: * Sat Sep 21 2013 Kevin Kofler <Kevin(a)tigcc.ticalc.org&gt; 2.5.0.1-2 - 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: Behdad Esfahbod <behdad(a)behdad.org&gt; 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/devel/freetype-freeworld.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- freetype-freeworld.spec 15 Sep 2013 20:14:46 -0000 1.29 +++ freetype-freeworld.spec 21 Sep 2013 23:54:32 -0000 1.30 @@ -1,7 +1,7 @@ Summary: A free and portable font rendering engine Name: freetype-freeworld Version: 2.5.0.1 -Release: 1%{?dist} +Release: 2%{?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 @@ -12,6 +12,9 @@ # Enable otvalid and gxvalid modules Patch46: freetype-2.2.1-enable-valid.patch +# https://bugzilla.gnome.org/show_bug.cgi?id=686709 +Patch92: 0001-Fix-vertical-size-of-emboldened-glyphs.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) Provides: freetype-bytecode @@ -36,9 +39,11 @@ %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 +%patch92 -p1 -b .emboldened-glyphs %build @@ -84,6 +89,9 @@ %config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf %changelog +* Sat Sep 21 2013 Kevin Kofler <Kevin(a)tigcc.ticalc.org&gt; 2.5.0.1-2 +- Apply 0001-Fix-vertical-size-of-emboldened-glyphs.patch from Fedora + * Sun Sep 15 2013 Kevin Kofler <Kevin(a)tigcc.ticalc.org&gt; 2.5.0.1-1 - Update to 2.5.0.1 (matches Fedora freetype) - BuildRequires: libpng-devel