Update to KDE 3.5.1

Changes:
* KPDF
  o Fix constant disk I/O when resizing Navigation panel
  o Fix Wrong page size and layout in some documents
  o Fix DCT decoding for broken files
  o Fix crash in some strange documents
  o Fix slowlyness on documents with broken TOC definition
  o Make non existant ps file loading fail gracefully
* KIconEdit
  o Needs configuration dialog help, proper markup for toolbars

4 files changed, 28 insertions, 26 deletions

diff --git a/graphics/kdegraphics3/Makefile b/graphics/kdegraphics3/Makefile
index dcd8939f784..fedaa4cf839 100644
--- a/graphics/kdegraphics3/Makefile
+++ b/graphics/kdegraphics3/Makefile
@@ -1,13 +1,9 @@
-# $NetBSD: Makefile,v 1.57 2006/01/24 07:32:15 wiz Exp $
+# $NetBSD: Makefile,v 1.58 2006/01/31 22:47:11 markd Exp $
 
 DISTNAME=	kdegraphics-${_KDE_VERSION}
-PKGREVISION=	3
 CATEGORIES=	graphics
 COMMENT=	Graphics programs for the KDE integrated X11 desktop
 
-PATCH_SITES=	ftp://ftp.kde.org/pub/kde/security_patches/
-PATCHFILES=	post-3.5.0-kdegraphics-CAN-2005-3193.diff
-
 .include "../../meta-pkgs/kde3/Makefile.kde3"
 
 USE_DIRS+=		xdg-1.1
diff --git a/graphics/kdegraphics3/PLIST b/graphics/kdegraphics3/PLIST
index fc7a59d3100..bab2cb7f77f 100644
--- a/graphics/kdegraphics3/PLIST
+++ b/graphics/kdegraphics3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.25 2005/12/11 13:00:12 markd Exp $
+@comment $NetBSD: PLIST,v 1.26 2006/01/31 22:47:11 markd Exp $
 bin/kcolorchooser
 bin/kcoloredit
 bin/kdvi
@@ -307,6 +307,7 @@ share/doc/kde/HTML/en/kghostview/index.docbook
 share/doc/kde/HTML/en/kiconedit/common
 share/doc/kde/HTML/en/kiconedit/index.cache.bz2
 share/doc/kde/HTML/en/kiconedit/index.docbook
+share/doc/kde/HTML/en/kiconedit/kiconedit-configuration.png
 share/doc/kde/HTML/en/kolourpaint/brush_shapes.png
 share/doc/kde/HTML/en/kolourpaint/color_box.png
 share/doc/kde/HTML/en/kolourpaint/common
@@ -327,6 +328,7 @@ share/doc/kde/HTML/en/kolourpaint/image_skew.png
 share/doc/kde/HTML/en/kolourpaint/image_soften_sharpen.png
 share/doc/kde/HTML/en/kolourpaint/index.cache.bz2
 share/doc/kde/HTML/en/kolourpaint/index.docbook
+share/doc/kde/HTML/en/kolourpaint/kolourpaint-main.png
 share/doc/kde/HTML/en/kolourpaint/line_width.png
 share/doc/kde/HTML/en/kolourpaint/lines_30_45_deg.png
 share/doc/kde/HTML/en/kolourpaint/lines_30_deg.png
@@ -357,6 +359,7 @@ share/doc/kde/HTML/en/kolourpaint/tool_rounded_rectangle.png
 share/doc/kde/HTML/en/kolourpaint/tool_selections.png
 share/doc/kde/HTML/en/kolourpaint/tool_spraycan.png
 share/doc/kde/HTML/en/kolourpaint/tool_text.png
+share/doc/kde/HTML/en/kolourpaint/view_thumbnails.png
 share/doc/kde/HTML/en/kooka/common
 share/doc/kde/HTML/en/kooka/index.cache.bz2
 share/doc/kde/HTML/en/kooka/index.docbook
@@ -370,6 +373,7 @@ share/doc/kde/HTML/en/kooka/toolbar.png
 share/doc/kde/HTML/en/kooka/toolbar1.png
 share/doc/kde/HTML/en/kooka/toolbar2.png
 share/doc/kde/HTML/en/kpdf/common
+share/doc/kde/HTML/en/kpdf/configure.png
 share/doc/kde/HTML/en/kpdf/index.cache.bz2
 share/doc/kde/HTML/en/kpdf/index.docbook
 share/doc/kde/HTML/en/kpovmodeler/cameraview.png
@@ -439,6 +443,8 @@ share/doc/kde/HTML/en/kuickshow/screenshot.png
 share/doc/kde/HTML/en/kview/common
 share/doc/kde/HTML/en/kview/index.cache.bz2
 share/doc/kde/HTML/en/kview/index.docbook
+share/doc/kde/HTML/en/kview/kview-application-configuration.png
+share/doc/kde/HTML/en/kview/kview-viewer-configuration.png
 share/kde/applnk/Graphics/kruler.desktop
 share/kde/apps/djvumultipage.rc
 share/kde/apps/kcoloredit/kcoloreditui.rc
diff --git a/graphics/kdegraphics3/distinfo b/graphics/kdegraphics3/distinfo
index ba82fade25c..82fcbdb47a4 100644
--- a/graphics/kdegraphics3/distinfo
+++ b/graphics/kdegraphics3/distinfo
@@ -1,9 +1,6 @@
-$NetBSD: distinfo,v 1.34 2006/01/05 10:20:43 markd Exp $
+$NetBSD: distinfo,v 1.35 2006/01/31 22:47:11 markd Exp $
 
-SHA1 (kdegraphics-3.5.0.tar.bz2) = ca693ae50a9392f7a8cddcc7d16ff0931d537e9a
-RMD160 (kdegraphics-3.5.0.tar.bz2) = 2cc19bad06d2bdd0c96adc95db007d7fc140602f
-Size (kdegraphics-3.5.0.tar.bz2) = 7094349 bytes
-SHA1 (post-3.5.0-kdegraphics-CAN-2005-3193.diff) = c3914c7c6345fecc4e689a0479a40fe89825b193
-RMD160 (post-3.5.0-kdegraphics-CAN-2005-3193.diff) = 71460faa87ab74fd3688d16559340702faccfc30
-Size (post-3.5.0-kdegraphics-CAN-2005-3193.diff) = 8611 bytes
-SHA1 (patch-aa) = 8013a004b06b6cd3150e1e7f01decbd8311ace46
+SHA1 (kdegraphics-3.5.1.tar.bz2) = 2cf6d50576f5bcb72fd2e54f80250d3b0816fd1e
+RMD160 (kdegraphics-3.5.1.tar.bz2) = a8b2b94c0378c689c9be808a1f57e93ecef54418
+Size (kdegraphics-3.5.1.tar.bz2) = 7315482 bytes
+SHA1 (patch-aa) = aa3c7573c3b18af4d7964224cdc11bf19f04f969
diff --git a/graphics/kdegraphics3/patches/patch-aa b/graphics/kdegraphics3/patches/patch-aa
index fccfc277720..cc733fa321a 100644
--- a/graphics/kdegraphics3/patches/patch-aa
+++ b/graphics/kdegraphics3/patches/patch-aa
@@ -1,13 +1,16 @@
-$NetBSD: patch-aa,v 1.9 2005/12/11 13:00:12 markd Exp $
+$NetBSD: patch-aa,v 1.10 2006/01/31 22:47:11 markd Exp $
 
---- kpovmodeler/pmshell.cpp	2005/07/26 18:54:59	438982
-+++ kpovmodeler/pmshell.cpp	2005/11/26 15:25:33	483453
-@@ -641,7 +641,7 @@
- 
- bool PMShell::overwriteURL( const KURL& u )
- {
--   int query = KMessageBox::Yes;
-+   int query = KMessageBox::Continue;
- 
-    if( u.isLocalFile( ) )
-    {
+--- kpdf/part.cpp.orig	2006-01-20 05:38:22.000000000 +1300
++++ kpdf/part.cpp
+@@ -697,6 +697,11 @@ void Part::slotSaveFileAs()
+     KURL saveURL = KFileDialog::getSaveURL( url().isLocalFile() ? url().url() : url().fileName(), QString::null, widget() );
+     if ( saveURL.isValid() && !saveURL.isEmpty() )
+     {
++	if (saveURL == url())
++	{
++		KMessageBox::information( widget(), i18n("You are trying to overwrite \"%1\" with itself. This is not allowed. Please save it in another location.").arg(saveURL.filename()) );
++		return;
++	}
+         if ( KIO::NetAccess::exists( saveURL, false, widget() ) )
+         {
+             if (KMessageBox::warningContinueCancel( widget(), i18n("A file named \"%1\" already exists. Are you sure you want to overwrite it?").arg(saveURL.filename()), QString::null, i18n("Overwrite")) != KMessageBox::Continue)