Bit poppler cleanup

(Portage version: 2.1_pre3-r1)

9 files changed, 73 insertions, 8 deletions

diff --git a/app-text/poppler/files/digest-poppler-0.4.2 b/app-text/poppler/files/digest-poppler-0.4.2
deleted file mode 100644
index 2c60c15e4850..000000000000
--- a/app-text/poppler/files/digest-poppler-0.4.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 beb1eea135a3c5b679a7a22d01a500c0 poppler-0.4.2.tar.gz 777935
diff --git a/app-text/poppler/files/digest-poppler-0.4.3 b/app-text/poppler/files/digest-poppler-0.4.3
deleted file mode 100644
index 737819686e59..000000000000
--- a/app-text/poppler/files/digest-poppler-0.4.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 791dc78d8366eb05580183fe85174555 poppler-0.4.3.tar.gz 779582
diff --git a/app-text/poppler/files/digest-poppler-0.4.3-r1 b/app-text/poppler/files/digest-poppler-0.4.3-r1
deleted file mode 100644
index 101e5bbaf715..000000000000
--- a/app-text/poppler/files/digest-poppler-0.4.3-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 7952d78e9dece4f6f04a96af8185e197 poppler-0.4.3-utils.patch.gz 46235
-MD5 791dc78d8366eb05580183fe85174555 poppler-0.4.3.tar.gz 779582
diff --git a/app-text/poppler/files/digest-poppler-0.4.3-r2 b/app-text/poppler/files/digest-poppler-0.4.3-r2
deleted file mode 100644
index 101e5bbaf715..000000000000
--- a/app-text/poppler/files/digest-poppler-0.4.3-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 7952d78e9dece4f6f04a96af8185e197 poppler-0.4.3-utils.patch.gz 46235
-MD5 791dc78d8366eb05580183fe85174555 poppler-0.4.3.tar.gz 779582
diff --git a/app-text/poppler/files/digest-poppler-0.4.3-r3 b/app-text/poppler/files/digest-poppler-0.4.3-r3
deleted file mode 100644
index 101e5bbaf715..000000000000
--- a/app-text/poppler/files/digest-poppler-0.4.3-r3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 7952d78e9dece4f6f04a96af8185e197 poppler-0.4.3-utils.patch.gz 46235
-MD5 791dc78d8366eb05580183fe85174555 poppler-0.4.3.tar.gz 779582
diff --git a/app-text/poppler/files/digest-poppler-0.4.4 b/app-text/poppler/files/digest-poppler-0.4.4
new file mode 100644
index 000000000000..9a717b92ae3c
--- /dev/null
+++ b/app-text/poppler/files/digest-poppler-0.4.4
@@ -0,0 +1,2 @@
+MD5 9d70b144fcb400439bbdbb53c651257f poppler-0.4.4-utils.patch.gz 46293
+MD5 e081bca749a3373b2d95e696b7dddb9b poppler-0.4.4.tar.gz 783571
diff --git a/app-text/poppler/files/poppler-0.4.3-pdf2xml.patch b/app-text/poppler/files/poppler-0.4.3-pdf2xml.patch
new file mode 100644
index 000000000000..de6e69bce6af
--- /dev/null
+++ b/app-text/poppler/files/poppler-0.4.3-pdf2xml.patch
@@ -0,0 +1,32 @@
+diff --exclude-from=/home/dang/.diffrc -u -ruN poppler-0.4.3.orig/pdf2xml.dtd poppler-0.4.3/pdf2xml.dtd
+--- pdf2xml.dtd	1969-12-31 19:00:00.000000000 -0500
++++ pdf2xml.dtd	2006-01-16 17:44:43.000000000 -0500
+@@ -0,0 +1,28 @@
++<?xml version="1.0"?>
++<!ELEMENT pdf2xml (page+)>
++<!ELEMENT page (fontspec*, text*)>
++<!ATTLIST page
++	number CDATA #REQUIRED
++	position CDATA #REQUIRED
++	top CDATA #REQUIRED
++	left CDATA #REQUIRED
++	height CDATA #REQUIRED
++	width CDATA #REQUIRED
++>
++<!ELEMENT fontspec EMPTY>
++<!ATTLIST fontspec
++	id CDATA #REQUIRED
++	size CDATA #REQUIRED
++	family CDATA #REQUIRED
++	color CDATA #REQUIRED
++>
++<!ELEMENT text (#PCDATA | b | i)*>
++<!ATTLIST text
++	top CDATA #REQUIRED
++	left CDATA #REQUIRED
++	width CDATA #REQUIRED
++	height CDATA #REQUIRED
++	font CDATA #REQUIRED
++>
++<!ELEMENT b (#PCDATA)>
++<!ELEMENT i (#PCDATA)>
diff --git a/app-text/poppler/files/poppler-0.4.4-bug117481.patch b/app-text/poppler/files/poppler-0.4.4-bug117481.patch
new file mode 100644
index 000000000000..8e49388f27d3
--- /dev/null
+++ b/app-text/poppler/files/poppler-0.4.4-bug117481.patch
@@ -0,0 +1,23 @@
+diff --exclude-from=/home/dang/.diffrc -u -ruN poppler-0.4.4.orig/poppler/JBIG2Stream.cc poppler-0.4.4/poppler/JBIG2Stream.cc
+--- poppler-0.4.4.orig/poppler/JBIG2Stream.cc	2006-01-10 13:53:54.000000000 -0500
++++ poppler-0.4.4/poppler/JBIG2Stream.cc	2006-01-19 12:35:17.000000000 -0500
+@@ -7,6 +7,7 @@
+ //========================================================================
+ 
+ #include <config.h>
++#include <limits.h>
+ 
+ #ifdef USE_GCC_PRAGMAS
+ #pragma implementation
+@@ -2924,6 +2925,11 @@
+     return NULL;
+   }
+ 
++  if (w < 0 || h <= 0 || w >= INT_MAX / h) {
++    error(-1, "invalid width/height");
++    return NULL;
++  }
++
+   bitmap = new JBIG2Bitmap(0, w, h);
+   bitmap->clearToZero();
+ 
diff --git a/app-text/poppler/files/poppler-0.4.4-cairo-lines.patch b/app-text/poppler/files/poppler-0.4.4-cairo-lines.patch
new file mode 100644
index 000000000000..30cd2614ab75
--- /dev/null
+++ b/app-text/poppler/files/poppler-0.4.4-cairo-lines.patch
@@ -0,0 +1,16 @@
+diff --exclude-from=/home/dang/.diffrc -u -ruN poppler-0.4.4.orig/poppler/CairoOutputDev.cc poppler-0.4.4/poppler/CairoOutputDev.cc
+--- poppler-0.4.4.orig/poppler/CairoOutputDev.cc	2005-12-12 17:24:01.000000000 -0500
++++ poppler-0.4.4/poppler/CairoOutputDev.cc	2006-01-19 12:42:12.000000000 -0500
+@@ -189,7 +189,11 @@
+ 
+ void CairoOutputDev::updateLineWidth(GfxState *state) {
+   LOG(printf ("line width: %f\n", state->getTransformedLineWidth()));
+-  cairo_set_line_width (cairo, state->getTransformedLineWidth());
++  if (state->getTransformedLineWidth() == 0.0) {
++    cairo_set_line_width (cairo, 72.0/300.0);
++  } else {
++    cairo_set_line_width (cairo, state->getTransformedLineWidth());
++  }
+ }
+ 
+ void CairoOutputDev::updateFillColor(GfxState *state) {