Add patch to fix regression in kpdf (#101119).

(Portage version: 2.0.51.22-r2)

4 files changed, 65 insertions, 1 deletions

diff --git a/kde-base/kpdf/ChangeLog b/kde-base/kpdf/ChangeLog
index 29c8d7edfe49..41f30e3cb820 100644
--- a/kde-base/kpdf/ChangeLog
+++ b/kde-base/kpdf/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kpdf
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kpdf/ChangeLog,v 1.15 2005/08/03 17:05:26 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpdf/ChangeLog,v 1.16 2005/08/05 10:51:56 greg_g Exp $
+
+*kpdf-3.4.2-r1 (05 Aug 2005)
+
+  05 Aug 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kdegraphics-3.4.2-kpdf-fix.patch, +kpdf-3.4.2-r1.ebuild:
+  Add patch to fix regression in kpdf (#101119).
 
 *kpdf-3.4.1-r1 (03 Aug 2005)
 
diff --git a/kde-base/kpdf/files/digest-kpdf-3.4.2-r1 b/kde-base/kpdf/files/digest-kpdf-3.4.2-r1
new file mode 100644
index 000000000000..80c5b0d96ab2
--- /dev/null
+++ b/kde-base/kpdf/files/digest-kpdf-3.4.2-r1
@@ -0,0 +1 @@
+MD5 50916460952c4142329a7c6a47fe1530 kdegraphics-3.4.2.tar.bz2 6579227
diff --git a/kde-base/kpdf/files/kdegraphics-3.4.2-kpdf-fix.patch b/kde-base/kpdf/files/kdegraphics-3.4.2-kpdf-fix.patch
new file mode 100644
index 000000000000..5462c6e03539
--- /dev/null
+++ b/kde-base/kpdf/files/kdegraphics-3.4.2-kpdf-fix.patch
@@ -0,0 +1,33 @@
+diff -Nur kdegraphics-3.4.2.orig/kpdf/xpdf/xpdf/PDFDoc.cc kdegraphics-3.4.2/kpdf/xpdf/xpdf/PDFDoc.cc
+--- kdegraphics-3.4.2.orig/kpdf/xpdf/xpdf/PDFDoc.cc	2005-07-20 12:00:36.000000000 +0200
++++ kdegraphics-3.4.2/kpdf/xpdf/xpdf/PDFDoc.cc	2005-08-05 11:46:39.000000000 +0200
+@@ -115,23 +115,19 @@
+ GBool PDFDoc::setup(GString *ownerPassword, GString *userPassword) {
+   str->reset();
+   
+-  char eof[8];
++  char *eof = new char[1024];
+   int pos = str->getPos();
+-  str->setPos(7, -1);
+-  eof[0] = str->getChar();
+-  eof[1] = str->getChar();
+-  eof[2] = str->getChar();
+-  eof[3] = str->getChar();
+-  eof[4] = str->getChar();
+-  eof[5] = str->getChar();
+-  eof[6] = str->getChar();
+-  eof[7] = '\0';
++  str->setPos(1024, -1);
++  for (int i = 0; i < 1024; i++) eof[i] = str->getChar();
++  eof[1024] = '\0';
+   if (strstr(eof, "%%EOF") == NULL)
+   {
+     error(-1, "Document does not have ending %%EOF");	      
+     errCode = errDamaged;
++    delete[] eof;
+     return gFalse;
+   }
++  delete[] eof;
+   
+   str->setPos(pos);
+   
diff --git a/kde-base/kpdf/kpdf-3.4.2-r1.ebuild b/kde-base/kpdf/kpdf-3.4.2-r1.ebuild
new file mode 100644
index 000000000000..d7cba0692734
--- /dev/null
+++ b/kde-base/kpdf/kpdf-3.4.2-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpdf/kpdf-3.4.2-r1.ebuild,v 1.1 2005/08/05 10:51:56 greg_g Exp $
+
+KMNAME=kdegraphics
+MAXKDEVER=$PV
+KM_DEPRANGE="$PV $MAXKDEVER"
+inherit kde-meta
+
+DESCRIPTION="kpdf, a kde pdf viewer based on xpdf"
+KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="nodrm"
+KMEXTRA="kfile-plugins/pdf"
+
+DEPEND=">=media-libs/freetype-2.0.5 media-libs/t1lib"
+
+# Fix regression in kpdf (kde bug 110000). Applied for 3.4.3.
+PATCHES1="${FILESDIR}/kdegraphics-3.4.2-kpdf-fix.patch"
+
+src_compile() {
+	myconf="${myconf} $(use_enable !nodrm kpdf-drm)"
+
+	kde-meta_src_compile
+}