[patch] freetype fix

freetype.patch (text/plain), 4.38 KB, created by Bernard Edlington on 2005-03-29 08:25:31 UTC

diff -u --recursive --new-file freetype/files/freetype-2.1.9-fix_bci2.patch freetype.tmp/files/freetype-2.1.9-fix_bci2.patch
--- freetype/files/freetype-2.1.9-fix_bci2.patch	1970-01-01 09:00:00.000000000 +0900
+++ freetype.tmp/files/freetype-2.1.9-fix_bci2.patch	2005-03-30 01:22:41.592672896 +0900
@@ -0,0 +1,36 @@
+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 );
+ 
+*** freetype-2.1.9/include/freetype/config/ftoption.h	Wed Mar 30 00:23:10 2005
+--- freetype-2.1.9.patched/include/freetype/config/ftoption.h	Wed Mar 30 00:25:10 2005
+***************
+*** 436,442 ****
+    /*   Do not #undef this macro here, since the build system might         */
+    /*   define it for certain configurations only.                          */
+    /*                                                                       */
+! /* #define  TT_CONFIG_OPTION_BYTECODE_INTERPRETER */
+  
+  
+    /*************************************************************************/
+--- 436,442 ----
+    /*   Do not #undef this macro here, since the build system might         */
+    /*   define it for certain configurations only.                          */
+    /*                                                                       */
+! #define  TT_CONFIG_OPTION_BYTECODE_INTERPRETER
+  
+  
+    /*************************************************************************/
diff -u --recursive --new-file freetype/freetype-2.1.9-r2.ebuild freetype.tmp/freetype-2.1.9-r2.ebuild
--- freetype/freetype-2.1.9-r2.ebuild	1970-01-01 09:00:00.000000000 +0900
+++ freetype.tmp/freetype-2.1.9-r2.ebuild	2005-03-30 01:22:20.824830088 +0900
@@ -0,0 +1,76 @@
+# Copyright 1999-2005 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-r2.ebuild,v 1.16 2005/03/30 19:40:32 bernie 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 )"
+
+LICENSE="FTL GPL-2"
+SLOT="2"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 ppc-macos s390 sparc x86"
+#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}
+	!<www-client/mozilla-1.7.3-r3
+	!<www-client/mozilla-firefox-1.0-r3
+	!<mail-client/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_bci2.patch
+
+	gnuconfig_update ${S}
+	uclibctoolize
+	epunt_cxx
+}
+
+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
+		die "Could not enable Bytecode Interpreter!"
+	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/*
+
+}