summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2005-08-06 19:43:34 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2005-08-06 19:43:34 +0000
commit2dd1664fb4f2b04a5feeac386687c0fb1e59afd4 (patch)
treef1a1ed48494a13a7852fc3188ca26a5e23794c72 /kde-base/kpdf
parentAdded ~mips for bug 87904. (diff)
downloadgentoo-2-2dd1664fb4f2b04a5feeac386687c0fb1e59afd4.tar.gz
gentoo-2-2dd1664fb4f2b04a5feeac386687c0fb1e59afd4.tar.bz2
gentoo-2-2dd1664fb4f2b04a5feeac386687c0fb1e59afd4.zip
Added patch to fix crashes while expanding content tree. Closes bug #101558.
(Portage version: 2.0.51.22)
Diffstat (limited to 'kde-base/kpdf')
-rw-r--r--kde-base/kpdf/ChangeLog8
-rw-r--r--kde-base/kpdf/Manifest15
-rw-r--r--kde-base/kpdf/files/digest-kpdf-3.4.2-r21
-rw-r--r--kde-base/kpdf/files/kdegraphics-3.4.2-kpdf-contentcrash.patch17
-rw-r--r--kde-base/kpdf/kpdf-3.4.2-r2.ebuild26
5 files changed, 60 insertions, 7 deletions
diff --git a/kde-base/kpdf/ChangeLog b/kde-base/kpdf/ChangeLog
index 41f30e3cb820..a83bde1eee69 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.16 2005/08/05 10:51:56 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpdf/ChangeLog,v 1.17 2005/08/06 19:41:53 flameeyes Exp $
+
+*kpdf-3.4.2-r2 (06 Aug 2005)
+
+ 06 Aug 2005; Diego Pettenò <flameeyes@gentoo.org>
+ +files/kdegraphics-3.4.2-kpdf-contentcrash.patch, +kpdf-3.4.2-r2.ebuild:
+ Added patch to fix crashes while expanding content tree. Closes bug #101558.
*kpdf-3.4.2-r1 (05 Aug 2005)
diff --git a/kde-base/kpdf/Manifest b/kde-base/kpdf/Manifest
index 37402d9a86d8..e7e64f7f648a 100644
--- a/kde-base/kpdf/Manifest
+++ b/kde-base/kpdf/Manifest
@@ -1,12 +1,15 @@
-MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 6a1d7716d80a0504f1ce5bcc020070e9 ChangeLog 2560
+MD5 04db5e71248a0e9cf0ec218da8a97f45 kpdf-3.4.2-r2.ebuild 753
MD5 710200655b097652c4ea66ea6e5931db kpdf-3.4.1.ebuild 569
+MD5 da8c7b95896e393c3af5901801f76253 kpdf-3.4.2-r1.ebuild 698
MD5 9d42c07d0672b69a347a437c76b5e024 kpdf-3.4.2.ebuild 578
-MD5 6a1d7716d80a0504f1ce5bcc020070e9 ChangeLog 2560
MD5 bc8fbf661d7ed9fd59cb6cf918e39335 kpdf-3.4.1-r1.ebuild 629
-MD5 da8c7b95896e393c3af5901801f76253 kpdf-3.4.2-r1.ebuild 698
-MD5 a603b1f40c870db682665f57f908df0e files/digest-kpdf-3.4.2 71
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
MD5 a603b1f40c870db682665f57f908df0e files/digest-kpdf-3.4.2-r1 71
-MD5 ec3b95efe9139f4259d6de213fe4b87b files/post-3.4.1-kdegraphics-4.diff 1827
MD5 1334abaee53983ad0a0810adeafef453 files/digest-kpdf-3.4.1-r1 221
-MD5 1334abaee53983ad0a0810adeafef453 files/digest-kpdf-3.4.1 221
+MD5 ec3b95efe9139f4259d6de213fe4b87b files/post-3.4.1-kdegraphics-4.diff 1827
MD5 4caddebea4d845abb2de6dbbfe1b979a files/kdegraphics-3.4.2-kpdf-fix.patch 1024
+MD5 a603b1f40c870db682665f57f908df0e files/digest-kpdf-3.4.2 71
+MD5 653bd55a1e87c51731d0b0512051774e files/kdegraphics-3.4.2-kpdf-contentcrash.patch 749
+MD5 a603b1f40c870db682665f57f908df0e files/digest-kpdf-3.4.2-r2 71
+MD5 1334abaee53983ad0a0810adeafef453 files/digest-kpdf-3.4.1 221
diff --git a/kde-base/kpdf/files/digest-kpdf-3.4.2-r2 b/kde-base/kpdf/files/digest-kpdf-3.4.2-r2
new file mode 100644
index 000000000000..80c5b0d96ab2
--- /dev/null
+++ b/kde-base/kpdf/files/digest-kpdf-3.4.2-r2
@@ -0,0 +1 @@
+MD5 50916460952c4142329a7c6a47fe1530 kdegraphics-3.4.2.tar.bz2 6579227
diff --git a/kde-base/kpdf/files/kdegraphics-3.4.2-kpdf-contentcrash.patch b/kde-base/kpdf/files/kdegraphics-3.4.2-kpdf-contentcrash.patch
new file mode 100644
index 000000000000..646eba2d81c9
--- /dev/null
+++ b/kde-base/kpdf/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/kpdf/kpdf-3.4.2-r2.ebuild b/kde-base/kpdf/kpdf-3.4.2-r2.ebuild
new file mode 100644
index 000000000000..d35a06ab88b0
--- /dev/null
+++ b/kde-base/kpdf/kpdf-3.4.2-r2.ebuild
@@ -0,0 +1,26 @@
+# 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-r2.ebuild,v 1.1 2005/08/06 19:41:53 flameeyes 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.
+# Fix crash in kpdf (kde bug 110111). Applied for 3.4.3.
+PATCHES1="${FILESDIR}/kdegraphics-3.4.2-kpdf-fix.patch
+ ${FILESDIR}/kdegraphics-3.4.2-kpdf-contentcrash.patch"
+
+src_compile() {
+ myconf="${myconf} $(use_enable !nodrm kpdf-drm)"
+
+ kde-meta_src_compile
+}