Readd nodrm support thanks to <vvy@dodgeit.com> in bug 108188 and fix linguas thanks to Jaroslaw Kalinowski <jak137@o2.pl> in bug 118199

(Portage version: 2.1_pre3-r1)

2 files changed, 116 insertions, 0 deletions

diff --git a/app-text/xpdf/files/digest-xpdf-3.01-r6 b/app-text/xpdf/files/digest-xpdf-3.01-r6
new file mode 100644
index 000000000000..a9aeca0c2984
--- /dev/null
+++ b/app-text/xpdf/files/digest-xpdf-3.01-r6
@@ -0,0 +1,12 @@
+MD5 e004c69c7dddef165d768b1362b44268 xpdf-3.01.tar.gz 599778
+MD5 67f05f65bc64bf022b36138c7c26746d xpdf-arabic.tar.gz 1058
+MD5 713659f0282b9e3d169390e246e5eb74 xpdf-chinese-simplified.tar.gz 756127
+MD5 5be730b859f8b01de569eb1bad188426 xpdf-chinese-traditional.tar.gz 698902
+MD5 21f57122247e2e2a63bfed4dc4f6c199 xpdf-cyrillic.tar.gz 1286
+MD5 2240a364b9c28ce09fd8c3107784ce40 xpdf-greek.tar.gz 1124
+MD5 438dd417517641cbb78a94facf2d938e xpdf-hebrew.tar.gz 1314
+MD5 57bb9359437583479b6670e75fa06c31 xpdf-japanese.tar.gz 430478
+MD5 10cd92e4eef065a6a26341d9a2a1b5c2 xpdf-korean.tar.gz 419081
+MD5 ac19ef990cd63afd2837c10dc7e1c3ab xpdf-latin2.tar.gz 1435
+MD5 9af495766ee4eaf3411d1fa74560f0ec xpdf-thai.tar.gz 1876
+MD5 f9233880805e3d8d2cf15a4fe679f25b xpdf-turkish.tar.gz 1140
diff --git a/app-text/xpdf/files/xpdf-3.01-nodrm.patch b/app-text/xpdf/files/xpdf-3.01-nodrm.patch
new file mode 100644
index 000000000000..c657a2645525
--- /dev/null
+++ b/app-text/xpdf/files/xpdf-3.01-nodrm.patch
@@ -0,0 +1,104 @@
+diff -u xpdf-3.01.orig/xpdf/PDFCore.cc xpdf-3.01/xpdf/PDFCore.cc
+--- xpdf-3.01.orig/xpdf/PDFCore.cc	2005-10-05 16:29:19.000000000 +0200
++++ xpdf-3.01/xpdf/PDFCore.cc	2005-10-05 16:29:28.000000000 +0200
+@@ -1273,9 +1273,6 @@
+   int x0, y0, x1, y1, t;
+   GString *s;
+ 
+-  if (!doc->okToCopy()) {
+-    return NULL;
+-  }
+   if ((page = findPage(pg))) {
+     cvtUserToDev(pg, xMin, yMin, &x0, &y0);
+     cvtUserToDev(pg, xMax, yMax, &x1, &y1);
+diff -u xpdf-3.01.orig/xpdf/pdfimages.cc xpdf-3.01/xpdf/pdfimages.cc
+--- xpdf-3.01.orig/xpdf/pdfimages.cc	2005-10-05 16:29:19.000000000 +0200
++++ xpdf-3.01/xpdf/pdfimages.cc	2005-10-05 16:29:28.000000000 +0200
+@@ -118,13 +118,6 @@
+     goto err1;
+   }
+ 
+-  // check for copy permission
+-  if (!doc->okToCopy()) {
+-    error(-1, "Copying of images from this document is not allowed.");
+-    exitCode = 3;
+-    goto err1;
+-  }
+-
+   // get page range
+   if (firstPage < 1)
+     firstPage = 1;
+diff -u xpdf-3.01.orig/xpdf/pdftops.cc xpdf-3.01/xpdf/pdftops.cc
+--- xpdf-3.01.orig/xpdf/pdftops.cc	2005-10-05 16:29:19.000000000 +0200
++++ xpdf-3.01/xpdf/pdftops.cc	2005-10-05 16:29:28.000000000 +0200
+@@ -269,13 +269,6 @@
+     goto err1;
+   }
+ 
+-  // check for print permission
+-  if (!doc->okToPrint()) {
+-    error(-1, "Printing this document is not allowed.");
+-    exitCode = 3;
+-    goto err1;
+-  }
+-
+   // construct PostScript file name
+   if (argc == 3) {
+     psFileName = new GString(argv[2]);
+diff -u xpdf-3.01.orig/xpdf/pdftotext.cc xpdf-3.01/xpdf/pdftotext.cc
+--- xpdf-3.01.orig/xpdf/pdftotext.cc	2005-10-05 16:29:19.000000000 +0200
++++ xpdf-3.01/xpdf/pdftotext.cc	2005-10-05 16:29:28.000000000 +0200
+@@ -160,13 +160,6 @@
+     goto err2;
+   }
+ 
+-  // check for copy permission
+-  if (!doc->okToCopy()) {
+-    error(-1, "Copying of text from this document is not allowed.");
+-    exitCode = 3;
+-    goto err2;
+-  }
+-
+   // construct text file name
+   if (argc == 3) {
+     textFileName = new GString(argv[2]);
+diff -u xpdf-3.01.orig/xpdf/XPDFCore.cc xpdf-3.01/xpdf/XPDFCore.cc
+--- xpdf-3.01.orig/xpdf/XPDFCore.cc	2005-10-05 16:29:19.000000000 +0200
++++ xpdf-3.01/xpdf/XPDFCore.cc	2005-10-05 16:29:28.000000000 +0200
+@@ -377,9 +377,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) {
+@@ -1108,11 +1105,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 -u xpdf-3.01.orig/xpdf/XPDFViewer.cc xpdf-3.01/xpdf/XPDFViewer.cc
+--- xpdf-3.01.orig/xpdf/XPDFViewer.cc	2005-10-05 16:29:19.000000000 +0200
++++ xpdf-3.01/xpdf/XPDFViewer.cc	2005-10-05 16:29:28.000000000 +0200
+@@ -2391,10 +2391,6 @@
+   PSOutputDev *psOut;
+ 
+   doc = viewer->core->getDoc();
+-  if (!doc->okToPrint()) {
+-    error(-1, "Printing this document is not allowed.");
+-    return;
+-  }
+ 
+   viewer->core->setBusyCursor(gTrue);
+