From 07386eb854b4131b1d82b4bbbf99cac0bd1321218f1645f6c2329e080a1812f8 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Fri, 4 Jun 2010 12:49:12 +0000 Subject: [PATCH] Accepting request 41101 from M17N checked in (request 41101) OBS-URL: https://build.opensuse.org/request/show/41101 OBS-URL: https://build.opensuse.org/package/show/M17N/freetype2?expand=0&rev=28 --- freetype2-bitmap-foundry.patch | 4 ++-- freetype2.changes | 5 ----- freetype2.spec | 4 +++- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/freetype2-bitmap-foundry.patch b/freetype2-bitmap-foundry.patch index cf5205b..1f80e76 100644 --- a/freetype2-bitmap-foundry.patch +++ b/freetype2-bitmap-foundry.patch @@ -1,7 +1,7 @@ Index: freetype-2.3.12/src/pcf/pcfread.c =================================================================== --- freetype-2.3.12.orig/src/pcf/pcfread.c 2009-10-10 19:32:28.000000000 +0200 -+++ freetype-2.3.12/src/pcf/pcfread.c 2010-06-04 13:44:03.767338504 +0200 ++++ freetype-2.3.12/src/pcf/pcfread.c 2010-03-31 16:23:42.000000000 +0200 @@ -1171,8 +1171,34 @@ THE SOFTWARE. prop = pcf_find_property( face, "FAMILY_NAME" ); if ( prop && prop->isString ) @@ -14,7 +14,7 @@ Index: freetype-2.3.12/src/pcf/pcfread.c + PCF_Property point_size_prop = pcf_find_property( face, "POINT_SIZE" ); + PCF_Property average_width_prop = pcf_find_property( face, "AVERAGE_WIDTH" ); + if ( point_size_prop != NULL && average_width_prop != NULL) { -+ if ( average_width_prop->value.l >= point_size_prop->value.l ) { ++ if ( average_width_prop->value.integer >= point_size_prop->value.integer ) { + /* This font is at least square shaped or even wider */ + wide = 1; + l += ft_strlen( " Wide"); diff --git a/freetype2.changes b/freetype2.changes index 0f24cd9..f45ef3c 100644 --- a/freetype2.changes +++ b/freetype2.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Fri Jun 4 11:09:21 UTC 2010 - coolo@novell.com - -- reenable bitmap foundaries (bnc#596559) - ------------------------------------------------------------------- Sat Apr 24 09:20:43 UTC 2010 - coolo@novell.com diff --git a/freetype2.spec b/freetype2.spec index 790aecf..457f5dc 100644 --- a/freetype2.spec +++ b/freetype2.spec @@ -95,7 +95,9 @@ It also contains a small tutorial for using that library. %define enable_bytecode_interpreter 1 %define enable_subpixel_rendering 0 %setup -q -n freetype-%{version} -a 1 -%patch3 -p 1 -b .bitmap-foundry +# Patch does still apply but no longer compiles and it's unclear +# to me who still needs it - it used to work around qt3 bug afair +##%patch3 -p 1 -b .bitmap-foundry %patch4 -p 1 -b .ft2-stream-compat #%patch8 -p 1 %patch9 -p 1