- up to 2.3.11

Changed files:
    freetype-nprops.patch -> 1.2
    freetype.spec -> 1.147

diff --git a/freetype-nprops.patch b/freetype-nprops.patch
deleted file mode 100644 (file)
index d239a4a..0000000
--- a/freetype-nprops.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-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 0203ee830abf8f52c04773c7ba917822c7671e26..7299eb5cc918d4e93bde571dc8651fbcafd7ac2c 100644 (file)
--- a/freetype.spec
+++ b/freetype.spec
@@ -13,18 +13,17 @@ Summary(pt_BR.UTF-8):       Biblioteca de renderização de fontes TrueType
 Summary(ru.UTF-8):     Растеризатор шрифтов TrueType
 Summary(uk.UTF-8):     Растеризатор шрифтів TrueType
 Name:          freetype
-Version:       2.3.10
-Release:       2
+Version:       2.3.11
+Release:       1
 Epoch:         1
 License:       GPL or FTL
 Group:         Libraries
 Source0:       http://dl.sourceforge.net/freetype/%{name}-%{version}.tar.bz2
-# Source0-md5: b7a8a26cc137716a32b788664697d727
+# Source0-md5: 519c7cbf5cbd72ffa822c66844d3114c
 Source1:       http://dl.sourceforge.net/freetype/%{name}-doc-%{version}.tar.bz2
-# Source1-md5: 9bdd83c5b6559bdfb68984f0b3d1dc8c
+# Source1-md5: c9d75b659382aef80a8f86efcde08629
 Source2:       http://dl.sourceforge.net/freetype/ft2demos-%{version}.tar.bz2
-# Source2-md5: e6d762885ecc8222774f5063a1605e45
-Patch0:                %{name}-nprops.patch
+# Source2-md5: 7e3df8813fdbad22e996a5dfed7f7361
 URL:           http://www.freetype.org/
 BuildRequires: automake
 BuildRequires: python
@@ -188,7 +187,6 @@ Programy demonstracyjne do biblioteki FreeType.
 
 %prep
 %setup -q -a1 -a2
-%patch0 -p1
 
 %build
 CFLAGS="%{rpmcflags} \