version bump to fix poppler issues, thanks to radfoj <radfoj@seznam.cz> in bug 124881

(Portage version: 2.1_pre4-r1)

5 files changed, 139 insertions, 4 deletions

diff --git a/app-text/xpdf/ChangeLog b/app-text/xpdf/ChangeLog
index d838107ccef1..2f4bd0ff4f51 100644
--- a/app-text/xpdf/ChangeLog
+++ b/app-text/xpdf/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/xpdf
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xpdf/ChangeLog,v 1.136 2006/02/27 22:46:40 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xpdf/ChangeLog,v 1.137 2006/03/04 11:28:01 genstef Exp $
+
+*xpdf-3.01-r8 (04 Mar 2006)
+
+  04 Mar 2006; Stefan Schweizer <genstef@gentoo.org>
+  +files/xpdf-3.01-poppler-0.5.1.patch, +xpdf-3.01-r8.ebuild:
+  version bump to fix poppler issues, thanks to radfoj <radfoj@seznam.cz> in
+  bug 124881
 
   27 Feb 2006; Stefan Schweizer <genstef@gentoo.org> xpdf-3.01-r7.ebuild:
   Avoid -Os thanks to Alexey Dobriyan <adobriyan@gmail.com> in bug 124179
diff --git a/app-text/xpdf/Manifest b/app-text/xpdf/Manifest
index 201840e34fe9..675284925b66 100644
--- a/app-text/xpdf/Manifest
+++ b/app-text/xpdf/Manifest
@@ -1,9 +1,15 @@
-MD5 f9b1c6a75fd60ddca1f5312ed036933a ChangeLog 17102
-RMD160 3ba84ca2b91596a9b0364c15300dff034f4eb1b7 ChangeLog 17102
-SHA256 81019468c14020127e5aa74a1cb2f6fc722db90a63208b0cf47c994ee15aff90 ChangeLog 17102
+MD5 7b493d416ef9b535cfb9dc7cdf4e7688 ChangeLog 17337
+RMD160 80593d19f6c2391d7d3ef7f1bfc631aec3235103 ChangeLog 17337
+SHA256 26b7d91476b2eb6f164bfc3e9548b3ae900b28c91d593fd4ada36fd84f0c1ec2 ChangeLog 17337
 MD5 ddc9f57937bb7077b0b7e5661cf8d1f3 files/digest-xpdf-3.01-r7 253
 RMD160 8770f26914bc17bb1f8dd6e9f74c6e99f315faf6 files/digest-xpdf-3.01-r7 253
 SHA256 ebbaec613cff6d4535e7290505e4f597fdf4d0f26560f2f3889c482fefbe317c files/digest-xpdf-3.01-r7 253
+MD5 ddc9f57937bb7077b0b7e5661cf8d1f3 files/digest-xpdf-3.01-r8 253
+RMD160 8770f26914bc17bb1f8dd6e9f74c6e99f315faf6 files/digest-xpdf-3.01-r8 253
+SHA256 ebbaec613cff6d4535e7290505e4f597fdf4d0f26560f2f3889c482fefbe317c files/digest-xpdf-3.01-r8 253
+MD5 9c412a4808a52086a3040aa771e16b62 files/xpdf-3.01-poppler-0.5.1.patch 2797
+RMD160 963040540b97cc432bd4e9c4ba361feb0d729301 files/xpdf-3.01-poppler-0.5.1.patch 2797
+SHA256 85679785a1f12b3e003e56f7d24d9c143f93e82c6391cb38823e752d0b055841 files/xpdf-3.01-poppler-0.5.1.patch 2797
 MD5 82bf7fedf2b17d230c7b9bc8c0b14da5 files/xpdf-3.01-poppler-nodrm.patch 1712
 RMD160 9be0eb12d1c2501e9a8eae7c7844832a030e2a11 files/xpdf-3.01-poppler-nodrm.patch 1712
 SHA256 50ee43c573fc046bdb74bc368ed4a589b062bc1b9454e68be49a9397540ea4ee files/xpdf-3.01-poppler-nodrm.patch 1712
@@ -13,3 +19,6 @@ SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76 metadata
 MD5 e32bf19a973991a6f99963868528a8db xpdf-3.01-r7.ebuild 1007
 RMD160 19e2e9a411f5be9e95d2b522b4b0b6a4c9c25e57 xpdf-3.01-r7.ebuild 1007
 SHA256 f99893f6e55754d37ba6c0c197f4dafb701ccfa2a78839c2ad521ce172ec2ea0 xpdf-3.01-r7.ebuild 1007
+MD5 ee981020b97fa39c55c62d66cc1a5b7d xpdf-3.01-r8.ebuild 1062
+RMD160 fd80eacd06885b1aa91eab47a7bc4281c67189c1 xpdf-3.01-r8.ebuild 1062
+SHA256 845f08d6e22908251d21d470f098ac7c366da405dde2026dc24331ad62272cd1 xpdf-3.01-r8.ebuild 1062
diff --git a/app-text/xpdf/files/digest-xpdf-3.01-r8 b/app-text/xpdf/files/digest-xpdf-3.01-r8
new file mode 100644
index 000000000000..759b9d806a07
--- /dev/null
+++ b/app-text/xpdf/files/digest-xpdf-3.01-r8
@@ -0,0 +1,3 @@
+MD5 5b6f88c5b5ac7eb0421c73d74f31159d xpdf-3.01-poppler.tar.bz2 82831
+RMD160 3bb63e7f6cbc52ab4f77ea9cfab53d7cc9316a8d xpdf-3.01-poppler.tar.bz2 82831
+SHA256 3463535f65db8eeb71ef1ec3c185ccd1941af66ec783aa50577cd065f79e5629 xpdf-3.01-poppler.tar.bz2 82831
diff --git a/app-text/xpdf/files/xpdf-3.01-poppler-0.5.1.patch b/app-text/xpdf/files/xpdf-3.01-poppler-0.5.1.patch
new file mode 100644
index 000000000000..870f00d32207
--- /dev/null
+++ b/app-text/xpdf/files/xpdf-3.01-poppler-0.5.1.patch
@@ -0,0 +1,71 @@
+--- xpdf-3.01-poppler/PDFCore.cc.orig	2006-03-04 12:07:21.000000000 +0100
++++ xpdf-3.01-poppler/PDFCore.cc	2006-03-04 12:06:43.000000000 +0100
+@@ -857,7 +857,7 @@
+   if (!doc) {
+     return gFalse;
+   }
+-  if (!(d = doc->findDest(dest))) {
++  if (!(d = doc->findDest((UGooString *) dest))) {
+     return gFalse;
+   }
+   displayDest(d, zoom, rotate, gTrue);
+--- xpdf-3.01-poppler/XPDFCore.cc.orig	2006-03-04 12:07:31.000000000 +0100
++++ xpdf-3.01-poppler/XPDFCore.cc	2006-03-04 12:11:58.000000000 +0100
+@@ -461,7 +461,7 @@
+       namedDest = NULL;
+       if ((dest = ((LinkGoTo *)action)->getDest())) {
+ 	dest = dest->copy();
+-      } else if ((namedDest = ((LinkGoTo *)action)->getNamedDest())) {
++      } else if ((namedDest = (GooString *) ((LinkGoTo *)action)->getNamedDest())) {
+ 	namedDest = namedDest->copy();
+       }
+     } else {
+@@ -469,7 +469,7 @@
+       namedDest = NULL;
+       if ((dest = ((LinkGoToR *)action)->getDest())) {
+ 	dest = dest->copy();
+-      } else if ((namedDest = ((LinkGoToR *)action)->getNamedDest())) {
++      } else if ((namedDest = (GooString *) ((LinkGoToR *)action)->getNamedDest())) {
+ 	namedDest = namedDest->copy();
+       }
+       s = ((LinkGoToR *)action)->getFileName()->getCString();
+@@ -492,7 +492,7 @@
+       delete fileName;
+     }
+     if (namedDest) {
+-      dest = doc->findDest(namedDest);
++      dest = doc->findDest((UGooString *) namedDest);
+       delete namedDest;
+     }
+     if (dest) {
+@@ -599,7 +599,7 @@
+       if (obj1.isArray()) {
+ 	for (i = 0; i < obj1.arrayGetLength(); ++i) {
+ 	  if (obj1.arrayGet(i, &movieAnnot)->isDict()) {
+-	    if (movieAnnot.dictLookup("Subtype", &obj2)->isName("Movie")) {
++	    if (movieAnnot.dictLookup((UGooString &) "Subtype", &obj2)->isName("Movie")) {
+ 	      obj2.free();
+ 	      break;
+ 	    }
+@@ -611,8 +611,8 @@
+       }
+     }
+     if (movieAnnot.isDict()) {
+-      if (movieAnnot.dictLookup("Movie", &obj1)->isDict()) {
+-	if (obj1.dictLookup("F", &obj2)) {
++      if (movieAnnot.dictLookup((UGooString &) "Movie", &obj1)->isDict()) {
++	if (obj1.dictLookup((UGooString &) "F", &obj2)) {
+ 	  if ((fileName = LinkAction::getFileSpecName(&obj2))) {
+ 	    if (!isAbsolutePath(fileName->getCString())) {
+ 	      fileName2 = appendToPath(
+--- xpdf-3.01-poppler/XPDFViewer.cc.orig	2006-03-04 12:12:08.000000000 +0100
++++ xpdf-3.01-poppler/XPDFViewer.cc	2006-03-04 12:12:58.000000000 +0100
+@@ -274,7 +274,7 @@
+   // find the page number for a named destination
+   *pageOut = pageA;
+   *destOut = NULL;
+-  if (destName && (*destOut = core->getDoc()->findDest(destName))) {
++  if (destName && (*destOut = core->getDoc()->findDest((UGooString*)destName))) {
+     if ((*destOut)->isPageRef()) {
+       pageRef = (*destOut)->getPageRef();
+       *pageOut = core->getDoc()->findPage(pageRef.num, pageRef.gen);
diff --git a/app-text/xpdf/xpdf-3.01-r8.ebuild b/app-text/xpdf/xpdf-3.01-r8.ebuild
new file mode 100644
index 000000000000..90441b718054
--- /dev/null
+++ b/app-text/xpdf/xpdf-3.01-r8.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/xpdf/xpdf-3.01-r8.ebuild,v 1.1 2006/03/04 11:28:01 genstef Exp $
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="An X Viewer for PDF Files"
+HOMEPAGE="http://www.foolabs.com/xpdf/"
+SRC_URI="mirror://gentoo/${P}-poppler.tar.bz2
+	http://dev.gentoo.org/~genstef/files/dist/${P}-poppler.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE="nodrm"
+
+RDEPEND=">=app-text/poppler-0.5.1
+	virtual/motif
+	|| (
+		( x11-libs/libX11 x11-libs/libXpm )
+		virtual/x11
+	)"
+DEPEND="${RDEPEND}"
+PROVIDE="virtual/pdfviewer"
+
+S=${WORKDIR}/${P}-poppler
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	use nodrm && epatch "${FILESDIR}"/${P}-poppler-nodrm.patch
+	epatch "${FILESDIR}"/${P}-poppler-0.5.1.patch
+}
+
+src_compile() {
+	# broken, see bug 124179
+	replace-flags -Os -O2
+	emake || die "emake failed"
+}
+
+src_install() {
+	dobin xpdf
+	doman xpdf.1
+	dodoc README ANNOUNCE CHANGES
+}