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

(Portage version: 2.1_pre4-r1)

2 files changed, 74 insertions, 0 deletions

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);