SOURCES: xpdf-remove_protections.patch, xpdf-3.01pl2.patch (REMOVE...

[gotar]

Author: gotar                        Date: Sat Mar 10 13:50:48 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated to 3.02

---- Files affected:
SOURCES:
   xpdf-remove_protections.patch (1.5 -> 1.6) , xpdf-3.01pl2.patch (1.1 -> NONE)  (REMOVED), xpdf-noftinternals.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: SOURCES/xpdf-remove_protections.patch
diff -u SOURCES/xpdf-remove_protections.patch:1.5 SOURCES/xpdf-remove_protections.patch:1.6
--- SOURCES/xpdf-remove_protections.patch:1.5	Sun Aug 28 11:19:36 2005
+++ SOURCES/xpdf-remove_protections.patch	Sat Mar 10 14:50:43 2007
@@ -1,6 +1,20 @@
 --- xpdf-3.01/xpdf/XPDFCore.cc.orig	2005-08-17 07:34:31.000000000 +0200
 +++ xpdf-3.01/xpdf/XPDFCore.cc	2005-08-28 11:07:57.279864520 +0200
-@@ -377,9 +377,6 @@
+@@ -384,10 +384,9 @@
+ #ifndef NO_TEXT_SELECT
+       if (selectULX != selectLRX &&
+ 	  selectULY != selectLRY) {
+-	if (doc->okToCopy()) {
+-	  copySelection();
+-	} else {
+-	  error(-1, "Copying of text from this document is not allowed.");
++	copySelection();
++	if (!doc->okToCopy()) {
++	  error(-1, "Note: creator didn't want you to copy text from this document.");
+ 	}
+       }
+ #endif
+@@ -407,9 +406,6 @@
    int pg;
    double ulx, uly, lrx, lry;
  
@@ -10,20 +24,6 @@
    if (getSelection(&pg, &ulx, &uly, &lrx, &lry)) {
      //~ for multithreading: need a mutex here
      if (currentSelection) {
-@@ -1108,10 +1105,9 @@
- #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();
-+	    if (!core->doc->okToCopy()) {
-+	      error(-1, "Note: creator didn't want you to copy text from this document.");
- 	    }
- 	  }
- #endif
 diff -Nur xpdf-2.00.orig/xpdf/XPDFViewer.cc xpdf-2.00/xpdf/XPDFViewer.cc
 --- xpdf-2.00.orig/xpdf/XPDFViewer.cc	Sun Nov  3 23:15:37 2002
 +++ xpdf-2.00/xpdf/XPDFViewer.cc	Mon Nov  4 21:09:12 2002
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/xpdf-remove_protections.patch?r1=1.5&r2=1.6&f=u