- rel 2; bugfix for pcf fonts

Changed files:
    freetype-nprops.patch -> 1.1
    freetype.spec -> 1.146

diff --git a/freetype-nprops.patch b/freetype-nprops.patch
new file mode 100644 (file)
index 0000000..d239a4a
--- /dev/null
+++ b/freetype-nprops.patch
@@ -0,0 +1,35 @@
+From 008686a12313c89168f5aef5074d46508ef4b774 Mon Sep 17 00:00:00 2001
+From: suzuki toshiya <mpsuzuki@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@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@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

diff --git a/freetype.spec b/freetype.spec
index 8a62329dc19fa5461105c1b1071e92848b21eb6e..0203ee830abf8f52c04773c7ba917822c7671e26 100644 (file)
--- a/freetype.spec
+++ b/freetype.spec
@@ -14,7 +14,7 @@ Summary(ru.UTF-8):    Растеризатор шрифтов TrueType
 Summary(uk.UTF-8):     Растеризатор шрифтів TrueType
 Name:          freetype
 Version:       2.3.10
-Release:       1
+Release:       2
 Epoch:         1
 License:       GPL or FTL
 Group:         Libraries
@@ -24,6 +24,7 @@ Source1:      http://dl.sourceforge.net/freetype/%{name}-doc-%{version}.tar.bz2
 # 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
@@ -187,6 +188,7 @@ Programy demonstracyjne do biblioteki FreeType.
 
 %prep
 %setup -q -a1 -a2
+%patch0 -p1
 
 %build
 CFLAGS="%{rpmcflags} \