[Frugalware-git] frugalware-current: freetype2-2.3.5-2-i686

[crazy]

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=3c7a98f8e2fdf7a3773c204bc1fa19bbd5cdff54

commit 3c7a98f8e2fdf7a3773c204bc1fa19bbd5cdff54
Author: crazy <crazy at frugalware.org>
Date:   Wed Jul 25 02:46:21 2007 +0200

freetype2-2.3.5-2-i686
* relbump ( ok from vmiklos )
* aded an patch to revert an commit triggered an
* segfault with some bitmap fonts
* ( for pre2 I don't have any other quick solution , sorry )
* aded comments to FB which point the commit and the
* bug report I've made about so voroskoi knows what is going on

diff --git a/source/lib/freetype2/FrugalBuild b/source/lib/freetype2/FrugalBuild
index cf95fe6..10311a4 100644
--- a/source/lib/freetype2/FrugalBuild
+++ b/source/lib/freetype2/FrugalBuild
@@ -4,7 +4,7 @@

pkgname=freetype2
pkgver=2.3.5
-pkgrel=1
+pkgrel=2
pkgdesc="TrueType font rendering library - 2.0 series (with bytecode interpreter)"
url="http://freetype.sourceforge.net"
groups=('lib')
@@ -13,10 +13,15 @@ depends=('zlib')
_F_cd_path="freetype-$pkgver"
up2date="lynx -dump 'http://sourceforge.net/project/showfiles.php?group_id=3157&package_id=3121'|grep 'freetype-' |sed -e 's/.*type-\(.*\).tar.bz2.*/\1/;q'"
source=(http://download.savannah.gnu.org/releases/freetype/freetype-$pkgver.tar.bz2 \
-	freetype-2.2.1-memcpy-fix.patch)
-signatures=("$source.sig" '')
+	freetype-2.2.1-memcpy-fix.patch revert_v.1.188.patch)
+# NOTE: added patch to *TEMP* revert : http://cvs.savannah.nongnu.org/viewvc/freetype2/src/truetype/ttgload.c?root=freetype&r1=1.187&r2=1.188
+# with that patch we segfault at TT_Load_Simple_Glyph() and looks like the bug(s) are triggered by some bitmap fonts
+# BUG REPORT : https://savannah.nongnu.org/bugs/index.php?20581  -- crazy --
+signatures=("$source.sig" '' '')

-build() {
+build()
+{
+
Fsed '^/\* \(#define TT_CONFIG_OPTION_BYTECODE_INTERPRETER\) \*/' '\1' include/freetype/config/ftoption.h
Fbuild
}
diff --git a/source/lib/freetype2/revert_v.1.188.patch b/source/lib/freetype2/revert_v.1.188.patch
new file mode 100644
index 0000000..5a6306e
--- /dev/null
+++ b/source/lib/freetype2/revert_v.1.188.patch
@@ -0,0 +1,32 @@
+diff -Naur freetype-2.3.5/src/truetype/ttgload.c freetype-2.3.5-p/src/truetype/ttgload.c
+--- freetype-2.3.5/src/truetype/ttgload.c	2007-07-01 14:24:23.000000000 +0200
++++ freetype-2.3.5-p/src/truetype/ttgload.c	2007-07-25 01:38:19.000000000 +0200
+@@ -250,7 +250,7 @@
+     FT_Byte         c, count;
+     FT_Vector       *vec, *vec_limit;
+     FT_Pos          x;
+-    FT_Short        *cont, *cont_limit, prev_cont;
++    FT_Short        *cont, *cont_limit;
+     FT_Int          xy_size = 0;
+
+
+@@ -267,18 +267,8 @@
+     if ( n_contours >= 0xFFF || p + ( n_contours + 1 ) * 2 > limit )
+       goto Invalid_Outline;
+
+-    cont[0] = prev_cont = FT_NEXT_USHORT( p );
+-    for ( cont++; cont < cont_limit; cont++ )
+-    {
++    for ( ; cont < cont_limit; cont++ )
+       cont[0] = FT_NEXT_USHORT( p );
+-      if ( cont[0] <= prev_cont )
+-      {
+-        /* unordered contours: this is invalid */
+-        error = FT_Err_Invalid_Table;
+-        goto Fail;
+-      }
+-      prev_cont = cont[0];
+-    }
+
+     n_points = 0;
+     if ( n_contours > 0 )