Accepting request 41101 from M17N

Copy from M17N/freetype2 based on submit request 41101 from user coolo

OBS-URL: https://build.opensuse.org/request/show/41101
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/freetype2?expand=0&rev=24
This commit is contained in:
OBS User autobuild 2010-06-04 12:49:13 +00:00 committed by Git OBS Bridge
parent 2c61c7f0c6
commit cf43e9efff
4 changed files with 10 additions and 7 deletions

View File

@ -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-03-31 16:23:42.000000000 +0200
+++ freetype-2.3.12/src/pcf/pcfread.c 2010-06-04 13:44:03.767338504 +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.integer >= point_size_prop->value.integer ) {
+ if ( average_width_prop->value.l >= point_size_prop->value.l ) {
+ /* This font is at least square shaped or even wider */
+ wide = 1;
+ l += ft_strlen( " Wide");

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
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

View File

@ -29,7 +29,7 @@ Obsoletes: freetype2-64bit
%endif
#
Version: 2.3.12
Release: 5
Release: 6
Url: http://www.freetype.org
Summary: A TrueType Font Library
# CVS repository:
@ -95,9 +95,7 @@ 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
# 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
%patch3 -p 1 -b .bitmap-foundry
%patch4 -p 1 -b .ft2-stream-compat
#%patch8 -p 1
%patch9 -p 1

View File

@ -25,7 +25,7 @@ Group: Productivity/Publishing/Other
AutoReqProv: on
Supplements: fonts-config
Version: 2.3.12
Release: 5
Release: 6
%define freetype_version %{version}
Url: http://www.freetype.org
Summary: Freetype2 Utilities and Demo Programs