Re-add -fno-strict-aliasing workaround for gnustep as reported by truedfx.

(Portage version: 2.1.3.5)

3 files changed, 136 insertions, 1 deletions

diff --git a/media-libs/freetype/ChangeLog b/media-libs/freetype/ChangeLog
index 250d31591fdb..7ba30190aadc 100644
--- a/media-libs/freetype/ChangeLog
+++ b/media-libs/freetype/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/freetype
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v 1.153 2007/08/11 00:37:30 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v 1.154 2007/08/24 22:42:01 dirtyepic Exp $
+
+*freetype-2.3.5-r1 (24 Aug 2007)
+
+  24 Aug 2007; Ryan Hill <dirtyepic@gentoo.org> +freetype-2.3.5-r1.ebuild:
+  Re-add -fno-strict-aliasing workaround for gnustep as reported by truedfx.
 
   11 Aug 2007; Ryan Hill <dirtyepic@gentoo.org>
   +files/freetype-2.3.5-crossbuild.patch, freetype-2.3.4-r2.ebuild,
diff --git a/media-libs/freetype/files/digest-freetype-2.3.5-r1 b/media-libs/freetype/files/digest-freetype-2.3.5-r1
new file mode 100644
index 000000000000..cf88705d8bcd
--- /dev/null
+++ b/media-libs/freetype/files/digest-freetype-2.3.5-r1
@@ -0,0 +1,9 @@
+MD5 65234327c5ac46ee00ebda15995d4c1c freetype-2.3.5.tar.bz2 1279861
+RMD160 2a97cb1c3d93572c094d5d2890d12445ef2786d4 freetype-2.3.5.tar.bz2 1279861
+SHA256 1b357a3a1106c78c80dfd25e3854c3faa9a3dfc7063a4a1e5404e70c241d677e freetype-2.3.5.tar.bz2 1279861
+MD5 8f443368764f7cd776749e0143f423dd freetype-doc-2.3.5.tar.bz2 98644
+RMD160 d0a5cbe51eceb6c4a3a8eaaf4e3d99c2ca02266f freetype-doc-2.3.5.tar.bz2 98644
+SHA256 9c37aee42427feaaec7a276267f8c8ad771cb81033066bdf452c731fa41e4b0b freetype-doc-2.3.5.tar.bz2 98644
+MD5 b966a4dfbf21a66593c2f12f68590c3c ft2demos-2.3.5.tar.gz 203020
+RMD160 cf469582ea42ec9886e1482ffbe32a17e5aa974f ft2demos-2.3.5.tar.gz 203020
+SHA256 219d40fd0c9340a4519b7cc317eca8efa92d9751b7e2c6b5243b91c3e72604ce ft2demos-2.3.5.tar.gz 203020
diff --git a/media-libs/freetype/freetype-2.3.5-r1.ebuild b/media-libs/freetype/freetype-2.3.5-r1.ebuild
new file mode 100644
index 000000000000..161d413392dd
--- /dev/null
+++ b/media-libs/freetype/freetype-2.3.5-r1.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.3.5-r1.ebuild,v 1.1 2007/08/24 22:42:01 dirtyepic Exp $
+
+inherit eutils flag-o-matic libtool
+
+DESCRIPTION="A high-quality and portable font engine"
+HOMEPAGE="http://www.freetype.org/"
+SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.bz2
+	mirror://sourceforge/freetype/ft2demos-${PV}.tar.gz
+	doc? ( mirror://sourceforge/${PN}/${PN}-doc-${PV}.tar.bz2 )"
+
+LICENSE="FTL GPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="X bindist debug doc zlib"
+
+DEPEND="zlib? ( sys-libs/zlib )
+		X?    ( x11-libs/libX11 )"
+
+# 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
+# We also need a recent fontconfig version to prevent segfaults. #166029
+# July 3 2007 dirtyepic
+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
+	!<media-libs/fontconfig-2.3.2-r2"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	enable_option() {
+		sed -i -e "/#define $1/a #define $1" \
+			include/freetype/config/ftoption.h \
+			|| die "unable to enable option $1"
+	}
+
+	disable_option() {
+		sed -i -e "/#define $1/ { s:^:/*:; s:$:*/: }" \
+			include/freetype/config/ftoption.h \
+			|| die "unable to disable option $1"
+	}
+
+	if ! use bindist; then
+		# Bytecodes and subpixel hinting supports are patented
+		# in United States; for safety, disable them while building
+		# binaries, so that no risky code is distributed.
+		# See http://freetype.org/patents.html
+
+		enable_option FT_CONFIG_OPTION_SUBPIXEL_RENDERING
+		enable_option TT_CONFIG_OPTION_BYTECODE_INTERPRETER
+		disable_option TT_CONFIG_OPTION_UNPATENTED_HINTING
+	fi
+
+	if use debug; then
+		enable_option FT_DEBUG_LEVEL_ERROR
+		enable_option FT_DEBUG_MEMORY
+	fi
+
+	enable_option FT_CONFIG_OPTION_INCREMENTAL
+	disable_option FT_CONFIG_OPTION_OLD_INTERNALS
+
+	epatch "${FILESDIR}"/${PN}-2.3.2-enable-valid.patch
+	epatch "${FILESDIR}"/${PN}-2.3.5-crossbuild.patch		# bug #185681
+
+	### ft2demos ###
+		cd ../ft2demos-${PV}
+		sed -i -e "s:\.\.\/freetype2$:../freetype-${PV}:" Makefile
+
+		# Disable tests needing X11 when USE="-X". (bug #177597)
+		if ! use X; then
+			sed -i -e "/EXES\ +=\ ftview/ s:^:#:" Makefile
+		fi
+
+		cd ${S}
+	### end ft2demos ###
+
+	elibtoolize
+	epunt_cxx
+}
+
+src_compile() {
+	append-flags -fno-strict-aliasing
+
+	type -P gmake &> /dev/null && export GNUMAKE=gmake
+	econf $(use_with zlib) || die "econf failed"
+	emake || die "emake failed"
+
+	cd ../ft2demos-${PV}
+	emake || die "ft2demos emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	dodoc ChangeLog README
+	dodoc docs/{CHANGES,CUSTOMIZE,DEBUG,*.txt,PATENTS,TODO}
+
+	#cd "${WORKDIR}"/${PN}-doc-${PV}
+	use doc && dohtml -r docs/*
+
+	rm ../ft2demos-${PV}/bin/README
+	for ft2demo in ../ft2demos-${PV}/bin/*; do
+		./builds/unix/libtool --mode=install $(type -P install) -m 755 $ft2demo \
+			${D}/usr/bin
+	done
+}
+
+pkg_postinst() {
+	echo
+	ewarn "After upgrading to freetype-2.3.5, it is necessary to rebuild"
+	ewarn "libXfont to avoid build errors in some packages."
+	echo
+	epause 3
+}