packages: freetype/freetype.spec, freetype/freetype-nprops.patch (NEW) - re...

[arekm]

Author: arekm                        Date: Sat Oct 10 18:51:53 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 2; bugfix for pcf fonts

---- Files affected:
packages/freetype:
   freetype.spec (1.145 -> 1.146) , freetype-nprops.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/freetype/freetype.spec
diff -u packages/freetype/freetype.spec:1.145 packages/freetype/freetype.spec:1.146
--- packages/freetype/freetype.spec:1.145	Thu Oct  8 15:51:23 2009
+++ packages/freetype/freetype.spec	Sat Oct 10 20:51:48 2009
@@ -15,7 +15,7 @@
 Summary(uk.UTF-8):	Растеризатор шрифтів TrueType
 Name:		freetype
 Version:	2.3.10
-Release:	1
+Release:	2
 Epoch:		1
 License:	GPL or FTL
 Group:		Libraries
@@ -25,6 +25,7 @@
 # Source1-md5:	9bdd83c5b6559bdfb68984f0b3d1dc8c
 Source2:	http://dl.sourceforge.net/freetype/ft2demos-%{version}.tar.bz2
 # Source2-md5:	e6d762885ecc8222774f5063a1605e45
+Patch0:		%{name}-nprops.patch
 URL:		http://www.freetype.org/
 BuildRequires:	automake
 BuildRequires:	python
@@ -188,6 +189,7 @@
 
 %prep
 %setup -q -a1 -a2
+%patch0 -p1
 
 %build
 CFLAGS="%{rpmcflags} \
@@ -263,6 +265,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.146  2009/10/10 18:51:48  arekm
+- rel 2; bugfix for pcf fonts
+
 Revision 1.145  2009/10/08 13:51:23  arekm
 - up to 2.3.10
 

================================================================
Index: packages/freetype/freetype-nprops.patch
diff -u /dev/null packages/freetype/freetype-nprops.patch:1.1
--- /dev/null	Sat Oct 10 20:51:53 2009
+++ packages/freetype/freetype-nprops.patch	Sat Oct 10 20:51:48 2009
@@ -0,0 +1,35 @@
+From 008686a12313c89168f5aef5074d46508ef4b774 Mon Sep 17 00:00:00 2001
+From: suzuki toshiya <mpsuzuki at hiroshima-u.ac.jp>
+Date: Sat, 10 Oct 2009 17:07:16 +0000
+Subject: [pcf] Fix a bug in the nprops truncation, Gentoo bug #288357.
+
+---
+diff --git a/ChangeLog b/ChangeLog
+index 3363b90..49f0d97 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,9 @@
++2009-10-10  suzuki toshiya  <mpsuzuki at hiroshima-u.ac.jp>
++
++	* src/pcf/pcfread.c (pcf_get_properties): Fix a bug in the nprops
++	truncation.  Reported by Martin von Gagern and Peter Volkov.
++	https://bugs.gentoo.org/288357 and https://bugs.gentoo.org/288256
++
+ 2009-10-06  Werner Lemberg  <wl at gnu.org>
+ 
+ 	* Version 2.3.10 released.
+diff --git a/src/pcf/pcfread.c b/src/pcf/pcfread.c
+index a60505b..08becf9 100644
+--- a/src/pcf/pcfread.c
++++ b/src/pcf/pcfread.c
+@@ -436,7 +436,7 @@ THE SOFTWARE.
+     FT_TRACE4(( "  nprop = %d (truncate %d props)\n",
+                 (int)nprops, nprops - (int)nprops ));
+ 
+-    nprops = nprops - (int)nprops;
++    nprops = (int)nprops;
+ 
+     /* rough estimate */
+     if ( nprops > size / PCF_PROPERTY_SIZE )
+--
+cgit v0.8.2.1
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/freetype/freetype.spec?r1=1.145&r2=1.146&f=u