Add gcc-4.1 patch thanks to Matt Bobulski <matobsk@gmail.com> in bug 117416 and -libjpeg-patch thanks to SpanKY <vapier@gentoo.org> and Daniel Drake <dsd@gentoo.org> in bug 117047

(Portage version: 2.1_pre3-r1)

6 files changed, 104 insertions, 12 deletions

diff --git a/app-text/poppler/ChangeLog b/app-text/poppler/ChangeLog
index 58221beb5168..2d90a9aeda2c 100644
--- a/app-text/poppler/ChangeLog
+++ b/app-text/poppler/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-text/poppler
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.31 2006/01/03 21:17:21 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.32 2006/01/03 22:59:49 genstef Exp $
+
+*poppler-0.4.3-r3 (03 Jan 2006)
+
+  03 Jan 2006; Stefan Schweizer <genstef@gentoo.org>
+  +files/poppler-0.4.3-gcc41.patch, +files/poppler-no-libjpeg.patch,
+  +poppler-0.4.3-r3.ebuild:
+  Add gcc-4.1 patch thanks to Matt Bobulski <matobsk@gmail.com> in bug 117416
+  and -libjpeg-patch thanks to SpanKY <vapier@gentoo.org> and Daniel Drake
+  <dsd@gentoo.org> in bug 117047
 
 *poppler-0.4.3-r2 (03 Jan 2006)
 
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index ead71c5f169d..a8b8593a3e15 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -1,7 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 862c694717b231940e23cd6cb7442153 ChangeLog 4062
+MD5 0d50d6d4f678b3d126a7bee81b1b8ac8 ChangeLog 4432
 MD5 9fcae20e4d0c670e6f53602e516991aa files/digest-poppler-0.3.0 65
 MD5 9fcae20e4d0c670e6f53602e516991aa files/digest-poppler-0.3.0-r1 65
 MD5 be62fc9641cde65e89b62b2a629bb617 files/digest-poppler-0.4.2 65
@@ -9,9 +6,12 @@ MD5 be62fc9641cde65e89b62b2a629bb617 files/digest-poppler-0.4.2-r1 65
 MD5 fd7bca7be5c5d5779b32f4c4e7fe9b4c files/digest-poppler-0.4.3 65
 MD5 91f251deb3a322d16a5ea68576f1c9a9 files/digest-poppler-0.4.3-r1 137
 MD5 91f251deb3a322d16a5ea68576f1c9a9 files/digest-poppler-0.4.3-r2 137
+MD5 91f251deb3a322d16a5ea68576f1c9a9 files/digest-poppler-0.4.3-r3 137
 MD5 3342aad1175b4b522f84e453999fbb05 files/poppler-0.4.1-cairo-ft.patch 470
 MD5 c6805b961ecb2a526246a39bbff57f23 files/poppler-0.4.2-CAN-2005-3193.patch 3940
+MD5 8b92823cdaec86c3cb5993440d95c306 files/poppler-0.4.3-gcc41.patch 479
 MD5 ce7b0785e0aca755f5840c802dd7fed8 files/poppler-gcc41.patch 1612
+MD5 580dbf31fbeac60b3e29d38fdeabc4f1 files/poppler-no-libjpeg.patch 773
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
 MD5 2638f0cdd789bc7e7ffd78e5b1555008 poppler-0.3.0-r1.ebuild 1019
 MD5 6999412acc1316a8e229eada23ab192b poppler-0.3.0.ebuild 856
@@ -19,11 +19,5 @@ MD5 e9d6d5b72e5ba3ca39372fa29ff9ffb7 poppler-0.4.2-r1.ebuild 1442
 MD5 0a4aeea8b99f0bde18dd89db5fc6d313 poppler-0.4.2.ebuild 1383
 MD5 c14c7f37c67cf86b45017e60fba63537 poppler-0.4.3-r1.ebuild 1460
 MD5 c5c6c2c45e04b65d01bb9b54961d3d1e poppler-0.4.3-r2.ebuild 1368
+MD5 3f33c25422a1d7705ecd2993795fd512 poppler-0.4.3-r3.ebuild 1463
 MD5 73581022e21e0c1521e08454a71ca131 poppler-0.4.3.ebuild 1350
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFDuuogomPajV0RnrERAuGlAJ9NNXkWSQRfVVdEuuW2keie7SFlIQCfYRPM
-tU55o3xozhBYAgrkKZSaaSU=
-=X05S
------END PGP SIGNATURE-----
diff --git a/app-text/poppler/files/digest-poppler-0.4.3-r3 b/app-text/poppler/files/digest-poppler-0.4.3-r3
new file mode 100644
index 000000000000..101e5bbaf715
--- /dev/null
+++ b/app-text/poppler/files/digest-poppler-0.4.3-r3
@@ -0,0 +1,2 @@
+MD5 7952d78e9dece4f6f04a96af8185e197 poppler-0.4.3-utils.patch.gz 46235
+MD5 791dc78d8366eb05580183fe85174555 poppler-0.4.3.tar.gz 779582
diff --git a/app-text/poppler/files/poppler-0.4.3-gcc41.patch b/app-text/poppler/files/poppler-0.4.3-gcc41.patch
new file mode 100644
index 000000000000..1597fd2c7295
--- /dev/null
+++ b/app-text/poppler/files/poppler-0.4.3-gcc41.patch
@@ -0,0 +1,11 @@
+--- work/poppler-0.4.3/utils/HtmlLinks.orig.h
++++ work/poppler-0.4.3/utils/HtmlLinks.h	
+@@ -19,7 +19,7 @@
+   HtmlLink& operator=(const HtmlLink& x);
+   HtmlLink(double xmin,double ymin,double xmax,double ymax,GooString *_dest);
+   ~HtmlLink();
+-  GBool HtmlLink::isEqualDest(const HtmlLink& x) const;
++  GBool isEqualDest(const HtmlLink& x) const;
+   GooString *getDest(){return new GooString(dest);}
+   double getX1() const {return Xmin;}
+   double getX2() const {return Xmax;}
diff --git a/app-text/poppler/files/poppler-no-libjpeg.patch b/app-text/poppler/files/poppler-no-libjpeg.patch
new file mode 100644
index 000000000000..6dbee5bed0cf
--- /dev/null
+++ b/app-text/poppler/files/poppler-no-libjpeg.patch
@@ -0,0 +1,24 @@
+--- poppler-0.4.3/utils/HtmlOutputDev.cc.orig	2006-01-01 15:15:05.000000000 +0000
++++ poppler-0.4.3/utils/HtmlOutputDev.cc	2006-01-01 15:15:30.000000000 +0000
+@@ -27,7 +27,9 @@
+ #include "config.h"
+ #include "Error.h"
+ #include "GfxState.h"
++#ifdef ENABLE_LIBJPEG
+ #include "DCTStream.h"
++#endif
+ #include "GlobalParams.h"
+ #include "HtmlOutputDev.h"
+ #include "HtmlFonts.h"
+--- poppler-0.4.3/utils/ImageOutputDev.cc.orig	2006-01-01 15:15:10.000000000 +0000
++++ poppler-0.4.3/utils/ImageOutputDev.cc	2006-01-01 15:16:09.000000000 +0000
+@@ -22,7 +22,9 @@
+ #include "GfxState.h"
+ #include "Object.h"
+ #include "Stream.h"
++#ifdef ENABLE_LIBJPEG
+ #include "DCTStream.h"
++#endif
+ #include "ImageOutputDev.h"
+ 
+ ImageOutputDev::ImageOutputDev(char *fileRootA, GBool dumpJPEGA) {
diff --git a/app-text/poppler/poppler-0.4.3-r3.ebuild b/app-text/poppler/poppler-0.4.3-r3.ebuild
new file mode 100644
index 000000000000..74423ddb22fd
--- /dev/null
+++ b/app-text/poppler/poppler-0.4.3-r3.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.4.3-r3.ebuild,v 1.1 2006/01/03 22:59:49 genstef Exp $
+
+inherit eutils autotools
+
+DESCRIPTION="Poppler is a PDF rendering library based on the xpdf-3.0 code base."
+HOMEPAGE="http://poppler.freedesktop.org"
+SRC_URI="http://poppler.freedesktop.org/${P}.tar.gz
+	mirror://gentoo/${P}-utils.patch.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="jpeg zlib cairo"
+
+RDEPEND=">=media-libs/freetype-2.1.8
+	media-libs/fontconfig
+	virtual/ghostscript
+	cairo? ( >=x11-libs/cairo-0.5 )
+	jpeg? ( >=media-libs/jpeg-6b )
+	zlib? ( sys-libs/zlib )
+	!<app-text/xpdf-3.01-r4"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	>=sys-devel/automake-1.9.6"
+
+src_unpack(){
+	unpack ${A}
+	cd ${S}
+	epatch ${WORKDIR}/${P}-utils.patch
+	epatch ${FILESDIR}/poppler-0.4.1-cairo-ft.patch
+	epatch ${FILESDIR}/poppler-no-libjpeg.patch
+	epatch ${FILESDIR}/poppler-0.4.3-gcc41.patch
+	eautoreconf
+}
+
+src_compile() {
+	econf --disable-poppler-qt4 --enable-opi \
+		--disable-poppler-glib --disable-poppler-qt \
+		$(use_enable cairo cairo-output) \
+		$(use_enable jpeg libjpeg) \
+		$(use_enable zlib) \
+		|| die "configuration failed"
+	emake || die "compilation failed"
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+	dodoc README AUTHORS ChangeLog NEWS README-XPDF TODO
+}