summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Schweizer <genstef@gentoo.org>2006-02-04 19:06:24 +0000
committerStefan Schweizer <genstef@gentoo.org>2006-02-04 19:06:24 +0000
commit9f4ed7868736911a59ca384bd2ec589da5752795 (patch)
tree44dd036a57da8e1e3fd6901a2099bca99a10b63f /app-text/xpdf/files/xpdf-3.01-poppler-nodrm.patch
parentMark 2.8.2 stable on ia64 (diff)
downloadhistorical-9f4ed7868736911a59ca384bd2ec589da5752795.tar.gz
historical-9f4ed7868736911a59ca384bd2ec589da5752795.tar.bz2
historical-9f4ed7868736911a59ca384bd2ec589da5752795.zip
Fix nodrm patch, bug 121492
Package-Manager: portage-2.1_pre4-r1
Diffstat (limited to 'app-text/xpdf/files/xpdf-3.01-poppler-nodrm.patch')
-rw-r--r--app-text/xpdf/files/xpdf-3.01-poppler-nodrm.patch53
1 files changed, 53 insertions, 0 deletions
diff --git a/app-text/xpdf/files/xpdf-3.01-poppler-nodrm.patch b/app-text/xpdf/files/xpdf-3.01-poppler-nodrm.patch
new file mode 100644
index 000000000000..8a752ac391ca
--- /dev/null
+++ b/app-text/xpdf/files/xpdf-3.01-poppler-nodrm.patch
@@ -0,0 +1,53 @@
+diff -ur xpdf-3.01-poppler.orig/PDFCore.cc xpdf-3.01-poppler/PDFCore.cc
+--- xpdf-3.01-poppler.orig/PDFCore.cc 2006-02-04 19:59:02.000000000 +0100
++++ xpdf-3.01-poppler/PDFCore.cc 2006-02-04 19:59:55.000000000 +0100
+@@ -1271,9 +1271,6 @@
+ int x0, y0, x1, y1, t;
+ GooString *s;
+
+- if (!doc->okToCopy()) {
+- return NULL;
+- }
+ if ((page = findPage(pg))) {
+ cvtUserToDev(pg, xMin, yMin, &x0, &y0);
+ cvtUserToDev(pg, xMax, yMax, &x1, &y1);
+diff -ur xpdf-3.01-poppler.orig/XPDFCore.cc xpdf-3.01-poppler/XPDFCore.cc
+--- xpdf-3.01-poppler.orig/XPDFCore.cc 2006-02-04 19:59:02.000000000 +0100
++++ xpdf-3.01-poppler/XPDFCore.cc 2006-02-04 19:59:55.000000000 +0100
+@@ -376,9 +376,6 @@
+ int pg;
+ double ulx, uly, lrx, lry;
+
+- if (!doc->okToCopy()) {
+- return;
+- }
+ if (getSelection(&pg, &ulx, &uly, &lrx, &lry)) {
+ //~ for multithreading: need a mutex here
+ if (currentSelection) {
+@@ -1115,11 +1112,7 @@
+ #ifndef NO_TEXT_SELECT
+ if (core->selectULX != core->selectLRX &&
+ core->selectULY != core->selectLRY) {
+- if (core->doc->okToCopy()) {
+- core->copySelection();
+- } else {
+- error(-1, "Copying of text from this document is not allowed.");
+- }
++ core->copySelection();
+ }
+ #endif
+ }
+diff -ur xpdf-3.01-poppler.orig/XPDFViewer.cc xpdf-3.01-poppler/XPDFViewer.cc
+--- xpdf-3.01-poppler.orig/XPDFViewer.cc 2006-02-04 19:59:02.000000000 +0100
++++ xpdf-3.01-poppler/XPDFViewer.cc 2006-02-04 19:59:55.000000000 +0100
+@@ -2390,10 +2390,6 @@
+ PSOutputDev *psOut;
+
+ doc = viewer->core->getDoc();
+- if (!doc->okToPrint()) {
+- error(-1, "Printing this document is not allowed.");
+- return;
+- }
+
+ viewer->core->setBusyCursor(gTrue);
+