| 1 |
loki_val 08/10/14 21:12:27 |
| 2 |
|
| 3 |
Added: poppler-0.10.0.patch |
| 4 |
Removed: xpdf-3.01-poppler-nodrm.patch poppler-0.5.9.patch |
| 5 |
xpdf-3.01-poppler-0.5.1.patch |
| 6 |
Log: |
| 7 |
Fix compatibility with poppler-0.10.0, bug #239195. Thanks to Martin von Gagern <Martin.vGagern@×××.net> for providing the patch. Also clean out old ebuilds and patches. |
| 8 |
(Portage version: 2.2_rc12/cvs/Linux 2.6.27-rc8 x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 app-text/xpdf/files/poppler-0.10.0.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/xpdf/files/poppler-0.10.0.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/xpdf/files/poppler-0.10.0.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: poppler-0.10.0.patch |
| 17 |
=================================================================== |
| 18 |
diff -pur --exclude='*~' xpdf-3.02-poppler.orig/config.h xpdf-3.02-poppler/config.h |
| 19 |
--- xpdf-3.02-poppler.orig/config.h 2008-10-14 20:00:41.000000000 +0200 |
| 20 |
+++ xpdf-3.02-poppler/config.h 2008-10-14 21:08:15.000000000 +0200 |
| 21 |
@@ -28,6 +28,7 @@ |
| 22 |
#define supportedPDFVersionNum 1.7 |
| 23 |
|
| 24 |
// copyright notice |
| 25 |
+#undef xpdfCopyright |
| 26 |
#define xpdfCopyright "Copyright 1996-2007 Glyph & Cog, LLC" |
| 27 |
|
| 28 |
// Windows resource file stuff |
| 29 |
diff -pur --exclude='*~' xpdf-3.02-poppler.orig/XPDFCore.cc xpdf-3.02-poppler/XPDFCore.cc |
| 30 |
--- xpdf-3.02-poppler.orig/XPDFCore.cc 2008-10-14 20:00:41.000000000 +0200 |
| 31 |
+++ xpdf-3.02-poppler/XPDFCore.cc 2008-10-14 21:13:48.000000000 +0200 |
| 32 |
@@ -22,6 +22,7 @@ |
| 33 |
#include "GlobalParams.h" |
| 34 |
#include "PDFDoc.h" |
| 35 |
#include "Link.h" |
| 36 |
+#include "FileSpec.h" |
| 37 |
#include "ErrorCodes.h" |
| 38 |
#include "GfxState.h" |
| 39 |
#include "CoreOutputDev.h" |
| 40 |
@@ -465,7 +466,7 @@ void XPDFCore::doAction(LinkAction *acti |
| 41 |
GooString *fileName, *fileName2; |
| 42 |
GooString *cmd; |
| 43 |
GooString *actionName; |
| 44 |
- Object movieAnnot, obj1, obj2; |
| 45 |
+ Object movieAnnot, obj1, obj2, obj3; |
| 46 |
GooString *msg; |
| 47 |
int i; |
| 48 |
|
| 49 |
@@ -631,7 +632,9 @@ void XPDFCore::doAction(LinkAction *acti |
| 50 |
if (movieAnnot.isDict()) { |
| 51 |
if (movieAnnot.dictLookup("Movie", &obj1)->isDict()) { |
| 52 |
if (obj1.dictLookup("F", &obj2)) { |
| 53 |
- if ((fileName = LinkAction::getFileSpecName(&obj2))) { |
| 54 |
+ if (getFileSpecNameForPlatform(&obj2, &obj3)) { |
| 55 |
+ fileName = obj3.getString()->copy(); |
| 56 |
+ obj3.free(); |
| 57 |
if (!isAbsolutePath(fileName->getCString())) { |
| 58 |
fileName2 = appendToPath( |
| 59 |
grabPath(doc->getFileName()->getCString()), |
Archives