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

(Portage version: 2.1.3.6)

4 files changed, 87 insertions, 1 deletions

diff --git a/kde-base/kdegraphics/ChangeLog b/kde-base/kdegraphics/ChangeLog
index 62468550a016..9a3475d196eb 100644
--- a/kde-base/kdegraphics/ChangeLog
+++ b/kde-base/kdegraphics/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdegraphics
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/ChangeLog,v 1.313 2007/08/15 05:20:27 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/ChangeLog,v 1.314 2007/08/23 17:40:16 philantrop Exp $
+
+*kdegraphics-3.5.7-r2 (23 Aug 2007)
+
+  23 Aug 2007; Wulf C. Krueger <philantrop@gentoo.org>
+  +files/kpdf-3.5.7-hash_path.diff, +kdegraphics-3.5.7-r2.ebuild:
+  Added an upstream patch to fix bug 189898. Thanks to Matthias Raffelsieper
+  for informing us and providing the patch.
 
   15 Aug 2007; Jeroen Roovers <jer@gentoo.org> kdegraphics-3.5.7-r1.ebuild:
   Stable for HPPA (bug #176297).
diff --git a/kde-base/kdegraphics/files/digest-kdegraphics-3.5.7-r2 b/kde-base/kdegraphics/files/digest-kdegraphics-3.5.7-r2
new file mode 100644
index 000000000000..ba24610e2ca5
--- /dev/null
+++ b/kde-base/kdegraphics/files/digest-kdegraphics-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/kdegraphics/files/kpdf-3.5.7-hash_path.diff b/kde-base/kdegraphics/files/kpdf-3.5.7-hash_path.diff
new file mode 100644
index 000000000000..1c3ac507c049
--- /dev/null
+++ b/kde-base/kdegraphics/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/kdegraphics/kdegraphics-3.5.7-r2.ebuild b/kde-base/kdegraphics/kdegraphics-3.5.7-r2.ebuild
new file mode 100644
index 000000000000..566b5836512b
--- /dev/null
+++ b/kde-base/kdegraphics/kdegraphics-3.5.7-r2.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/kdegraphics-3.5.7-r2.ebuild,v 1.1 2007/08/23 17:40:16 philantrop Exp $
+
+inherit kde-dist eutils
+
+DESCRIPTION="KDE graphics-related apps"
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="gphoto2 imlib openexr opengl pdf povray scanner tetex"
+
+DEPEND="~kde-base/kdebase-${PV}
+	>=media-libs/freetype-2
+	media-libs/fontconfig
+	gphoto2? ( media-libs/libgphoto2 )
+	scanner? ( media-gfx/sane-backends )
+	media-libs/libart_lgpl
+	media-libs/lcms
+	dev-libs/fribidi
+	imlib? ( media-libs/imlib )
+	virtual/ghostscript
+	media-libs/tiff
+	openexr? ( >=media-libs/openexr-1.2 )
+	povray? ( media-gfx/povray
+				virtual/opengl )
+	pdf? ( >=app-text/poppler-0.5.1
+			>=app-text/poppler-bindings-0.5.1 )"
+
+RDEPEND="${DEPEND}
+	tetex? (
+	|| ( >=app-text/tetex-2
+		app-text/ptex
+		app-text/cstetex
+		app-text/dvipdfm ) )"
+
+PATCHES="${FILESDIR}/post-3.5.7-kdegraphics-CVE-2007-3387.diff
+		${FILESDIR}/kpdf-3.5.7-hash_path.diff"
+
+pkg_setup() {
+	kde_pkg_setup
+	for ghostscript in app-text/ghostscript-{gnu,esp,afpl}; do
+		if has_version ${ghostscript} && ! built_with_use ${ghostscript} X; then
+			eerror "This package requires ${ghostscript} compiled with X11 support."
+			eerror "Please reemerge ${ghostscript} with USE=\"X\"."
+			die "Please reemerge ${ghostscript} with USE=\"X\"."
+		fi
+	done
+	if use pdf && ! 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="$(use_with openexr) $(use_with pdf poppler)
+					$(use_with gphoto2 kamera)"
+
+	use imlib || export DO_NOT_COMPILE="${DO_NOT_COMPILE} kuickshow"
+	use scanner || export DO_NOT_COMPILE="${DO_NOT_COMPILE} kooka libkscan"
+	use povray || export DO_NOT_COMPILE="${DO_NOT_COMPILE} kpovmodeler"
+	use pdf || export DO_NOT_COMPILE="${DO_NOT_COMPILE} kpdf"
+
+	rm -f "${S}/configure" # ask rebuilding
+	kde_src_compile
+}