Drop use of internal gd w.r.t. bug 268161. Add fix for bug 269324, include order bug, possibly triggered by gcc-4.4.0.

Package-Manager: portage-2.2_rc28/cvs/Linux x86_64

4 files changed, 139 insertions, 2 deletions

diff --git a/media-libs/libwmf/ChangeLog b/media-libs/libwmf/ChangeLog
index d5644ca1f2f1..9ac97bd3da9d 100644
--- a/media-libs/libwmf/ChangeLog
+++ b/media-libs/libwmf/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/libwmf
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libwmf/ChangeLog,v 1.57 2009/03/06 05:18:15 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libwmf/ChangeLog,v 1.58 2009/05/10 23:52:40 loki_val Exp $
+
+*libwmf-0.2.8.4-r3 (10 May 2009)
+
+  10 May 2009; Peter Alfredsen <loki_val@gentoo.org>
+  +libwmf-0.2.8.4-r3.ebuild, +files/libwmf-0.2.8.4-pngfix.patch:
+  Drop use of internal gd w.r.t. bug 268161. Add fix for bug 269324, include
+  order bug, possibly triggered by gcc-4.4.0.
 
 *libwmf-0.2.8.4-r2 (06 Mar 2009)
 
diff --git a/media-libs/libwmf/Manifest b/media-libs/libwmf/Manifest
index 95b5eee2299a..89e8cbc2dfb2 100644
--- a/media-libs/libwmf/Manifest
+++ b/media-libs/libwmf/Manifest
@@ -1,7 +1,9 @@
 AUX libwmf-0.2.8.4-build.patch 1340 RMD160 d0ee933b7bd3d3b299859c8c36e542298049343b SHA1 81e1f460c426c3db37606ec3cc8da66b52c11fa3 SHA256 e12d0cd079b70fc83f87f09d262eee901707f27fe5f509e65ff108aa8cdccadb
 AUX libwmf-0.2.8.4-intoverflow.patch 971 RMD160 4b5c414021a2b663032aa90e9f40f05e1389b503 SHA1 6f130ea9f639ccf88fef0fda74cf9fa3956f81b5 SHA256 b19f80f742c22138beb6d1943f6cbedc0db2a8c72419bf8bf9216e1f806d4690
+AUX libwmf-0.2.8.4-pngfix.patch 582 RMD160 1a723c2e0d1dd16b6788f0ead2277e8996ab8ea1 SHA1 f392fd1a1053b84336bfb72e27aebbb78826239a SHA256 39a47d2d12720cc98ee4669e44c012e855df5de0dcec0636f1fb12918c2d8006
 DIST libwmf-0.2.8.4.tar.gz 2169375 RMD160 98cd631adb5bb332d9224d04bc8a265c105435f2 SHA1 822ab3bd0f5e8f39ad732f2774a8e9f18fc91e89 SHA256 5b345c69220545d003ad52bfd035d5d6f4f075e65204114a9e875e84895a7cf8
 EBUILD libwmf-0.2.8.4-r2.ebuild 2702 RMD160 2c9c36e4f5905476858dfb22de90cc3393f5a9f2 SHA1 67318a5f1f5540244ddadac9cf42454a7c2340d6 SHA256 e9ecad854689c7f30b916566cff2fa60aba433f220d28d75a9f31b6f453adda9
+EBUILD libwmf-0.2.8.4-r3.ebuild 2940 RMD160 efe7b4b0160ceeb2afd07c7d97afd2064d4a05da SHA1 2801f22425ecb5b225a4080bf53613c5868793ae SHA256 a18c87fe1495f4455dd7485f84844c90d2d8cedaa192ddfb35ab466ffd224167
 EBUILD libwmf-0.2.8.4.ebuild 2235 RMD160 b8cac970ba9d5876717f92cc2de2f4e00b4d0743 SHA1 72a4837ce48c434ebcb386b03bd7fb53fe315eb9 SHA256 9661600fdd68278bd7e81f85ba68cbec0c8cae480ed33027966925c53a7ae964
-MISC ChangeLog 8193 RMD160 afdd15f27c38a62e05c0f50246ea1740ae8313b3 SHA1 1dade3f579ea5269f40a3bedcfde38d00517f592 SHA256 c5e2df3c372de6f984ea0fede31d789f778fe7ef2237c9dc8201e3c4b520c95d
+MISC ChangeLog 8469 RMD160 992fecc34bcaae75c185e83c389c570ff1a2b759 SHA1 9d667e3686b4c77cf3993fde6e724c64aab78660 SHA256 4b589e4f8f5405255c6d9dc16fdd963248a3c6a841a4859530bd8c1284084940
 MISC metadata.xml 231 RMD160 c13056229989c3d4f448a7c7abcff3f4ee7ce13c SHA1 2d63dfb700b223f8f37c078692a81b2237896bce SHA256 4595c2615fd7c9095517949b1a920d4457f92801eb9d46307b18aafe58ec2a8a
diff --git a/media-libs/libwmf/files/libwmf-0.2.8.4-pngfix.patch b/media-libs/libwmf/files/libwmf-0.2.8.4-pngfix.patch
new file mode 100644
index 000000000000..52717735a26e
--- /dev/null
+++ b/media-libs/libwmf/files/libwmf-0.2.8.4-pngfix.patch
@@ -0,0 +1,20 @@
+diff -NrU5 libwmf-0.2.8.4.orig/src/ipa/ipa.c libwmf-0.2.8.4/src/ipa/ipa.c
+--- libwmf-0.2.8.4.orig/src/ipa/ipa.c	2009-05-10 23:41:17.000000000 +0200
++++ libwmf-0.2.8.4/src/ipa/ipa.c	2009-05-11 00:07:43.000000000 +0200
+@@ -33,10 +33,16 @@
+ 
+ /* Define WMF_API if this is module so that ipa headers are included via "wmfdefs.h" first
+  */
+ #define WMF_IPA 1
+ 
++#ifndef HAVE_GD
++#ifdef HAVE_LIBPNG
++#include <png.h>
++#endif /* HAVE_LIBPNG */
++#endif /* HAVE_GD */
++
+ #include "wmfdefs.h"
+ 
+ #include "ipa/ipa.h"
+ #include "ipa/ipa/bmp.h"   /* Provides default bitmap functionality */
+ 
diff --git a/media-libs/libwmf/libwmf-0.2.8.4-r3.ebuild b/media-libs/libwmf/libwmf-0.2.8.4-r3.ebuild
new file mode 100644
index 000000000000..2258edf205ca
--- /dev/null
+++ b/media-libs/libwmf/libwmf-0.2.8.4-r3.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libwmf/libwmf-0.2.8.4-r3.ebuild,v 1.1 2009/05/10 23:52:40 loki_val Exp $
+
+inherit eutils autotools
+
+#The configure script finds the 5.50 ghostscript Fontmap file while run.
+#This will probably work, especially since the real one (6.50) in this case
+#is empty. However beware in case there is any trouble
+
+DESCRIPTION="library for converting WMF files"
+HOMEPAGE="http://wvware.sourceforge.net/"
+SRC_URI="mirror://sourceforge/wvware/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="X expat xml debug doc gtk"
+
+RDEPEND="virtual/ghostscript
+	xml? ( !expat? ( dev-libs/libxml2 ) )
+	expat? ( dev-libs/expat )
+	>=media-libs/freetype-2.0.1
+	sys-libs/zlib
+	media-libs/libpng
+	media-libs/jpeg
+	X? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+	)
+	gtk? ( >=x11-libs/gtk+-2.1.2 ) "
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	X? (
+		x11-libs/libXt
+		x11-libs/libXpm
+	)"
+# plotutils are not really supported yet, so looks like that's it
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	if ! use doc ; then
+		sed -e 's:doc::' -i Makefile.am
+	fi
+	if ! use gtk ; then
+		sed -e 's:@LIBWMF_GDK_PIXBUF_TRUE@:#:' -i src/Makefile.in
+	fi
+	epatch "${FILESDIR}"/${P}-intoverflow.patch
+	epatch "${FILESDIR}"/${P}-build.patch
+	epatch "${FILESDIR}"/${P}-pngfix.patch
+
+	eautoreconf
+}
+
+src_compile() {
+	if use expat && use xml ; then
+		elog "You can specify only one USE flag from expat and xml, to use expat"
+		elog "or libxml2, respectively."
+		elog
+		elog "You have both flags enabled, we will default to expat (like autocheck does)."
+		myconf="${myconf} --with-expat --without-libxml2"
+	else
+		myconf="${myconf} $(use_with expat) $(use_with xml libxml2)"
+	fi
+
+	# NOTE: The gd that is included is gd-2.0.0. Even with --with-sys-gd, that gd is built
+	# and included in libwmf. Since nothing in-tree seems to use media-libs/libwmf[gd],
+	# we're explicitly disabling gd use w.r.t. bug 268161
+	econf \
+		$(use_enable debug) \
+		$(use_with X x) \
+		--disable-gd \
+		--with-sys-gd \
+		${myconf} \
+		--with-gsfontdir=/usr/share/ghostscript/fonts \
+		--with-fontdir=/usr/share/libwmf/fonts/ \
+		--with-docdir=/usr/share/doc/${PF} \
+		|| die "./configure failed"
+
+	emake || die
+}
+
+src_install() {
+	make install DESTDIR="${D}" || die
+	dodoc README AUTHORS CREDITS ChangeLog NEWS TODO
+}
+
+set_gtk_confdir() {
+	# An arch specific config directory is used on multilib systems
+	has_multilib_profile && GTK2_CONFDIR="${ROOT}etc/gtk-2.0/${CHOST}"
+	GTK2_CONFDIR="${GTK2_CONFDIR:-/etc/gtk-2.0}"
+}
+
+pkg_postinst() {
+	if use gtk; then
+		set_gtk_confdir
+		gdk-pixbuf-query-loaders > "${GTK2_CONFDIR}/gdk-pixbuf.loaders"
+	fi
+}
+
+pkg_postrm() {
+	if use gtk; then
+		set_gtk_confdir
+		gdk-pixbuf-query-loaders > "${GTK2_CONFDIR}/gdk-pixbuf.loaders"
+	fi
+}