Added an upstream patch to fix bug 189898. Thanks to Matthias Raffelsieper for informing us and providing the patch.

Package-Manager: portage-2.1.3.6

5 files changed, 85 insertions, 5 deletions

diff --git a/kde-base/kpdf/ChangeLog b/kde-base/kpdf/ChangeLog
index 0acf5ce42111..e4a1ba866c93 100644
--- a/kde-base/kpdf/ChangeLog
+++ b/kde-base/kpdf/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kpdf
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kpdf/ChangeLog,v 1.137 2007/08/11 15:53:45 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpdf/ChangeLog,v 1.138 2007/08/23 15:14:39 philantrop Exp $
+
+*kpdf-3.5.7-r2 (23 Aug 2007)
+
+  23 Aug 2007; Wulf C. Krueger <philantrop@gentoo.org>
+  +files/kpdf-3.5.7-hash_path.diff, +kpdf-3.5.7-r2.ebuild:
+  Added an upstream patch to fix bug 189898. Thanks to Matthias Raffelsieper
+  for informing us and providing the patch.
 
   11 Aug 2007; Raúl Porcel <armin76@gentoo.org> kpdf-3.5.7-r1.ebuild:
   x86 stable wrt #185823
diff --git a/kde-base/kpdf/Manifest b/kde-base/kpdf/Manifest
index 15ec3b476c1c..a0d33afa55ca 100644
--- a/kde-base/kpdf/Manifest
+++ b/kde-base/kpdf/Manifest
@@ -1,3 +1,10 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX kpdf-3.5.7-hash_path.diff 443 RMD160 e9e45aa4955fe8c0118ce2b4d1322c5ebd557e60 SHA1 804d2b7824815e949e31114fd1ca6b311dbcdfa6 SHA256 8641659f9f43612d53ea68906fdefac01ebdd221e84c5d50ebdcb2b8ce61027b
+MD5 a4c57f5b3b43eefe35bf543c1237a632 files/kpdf-3.5.7-hash_path.diff 443
+RMD160 e9e45aa4955fe8c0118ce2b4d1322c5ebd557e60 files/kpdf-3.5.7-hash_path.diff 443
+SHA256 8641659f9f43612d53ea68906fdefac01ebdd221e84c5d50ebdcb2b8ce61027b files/kpdf-3.5.7-hash_path.diff 443
 AUX post-3.5.5-kdegraphics-CVE-2007-0104.diff 2366 RMD160 27d47660b189b5956f70baf0666ce0ec563e22ea SHA1 885eee20b7afe720e59276ae155f7804f5cd1d55 SHA256 3bfaba3c19087ab94e1a719e4ca0332bb807a019a97f3b2886721390917e3daa
 MD5 a690ce46117257609c2b43485ea4d0d7 files/post-3.5.5-kdegraphics-CVE-2007-0104.diff 2366
 RMD160 27d47660b189b5956f70baf0666ce0ec563e22ea files/post-3.5.5-kdegraphics-CVE-2007-0104.diff 2366
@@ -26,14 +33,18 @@ EBUILD kpdf-3.5.7-r1.ebuild 1223 RMD160 5279f59c69594a60fcb9b9e6273c74432ee571e3
 MD5 85b9feb6377cca251fd3fb68f6dd8e64 kpdf-3.5.7-r1.ebuild 1223
 RMD160 5279f59c69594a60fcb9b9e6273c74432ee571e3 kpdf-3.5.7-r1.ebuild 1223
 SHA256 b77ccfd9e670f3b15df933530a8d5c0dc31cdeb5214a0f902cef90aee091604f kpdf-3.5.7-r1.ebuild 1223
+EBUILD kpdf-3.5.7-r2.ebuild 1267 RMD160 76c4688afd5e43e2e5f330d1bc7552f032a88072 SHA1 ef48fac8b80c8e22242e15db8e9b224dc12646c2 SHA256 3c506a1cf49037dc62c3e9df7e4282c32a0ee074f8f5fa993823697715d99e3e
+MD5 facdd87bb5b9acf5f35d5075ddfb27aa kpdf-3.5.7-r2.ebuild 1267
+RMD160 76c4688afd5e43e2e5f330d1bc7552f032a88072 kpdf-3.5.7-r2.ebuild 1267
+SHA256 3c506a1cf49037dc62c3e9df7e4282c32a0ee074f8f5fa993823697715d99e3e kpdf-3.5.7-r2.ebuild 1267
 EBUILD kpdf-3.5.7.ebuild 1160 RMD160 eff23765323e103b5350fd599c26f56806905f3f SHA1 7c46a709f1ebb6e8b7b016b025befa11c0b1a592 SHA256 056ba647a0cfdc165a8edec3d8b6d995d7296d59e569fb37c0c4924b295e28ae
 MD5 3b5e84030845ea479a4c51a6fe5c747f kpdf-3.5.7.ebuild 1160
 RMD160 eff23765323e103b5350fd599c26f56806905f3f kpdf-3.5.7.ebuild 1160
 SHA256 056ba647a0cfdc165a8edec3d8b6d995d7296d59e569fb37c0c4924b295e28ae kpdf-3.5.7.ebuild 1160
-MISC ChangeLog 18536 RMD160 a8fabcb905d442f481542d0b98a996eaa819a455 SHA1 7cd964caea0a65ecf34919ad0a2db91a5d71fd03 SHA256 1a12117b6d8b331f950430cf8b3d14df36df330d08550e4f29a79a8c85db0df8
-MD5 0517831efdb200eed29918128a7637ea ChangeLog 18536
-RMD160 a8fabcb905d442f481542d0b98a996eaa819a455 ChangeLog 18536
-SHA256 1a12117b6d8b331f950430cf8b3d14df36df330d08550e4f29a79a8c85db0df8 ChangeLog 18536
+MISC ChangeLog 18805 RMD160 eb5bb44dc4828bda3d851a5f6753366384d88f30 SHA1 47c5deaf4d2be4abce972ed6eedfc072f686aada SHA256 48169b3062ce55646b913aced3ad853a1908793385161f4149ab66ec85d1dbe1
+MD5 cbbca08d7d425e908ed1560aa9289227 ChangeLog 18805
+RMD160 eb5bb44dc4828bda3d851a5f6753366384d88f30 ChangeLog 18805
+SHA256 48169b3062ce55646b913aced3ad853a1908793385161f4149ab66ec85d1dbe1 ChangeLog 18805
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -53,3 +64,13 @@ SHA256 966352b87e403830c2a5583b276692e95d2fd1f2adfcca35e442eea893c7dc30 files/di
 MD5 cafdfdfc9d2cbe64afeacd252c6c23ad files/digest-kpdf-3.5.7-r1 259
 RMD160 1da8f54e69b92a192523c26c44f95a35acaa0efb files/digest-kpdf-3.5.7-r1 259
 SHA256 966352b87e403830c2a5583b276692e95d2fd1f2adfcca35e442eea893c7dc30 files/digest-kpdf-3.5.7-r1 259
+MD5 cafdfdfc9d2cbe64afeacd252c6c23ad files/digest-kpdf-3.5.7-r2 259
+RMD160 1da8f54e69b92a192523c26c44f95a35acaa0efb files/digest-kpdf-3.5.7-r2 259
+SHA256 966352b87e403830c2a5583b276692e95d2fd1f2adfcca35e442eea893c7dc30 files/digest-kpdf-3.5.7-r2 259
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.6 (GNU/Linux)
+
+iD8DBQFGzaRlCkvF58q80IkRAsyIAJ9o9dEb+pn8oMTfcIlerzKZX8UrnQCgotmP
+6dvYgBpuFNDs9ZCppK4PXCc=
+=mp2p
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kpdf/files/digest-kpdf-3.5.7-r2 b/kde-base/kpdf/files/digest-kpdf-3.5.7-r2
new file mode 100644
index 000000000000..ba24610e2ca5
--- /dev/null
+++ b/kde-base/kpdf/files/digest-kpdf-3.5.7-r2
@@ -0,0 +1,3 @@
+MD5 eae753e80c5f8dd304e7fd0dca84ae67 kdegraphics-3.5.7.tar.bz2 7424976
+RMD160 ccf36f5c34a1d484f0878a42a51dc620c2bdfa71 kdegraphics-3.5.7.tar.bz2 7424976
+SHA256 5689882ade29d0f56e95783f1c3e443fd512ca8291bcb81aac60ac719a8dcdcc kdegraphics-3.5.7.tar.bz2 7424976
diff --git a/kde-base/kpdf/files/kpdf-3.5.7-hash_path.diff b/kde-base/kpdf/files/kpdf-3.5.7-hash_path.diff
new file mode 100644
index 000000000000..1c3ac507c049
--- /dev/null
+++ b/kde-base/kpdf/files/kpdf-3.5.7-hash_path.diff
@@ -0,0 +1,10 @@
+--- branches/KDE/3.5/kdegraphics/kpdf/part.cpp #703563:703564
+@@ -612,7 +612,7 @@
+     m_pageView->showText(i18n("Reloading the document..."), 0);
+   }
+ 
+-  if (KParts::ReadOnlyPart::openURL(m_file))
++  if (KParts::ReadOnlyPart::openURL(KURL::fromPathOrURL(m_file)))
+   {
+     if (m_viewportDirty.pageNumber >= (int)m_document->pages()) m_viewportDirty.pageNumber = (int)m_document->pages() - 1;
+     m_document->setViewport(m_viewportDirty);
diff --git a/kde-base/kpdf/kpdf-3.5.7-r2.ebuild b/kde-base/kpdf/kpdf-3.5.7-r2.ebuild
new file mode 100644
index 000000000000..c8ecc69d2974
--- /dev/null
+++ b/kde-base/kpdf/kpdf-3.5.7-r2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpdf/kpdf-3.5.7-r2.ebuild,v 1.1 2007/08/23 15:14:39 philantrop Exp $
+
+KMNAME=kdegraphics
+MAXKDEVER=$PV
+KM_DEPRANGE="$PV $MAXKDEVER"
+inherit kde-meta flag-o-matic
+
+DESCRIPTION="kpdf, a kde pdf viewer based on xpdf"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+KMEXTRA="kfile-plugins/pdf"
+
+DEPEND=">=media-libs/freetype-2.0.5
+	media-libs/t1lib
+	>=app-text/poppler-0.5.1
+	>=app-text/poppler-bindings-0.5.1"
+RDEPEND="${DEPEND}
+	$(deprange-dual $PV $MAXKDEVER kde-base/kdeprint)"
+
+PATCHES="${FILESDIR}/post-3.5.7-kdegraphics-CVE-2007-3387.diff
+		${FILESDIR}/${P}-hash_path.diff"
+
+pkg_setup() {
+	kde_pkg_setup
+	# check for qt still until it had a revision bump in both ~arch and stable.
+	if ! built_with_use app-text/poppler-bindings qt3; then
+		eerror "This package requires app-text/poppler-bindings compiled with Qt 3.x support."
+		eerror "Please reemerge app-text/poppler-bindings with USE=\"qt3\"."
+		die "Please reemerge app-text/poppler-bindings with USE=\"qt3\"."
+	fi
+}
+
+src_compile() {
+	local myconf="--with-poppler"
+	replace-flags "-Os" "-O2" # see bug 114822
+	kde-meta_src_compile
+}