add patch to fix some possible issues

5 files changed, 103 insertions, 1 deletions

diff --git a/media-libs/freetype/ChangeLog b/media-libs/freetype/ChangeLog
index 25e85ea84905..ea6d85215e17 100644
--- a/media-libs/freetype/ChangeLog
+++ b/media-libs/freetype/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/freetype
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v 1.60 2004/12/22 15:59:06 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v 1.61 2004/12/24 11:31:14 foser Exp $
+
+*freetype-2.1.9-r1 (24 Dec 2004)
+
+  24 Dec 2004; foser <foser@gentoo.org> freetype-2.1.9-r1.ebuild :
+  Add a patch to fix a bytecode interpreter bug (#75424)
 
   22 Dec 2004; foser <foser@gentoo.org> freetype-2.1.9.ebuild :
   Add block for libwmf which wont build with this version
diff --git a/media-libs/freetype/Manifest b/media-libs/freetype/Manifest
index e6813d5a2031..8775a9966f8e 100644
--- a/media-libs/freetype/Manifest
+++ b/media-libs/freetype/Manifest
@@ -4,9 +4,12 @@ MD5 9ad462d9747885cff74988403fbb22f4 freetype-2.1.9.ebuild 2092
 MD5 5f4d3c6362a343092a7239210559dbf5 freetype-1.3.1-r3.ebuild 2740
 MD5 0f912ec38c5d8dec282bbdec6007dcc9 ChangeLog 9229
 MD5 68a04e23ccfb7971cff8ce012aee659c metadata.xml 221
+MD5 3a2bf0e9cc1362b0ab277eff12cf8506 freetype-2.1.9-r1.ebuild 2131
+MD5 6c404648e3cb8f86b329f7dac5d70cc8 files/freetype-2.1.9-fix_bci.patch 643
 MD5 10bd432787c1a182edece351dbf82809 files/config.mk 1240
 MD5 d42207bb27a2046e454b706339adaa25 files/digest-freetype-1.3.1-r3 136
 MD5 d42207bb27a2046e454b706339adaa25 files/digest-freetype-1.3.1-r4 136
 MD5 29bbc2c883bf52623f42dd235cd23fd6 files/digest-freetype-2.1.9 132
 MD5 4889d3ad3f18d1c357b3d707c7b71f1c files/digest-freetype-2.1.5-r1 67
+MD5 29bbc2c883bf52623f42dd235cd23fd6 files/digest-freetype-2.1.9-r1 132
 MD5 eea0ebe9b39158ab0fa0b131c284930f files/2.1/freetype-2.1.5-autohint-cjkfonts-20031105.patch 65828
diff --git a/media-libs/freetype/files/digest-freetype-2.1.9-r1 b/media-libs/freetype/files/digest-freetype-2.1.9-r1
new file mode 100644
index 000000000000..54076885fd84
--- /dev/null
+++ b/media-libs/freetype/files/digest-freetype-2.1.9-r1
@@ -0,0 +1,2 @@
+MD5 ec1b903e4be5f073caa72458ea58c29c freetype-2.1.9.tar.bz2 992394
+MD5 db77177afe35955f55bcaa2953724b78 ftdocs-2.1.9.tar.bz2 219666
diff --git a/media-libs/freetype/files/freetype-2.1.9-fix_bci.patch b/media-libs/freetype/files/freetype-2.1.9-fix_bci.patch
new file mode 100644
index 000000000000..792146d94404
--- /dev/null
+++ b/media-libs/freetype/files/freetype-2.1.9-fix_bci.patch
@@ -0,0 +1,17 @@
+diff -x '*~' -uNr freetype-2.1.9/src/truetype/ttgload.c freetype-2.1.9.patched/src/truetype/ttgload.c
+--- freetype-2.1.9/src/truetype/ttgload.c	2004-06-21 23:16:56.000000000 +0200
++++ freetype-2.1.9.patched/src/truetype/ttgload.c	2004-12-24 11:57:59.349364992 +0100
+@@ -795,12 +795,9 @@
+     if ( IS_HINTED( load->load_flags ) )
+     {
+       FT_Pos  x = zone->org[n_points-4].x;
+-      FT_Pos  y = zone->org[n_points-2].y;
+-
+ 
+       x = FT_PIX_ROUND( x ) - x;
+-      y = FT_PIX_ROUND( y ) - y;
+-      translate_array( n_points, zone->org, x, y );
++      translate_array( n_points, zone->org, x, 0 );
+ 
+       org_to_cur( n_points, zone );
+ 
diff --git a/media-libs/freetype/freetype-2.1.9-r1.ebuild b/media-libs/freetype/freetype-2.1.9-r1.ebuild
new file mode 100644
index 000000000000..da0d65598174
--- /dev/null
+++ b/media-libs/freetype/freetype-2.1.9-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.1.9-r1.ebuild,v 1.1 2004/12/24 11:31:14 foser Exp $
+
+inherit eutils flag-o-matic gnuconfig libtool
+
+SPV="`echo ${PV} | cut -d. -f1,2`"
+
+DESCRIPTION="A high-quality and portable font engine"
+HOMEPAGE="http://www.freetype.org/"
+SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.bz2
+	doc? ( mirror://sourceforge/${PN}/ftdocs-${PV}.tar.bz2 )"
+
+SLOT="2"
+LICENSE="FTL GPL-2"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~ia64 ~amd64 ~ppc64 ~mips"
+#IUSE="zlib bindist cjk doc"
+IUSE="zlib bindist doc"
+
+# The RDEPEND below makes sure that if there is a version of moz/ff/tb
+# installed, then it will have the freetype-2.1.8+ binary compatibility patch.
+# Otherwise updating freetype will cause moz/ff/tb crashes.  #59849
+# 20 Nov 2004 agriffis
+DEPEND="virtual/libc
+	zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}
+	!<net-www/mozilla-1.7.3-r3
+	!<net-www/mozilla-firefox-1.0-r3
+	!<net-www/mozilla-thunderbird-0.9-r3
+	!<media-libs/libwmf-0.2.8.2"
+
+src_unpack() {
+
+	unpack ${A}
+
+	cd ${S}
+	# add autohint patch from http://www.kde.gr.jp/~akito/patch/freetype2/
+	# FIXME : patch hasn't been updated yet
+	# use cjk && epatch ${FILESDIR}/${SPV}/${P}-autohint-cjkfonts-20031130.patch
+	epatch ${FILESDIR}/${P}-fix_bci.patch
+
+	gnuconfig_update ${S}
+	uclibctoolize
+}
+
+src_compile() {
+
+	# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=118021
+	append-flags "-fno-strict-aliasing"
+
+	use bindist || append-flags "${CFLAGS} -DTT_CONFIG_OPTION_BYTECODE_INTERPRETER"
+
+	make setup CFG="--host=${CHOST} --prefix=/usr `use_with zlib` --libdir=/usr/$(get_libdir)" unix || die
+
+	emake || die
+
+	# Just a check to see if the Bytecode Interpreter was enabled ...
+	if [ -z "`grep TT_Goto_CodeRange ${S}/objs/.libs/libfreetype.so`" ]
+	then
+		ewarn "Bytecode Interpreter is disabled."
+	fi
+
+}
+
+src_install() {
+
+	# make prefix=${D}/usr install || die
+	make DESTDIR="${D}" install || die
+
+	dodoc ChangeLog README
+	dodoc docs/{CHANGES,CUSTOMIZE,DEBUG,*.txt,PATENTS,TODO}
+
+	use doc && dohtml -r docs/*
+
+}