Gentoo Archives: gentoo-commits

From: "Peter Alfredsen (loki_val)" <loki_val@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo commit in src/patchsets/xpdf/3.02: xpdf-3.02-poppler-nodrm.patch
Date: Mon, 24 Aug 2009 08:24:52
Message-Id: E1MfUrC-0007jL-Sq@stork.gentoo.org
1 loki_val 09/08/24 08:24:50
2
3 Added: xpdf-3.02-poppler-nodrm.patch
4 Log:
5 Add patch for disabling DRM. Named out-of-sequence since it will only be applied conditionally.
6
7 Revision Changes Path
8 1.1 src/patchsets/xpdf/3.02/xpdf-3.02-poppler-nodrm.patch
9
10 file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xpdf/3.02/xpdf-3.02-poppler-nodrm.patch?rev=1.1&view=markup
11 plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xpdf/3.02/xpdf-3.02-poppler-nodrm.patch?rev=1.1&content-type=text/plain
12
13 Index: xpdf-3.02-poppler-nodrm.patch
14 ===================================================================
15 diff -Nur xpdf-3.02-poppler.orig/PDFCore.cc xpdf-3.02-poppler/PDFCore.cc
16 --- xpdf-3.02-poppler.orig/PDFCore.cc 2007-11-18 12:23:58.000000000 +0100
17 +++ xpdf-3.02-poppler/PDFCore.cc 2007-11-18 12:24:07.000000000 +0100
18 @@ -1563,9 +1563,6 @@
19 int x0, y0, x1, y1, t;
20 GooString *s;
21
22 - if (!doc->okToCopy()) {
23 - return NULL;
24 - }
25 if ((page = findPage(pg))) {
26 cvtUserToDev(pg, xMin, yMin, &x0, &y0);
27 cvtUserToDev(pg, xMax, yMax, &x1, &y1);
28 diff -Nur xpdf-3.02-poppler.orig/XPDFCore.cc xpdf-3.02-poppler/XPDFCore.cc
29 --- xpdf-3.02-poppler.orig/XPDFCore.cc 2007-11-18 12:23:58.000000000 +0100
30 +++ xpdf-3.02-poppler/XPDFCore.cc 2007-11-18 12:25:18.000000000 +0100
31 @@ -384,11 +384,7 @@
32 #ifndef NO_TEXT_SELECT
33 if (selectULX != selectLRX &&
34 selectULY != selectLRY) {
35 - if (doc->okToCopy()) {
36 copySelection();
37 - } else {
38 - error(-1, "Copying of text from this document is not allowed.");
39 - }
40 }
41 #endif
42 }
43 @@ -407,9 +403,6 @@
44 int pg;
45 double ulx, uly, lrx, lry;
46
47 - if (!doc->okToCopy()) {
48 - return;
49 - }
50 if (getSelection(&pg, &ulx, &uly, &lrx, &lry)) {
51 //~ for multithreading: need a mutex here
52 if (currentSelection) {
53 diff -Nur xpdf-3.02-poppler.orig/XPDFViewer.cc xpdf-3.02-poppler/XPDFViewer.cc
54 --- xpdf-3.02-poppler.orig/XPDFViewer.cc 2007-11-18 12:23:58.000000000 +0100
55 +++ xpdf-3.02-poppler/XPDFViewer.cc 2007-11-18 12:24:10.000000000 +0100
56 @@ -3406,10 +3406,6 @@
57 PSOutputDev *psOut;
58
59 doc = viewer->core->getDoc();
60 - if (!doc->okToPrint()) {
61 - error(-1, "Printing this document is not allowed.");
62 - return;
63 - }
64
65 viewer->core->setBusyCursor(gTrue);