Added patch to fix crashes while expanding content tree. Closes bug #101558.

(Portage version: 2.0.51.22)

5 files changed, 121 insertions, 17 deletions

diff --git a/kde-base/kdegraphics/ChangeLog b/kde-base/kdegraphics/ChangeLog
index 02f0200eb528..745ffac63db6 100644
--- a/kde-base/kdegraphics/ChangeLog
+++ b/kde-base/kdegraphics/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdegraphics
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/ChangeLog,v 1.173 2005/08/05 10:50:18 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/ChangeLog,v 1.174 2005/08/06 19:43:33 flameeyes Exp $
+
+*kdegraphics-3.4.2-r2 (06 Aug 2005)
+
+  06 Aug 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/kdegraphics-3.4.2-kpdf-contentcrash.patch,
+  +kdegraphics-3.4.2-r2.ebuild:
+  Added patch to fix crashes while expanding content tree. Closes bug #101558.
 
 *kdegraphics-3.4.1-r1 (03 Aug 2005)
 *kdegraphics-3.3.2-r3 (03 Aug 2005)
diff --git a/kde-base/kdegraphics/Manifest b/kde-base/kdegraphics/Manifest
index 260bc9f7fa7c..44807d572b11 100644
--- a/kde-base/kdegraphics/Manifest
+++ b/kde-base/kdegraphics/Manifest
@@ -1,29 +1,32 @@
-MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
-MD5 147b40df8ee62b12632ebe33507a1f64 kdegraphics-3.4.2.ebuild 1721
-MD5 d168992c0e7f21589c7706bf69219dce kdegraphics-3.2.3-r4.ebuild 1372
-MD5 98852f97b55a3d2f778aa9ee9b6a1396 kdegraphics-3.4.1.ebuild 1394
+MD5 cd6283a60623f0f3e3e131793cd6ae35 kdegraphics-3.4.2-r1.ebuild 1940
 MD5 b58a263484fa16a71211a88e09af6413 kdegraphics-3.3.2-r3.ebuild 1618
 MD5 ab9b0dd6c3fb9686a9abef480fb107d1 ChangeLog 24514
 MD5 d2028ede99c0950869e387c95f0748c9 kdegraphics-3.2.3-r3.ebuild 1329
-MD5 e7282e47441555900d998ade40e5da5b kdegraphics-3.3.2-r2.ebuild 1559
+MD5 98852f97b55a3d2f778aa9ee9b6a1396 kdegraphics-3.4.1.ebuild 1394
+MD5 d168992c0e7f21589c7706bf69219dce kdegraphics-3.2.3-r4.ebuild 1372
+MD5 bbd2b29b5028d6fcb3457e5fbdb483ab kdegraphics-3.4.2-r2.ebuild 2063
+MD5 147b40df8ee62b12632ebe33507a1f64 kdegraphics-3.4.2.ebuild 1721
 MD5 de2404eddb112b8278447e036036bc11 kdegraphics-3.4.1-r1.ebuild 1447
-MD5 cd6283a60623f0f3e3e131793cd6ae35 kdegraphics-3.4.2-r1.ebuild 1940
+MD5 e7282e47441555900d998ade40e5da5b kdegraphics-3.3.2-r2.ebuild 1559
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 MD5 4a4bcdcb2456ab92b7846b6646da1bcb files/post-3.3.1-kdegraphics-4.diff 1797
+MD5 9eb12845ce85cc31e216d463877cb519 files/digest-kdegraphics-3.3.2-r3 71
 MD5 a603b1f40c870db682665f57f908df0e files/digest-kdegraphics-3.4.2-r1 71
-MD5 72b0e0cd29559b5ac4a20829a3da892c files/kdegraphics-3.4-configure.patch 847
-MD5 e43eeb201ab38aa05917d4de1573ff59 files/digest-kdegraphics-3.2.3-r4 71
+MD5 a603b1f40c870db682665f57f908df0e files/digest-kdegraphics-3.4.2 71
 MD5 c52515e268cbff75a6f7b7d1ee1fad47 files/kdegraphics-3.4-gcc4.patch 1226
-MD5 0abb98c262645006a4b116c0635edb49 files/kdegraphics-3.4.1-gocr.patch 454
-MD5 bf6b28780e0f5ea8f99e0777187e73cb files/post-3.3.2-kdegraphics.diff 1385
 MD5 9eb12845ce85cc31e216d463877cb519 files/digest-kdegraphics-3.3.2-r2 71
 MD5 1a6dde4414b4ad894e4ed7ed3fa919ff files/digest-kdegraphics-3.4.1 71
 MD5 ec3b95efe9139f4259d6de213fe4b87b files/post-3.4.1-kdegraphics-4.diff 1827
-MD5 870d90051bb236753070fb553890f95d files/post-3.2.3-kdegraphics_2.diff 3205
-MD5 e43eeb201ab38aa05917d4de1573ff59 files/digest-kdegraphics-3.2.3-r3 71
+MD5 4caddebea4d845abb2de6dbbfe1b979a files/kdegraphics-3.4.2-kpdf-fix.patch 1024
 MD5 284f518172a2843428d308d2d48bbbee files/CAN-2005-0064.patch 793
+MD5 870d90051bb236753070fb553890f95d files/post-3.2.3-kdegraphics_2.diff 3205
+MD5 26b54ece47e2617478338586ebfd253d files/post-3.2.3-kdegraphics-2.diff 1742
 MD5 1a6dde4414b4ad894e4ed7ed3fa919ff files/digest-kdegraphics-3.4.1-r1 71
+MD5 0abb98c262645006a4b116c0635edb49 files/kdegraphics-3.4.1-gocr.patch 454
+MD5 a603b1f40c870db682665f57f908df0e files/digest-kdegraphics-3.4.2-r2 71
 MD5 d97c962408abd235435f6857fc405ebf files/kdegraphics-3.2.3-gcc34-compile.patch 7162
-MD5 9eb12845ce85cc31e216d463877cb519 files/digest-kdegraphics-3.3.2-r3 71
-MD5 4caddebea4d845abb2de6dbbfe1b979a files/kdegraphics-3.4.2-kpdf-fix.patch 1024
-MD5 a603b1f40c870db682665f57f908df0e files/digest-kdegraphics-3.4.2 71
-MD5 26b54ece47e2617478338586ebfd253d files/post-3.2.3-kdegraphics-2.diff 1742
+MD5 72b0e0cd29559b5ac4a20829a3da892c files/kdegraphics-3.4-configure.patch 847
+MD5 653bd55a1e87c51731d0b0512051774e files/kdegraphics-3.4.2-kpdf-contentcrash.patch 749
+MD5 e43eeb201ab38aa05917d4de1573ff59 files/digest-kdegraphics-3.2.3-r3 71
+MD5 bf6b28780e0f5ea8f99e0777187e73cb files/post-3.3.2-kdegraphics.diff 1385
+MD5 e43eeb201ab38aa05917d4de1573ff59 files/digest-kdegraphics-3.2.3-r4 71
diff --git a/kde-base/kdegraphics/files/digest-kdegraphics-3.4.2-r2 b/kde-base/kdegraphics/files/digest-kdegraphics-3.4.2-r2
new file mode 100644
index 000000000000..80c5b0d96ab2
--- /dev/null
+++ b/kde-base/kdegraphics/files/digest-kdegraphics-3.4.2-r2
@@ -0,0 +1 @@
+MD5 50916460952c4142329a7c6a47fe1530 kdegraphics-3.4.2.tar.bz2 6579227
diff --git a/kde-base/kdegraphics/files/kdegraphics-3.4.2-kpdf-contentcrash.patch b/kde-base/kdegraphics/files/kdegraphics-3.4.2-kpdf-contentcrash.patch
new file mode 100644
index 000000000000..646eba2d81c9
--- /dev/null
+++ b/kde-base/kdegraphics/files/kdegraphics-3.4.2-kpdf-contentcrash.patch
@@ -0,0 +1,17 @@
+diff -ur kdegraphics-3.4.2/kpdf/ui/toc.cpp kdegraphics-3.4.2-contentcrash/kpdf/ui/toc.cpp
+--- kdegraphics-3.4.2/kpdf/ui/toc.cpp	2005-07-20 12:00:37.000000000 +0200
++++ kdegraphics-3.4.2-contentcrash/kpdf/ui/toc.cpp	2005-08-06 21:17:27.000000000 +0200
+@@ -121,7 +121,12 @@
+ 
+ void TOC::slotExecuted( QListViewItem *i )
+ {
+-    const QDomElement & e = static_cast< TOCItem* >( i )->element();
++    TOCItem* tocItem = dynamic_cast<TOCItem*>( i ); 
++    // that filters clicks on [+] that for a strange reason don't seem to be TOCItem* 
++    if (tocItem == NULL) 
++        return; 
++    const QDomElement & e = tocItem->element(); 
++     
+     QString externalFileName = e.attribute( "ExternalFileName" );
+     if ( !externalFileName.isEmpty() )
+     {
diff --git a/kde-base/kdegraphics/kdegraphics-3.4.2-r2.ebuild b/kde-base/kdegraphics/kdegraphics-3.4.2-r2.ebuild
new file mode 100644
index 000000000000..b01f0594b2e4
--- /dev/null
+++ b/kde-base/kdegraphics/kdegraphics-3.4.2-r2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/kdegraphics-3.4.2-r2.ebuild,v 1.1 2005/08/06 19:43:34 flameeyes Exp $
+
+inherit kde-dist eutils
+
+DESCRIPTION="KDE graphics-related apps"
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
+IUSE="gphoto2 imlib nodrm openexr opengl 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 )"
+
+RDEPEND="${DEPEND}
+	app-text/xpdf
+	tetex? (
+	|| ( >=app-text/tetex-2
+	     app-text/ptex
+	     app-text/cstetex
+	     app-text/dvipdfm ) )"
+
+DEPEND="${DEPEND}
+	dev-util/pkgconfig"
+
+src_unpack() {
+	kde_src_unpack
+
+	# Fix detection of gocr (kde bug 90082).
+	epatch "${FILESDIR}/kdegraphics-3.4.1-gocr.patch"
+
+	# Fix regression in kpdf (kde bug 110000). Applied for 3.4.3.
+	epatch "${FILESDIR}/kdegraphics-3.4.2-kpdf-fix.patch"
+
+	# Fix compilation with gcc4. Applied for 3.5.
+	epatch "${FILESDIR}/kdegraphics-3.4-gcc4.patch"
+
+	# Configure patch. Applied for 3.5.
+	epatch "${FILESDIR}/kdegraphics-3.4-configure.patch"
+
+	# Fix crash in kpdf (kde bug 110111). Applied for 3.4.3.
+	epatch "${FILESDIR}/kdegraphics-3.4.2-kpdf-contentcrash.patch"
+
+	# For the configure patch.
+	make -f admin/Makefile.common
+}
+
+src_compile() {
+	if use gphoto2; then
+		myconf="${myconf} --with-kamera \
+				  --with-gphoto2-includes=/usr/include/gphoto2 \
+				  --with-gphoto2-libraries=/usr/lib/gphoto2"
+	else
+		myconf="${myconf} --without-kamera"
+	fi
+
+	use scanner || export DO_NOT_COMPILE="${DO_NOT_COMPILE} kooka libkscan"
+	use povray || export DO_NOT_COMPILE="${DO_NOT_COMPILE} kpovmodeler"
+
+	myconf="${myconf} $(use_with imlib) $(use_enable !nodrm kpdf-drm)
+		$(use_with openexr)"
+
+	kde_src_compile
+}