[gentoo-commits] gentoo-x86 commit in app-text/xpdf/files: xpdf-3.02-poppler-0.11.0.patch xpdf-3.02-poppler-0.10.0.patch poppler-0.10.0.patch

[gentoo-commits] gentoo-x86 commit in app-text/xpdf/files: xpdf-3.02-poppler-0.11.0.patch xpdf-3.02-poppler-0.10.0.patch poppler-0.10.0.patch

[Peter Alfredsen (loki_val)]

loki_val    09/05/14 19:54:43

  Added:                xpdf-3.02-poppler-0.11.0.patch
                        xpdf-3.02-poppler-0.10.0.patch
  Removed:              poppler-0.10.0.patch
  Log:
  Fix bug 269546, FTBFS w/poppler-0.11.0, patch from Alexis Ballier, the magnificent. Move poppler-0.10.0.patch to ${P}-poppler-0.10.0.patch for consistency. Delete old.
  (Portage version: 2.2_rc28/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  app-text/xpdf/files/xpdf-3.02-poppler-0.11.0.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/xpdf/files/xpdf-3.02-poppler-0.11.0.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/xpdf/files/xpdf-3.02-poppler-0.11.0.patch?rev=1.1&content-type=text/plain

Index: xpdf-3.02-poppler-0.11.0.patch
===================================================================
Index: xpdf-3.02-poppler/PDFCore.cc
===================================================================
--- xpdf-3.02-poppler.orig/PDFCore.cc
+++ xpdf-3.02-poppler/PDFCore.cc
@@ -49,7 +49,7 @@ PDFCorePage::~PDFCorePage() {
     delete links;
   }
   if (text) {
-    delete text;
+    text->decRefCnt();
   }
 }
 



1.1                  app-text/xpdf/files/xpdf-3.02-poppler-0.10.0.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/xpdf/files/xpdf-3.02-poppler-0.10.0.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/xpdf/files/xpdf-3.02-poppler-0.10.0.patch?rev=1.1&content-type=text/plain

Index: xpdf-3.02-poppler-0.10.0.patch
===================================================================
diff -pur --exclude='*~' xpdf-3.02-poppler.orig/config.h xpdf-3.02-poppler/config.h
--- xpdf-3.02-poppler.orig/config.h	2008-10-14 20:00:41.000000000 +0200
+++ xpdf-3.02-poppler/config.h	2008-10-14 21:08:15.000000000 +0200
@@ -28,6 +28,7 @@
 #define supportedPDFVersionNum 1.7
 
 // copyright notice
+#undef xpdfCopyright
 #define xpdfCopyright "Copyright 1996-2007 Glyph & Cog, LLC"
 
 // Windows resource file stuff
diff -pur --exclude='*~' xpdf-3.02-poppler.orig/XPDFCore.cc xpdf-3.02-poppler/XPDFCore.cc
--- xpdf-3.02-poppler.orig/XPDFCore.cc	2008-10-14 20:00:41.000000000 +0200
+++ xpdf-3.02-poppler/XPDFCore.cc	2008-10-14 21:13:48.000000000 +0200
@@ -22,6 +22,7 @@
 #include "GlobalParams.h"
 #include "PDFDoc.h"
 #include "Link.h"
+#include "FileSpec.h"
 #include "ErrorCodes.h"
 #include "GfxState.h"
 #include "CoreOutputDev.h"
@@ -465,7 +466,7 @@ void XPDFCore::doAction(LinkAction *acti
   GooString *fileName, *fileName2;
   GooString *cmd;
   GooString *actionName;
-  Object movieAnnot, obj1, obj2;
+  Object movieAnnot, obj1, obj2, obj3;
   GooString *msg;
   int i;
 
@@ -631,7 +632,9 @@ void XPDFCore::doAction(LinkAction *acti
     if (movieAnnot.isDict()) {
       if (movieAnnot.dictLookup("Movie", &obj1)->isDict()) {
 	if (obj1.dictLookup("F", &obj2)) {
-	  if ((fileName = LinkAction::getFileSpecName(&obj2))) {
+	  if (getFileSpecNameForPlatform(&obj2, &obj3)) {
+	    fileName = obj3.getString()->copy();
+	    obj3.free();
 	    if (!isAbsolutePath(fileName->getCString())) {
 	      fileName2 = appendToPath(
 			      grabPath(doc->getFileName()->getCString()),