Update to KDE 3.5.6

KolourPaint
* Fix crash triggered by rapidly deselecting the selection after
  drag-scaling it.

KPDF
* Show only the filename instead of the whole path in the KPDF window
  caption.
* Make viewport scroll when selection reaches the viewport border.
* Put the right title when generating PostScript documents (e.g. when
  printing).
* Show a 'keep password' checkbox when using a wallet so the user can
  decide if he wants the password saved in the wallet.
* Allow to cancel selecting by pressing Esc.
* Preload next and previous page if threading is enabled and memory
  usage setting is not low.
* Fix kpdf ignoring user defined margins when printing.
* Fix crash when using the mouse wheel over the page view with no
  document opened.
* Fix crash on some broken pdf files.
* Finally fix session restoring.
* Fix presentation mode not beign kept when a watched file changes
  and presentation mode is open.
* Fix presentation mode times beign strange when having auto-advance
  on and changing pages manually.
* Fix some small memory leaks.

kfax
* Fix handling of filenames with non-ascii chars.

kghostview
* Fix crash when clicking anywhere in the open file dialog in fullscreen
  mode.
* Fix off-by-one issue during parsing certain ps files.

kmrml
* Show an error messagebox when indexing failed.
* Check for a valid gift installation and disable the indexing GUI if
  not found.

kfile-plugins
* Improve exif information reading.
* Fix endless recursion with malicious input files.

3 files changed, 114 insertions, 125 deletions

diff --git a/graphics/kdegraphics3/Makefile b/graphics/kdegraphics3/Makefile
index 0b12e630c15..0ed5689ec3b 100644
--- a/graphics/kdegraphics3/Makefile
+++ b/graphics/kdegraphics3/Makefile
@@ -1,16 +1,11 @@
-# $NetBSD: Makefile,v 1.70 2007/01/17 10:33:06 markd Exp $
+# $NetBSD: Makefile,v 1.71 2007/01/26 03:21:31 markd Exp $
 
 DISTNAME=	kdegraphics-${_KDE_VERSION}
-PKGREVISION=	2
 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.5-kdegraphics.diff post-3.5.5-kdegraphics-CVE-2007-0104.diff
-
 .include "../../meta-pkgs/kde3/Makefile.kde3"
 
-USE_DIRS+=		xdg-1.1
 USE_TOOLS+=		gs:run pkg-config
 
 BUILDLINK_API_DEPENDS.lcms+=	lcms>=1.12
@@ -33,6 +28,7 @@ LDFLAGS+=		${EXPORT_SYMBOLS_LDFLAGS}
 .include "../../converters/fribidi/buildlink3.mk"
 .include "../../devel/libgphoto2/buildlink3.mk"
 .include "../../graphics/glut/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/imlib/buildlink3.mk"
 .include "../../graphics/openexr/buildlink3.mk"
 .include "../../graphics/sane-backends/buildlink3.mk"
diff --git a/graphics/kdegraphics3/PLIST b/graphics/kdegraphics3/PLIST
index 6b242335929..88a9826c3a4 100644
--- a/graphics/kdegraphics3/PLIST
+++ b/graphics/kdegraphics3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.29 2006/08/02 14:11:12 markd Exp $
+@comment $NetBSD: PLIST,v 1.30 2007/01/26 03:21:31 markd Exp $
 bin/kcolorchooser
 bin/kcoloredit
 bin/kdvi
@@ -445,6 +445,89 @@ 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/icons/crystalsvg/16x16/actions/camera_test.png
+share/icons/crystalsvg/16x16/actions/palette_color.png
+share/icons/crystalsvg/16x16/actions/palette_gray.png
+share/icons/crystalsvg/16x16/actions/palette_halftone.png
+share/icons/crystalsvg/16x16/actions/palette_lineart.png
+share/icons/crystalsvg/16x16/apps/camera.png
+share/icons/crystalsvg/16x16/apps/kviewshell.png
+share/icons/crystalsvg/16x16/apps/photobook.png
+share/icons/crystalsvg/16x16/devices/camera.png
+share/icons/crystalsvg/16x16/mimetypes/kpovmodeler_doc.png
+share/icons/crystalsvg/22x22/apps/photobook.png
+share/icons/crystalsvg/22x22/devices/camera.png
+share/icons/crystalsvg/22x22/filesystems/camera.png
+share/icons/crystalsvg/32x32/apps/kviewshell.png
+share/icons/crystalsvg/32x32/devices/camera.png
+share/icons/crystalsvg/32x32/filesystems/camera.png
+share/icons/crystalsvg/32x32/mimetypes/kpovmodeler_doc.png
+share/icons/crystalsvg/48x48/apps/kviewshell.png
+share/icons/crystalsvg/48x48/mimetypes/kpovmodeler_doc.png
+share/icons/hicolor/128x128/apps/kghostview.png
+share/icons/hicolor/128x128/apps/kpdf.png
+share/icons/hicolor/16x16/apps/kcolorchooser.png
+share/icons/hicolor/16x16/apps/kcoloredit.png
+share/icons/hicolor/16x16/apps/kdvi.png
+share/icons/hicolor/16x16/apps/kfax.png
+share/icons/hicolor/16x16/apps/kfaxview.png
+share/icons/hicolor/16x16/apps/kgamma.png
+share/icons/hicolor/16x16/apps/kghostview.png
+share/icons/hicolor/16x16/apps/kiconedit.png
+share/icons/hicolor/16x16/apps/kolourpaint.png
+share/icons/hicolor/16x16/apps/kpdf.png
+share/icons/hicolor/16x16/apps/kpovmodeler.png
+share/icons/hicolor/16x16/apps/kruler.png
+share/icons/hicolor/16x16/apps/ksnapshot.png
+share/icons/hicolor/16x16/apps/kuickshow.png
+share/icons/hicolor/16x16/apps/kview.png
+share/icons/hicolor/22x22/apps/kcolorchooser.png
+share/icons/hicolor/22x22/apps/kdvi.png
+share/icons/hicolor/22x22/apps/kfax.png
+share/icons/hicolor/22x22/apps/kfaxview.png
+share/icons/hicolor/22x22/apps/kghostview.png
+share/icons/hicolor/22x22/apps/kiconedit.png
+share/icons/hicolor/22x22/apps/kolourpaint.png
+share/icons/hicolor/22x22/apps/kpdf.png
+share/icons/hicolor/22x22/apps/kpovmodeler.png
+share/icons/hicolor/22x22/apps/kruler.png
+share/icons/hicolor/22x22/apps/ksnapshot.png
+share/icons/hicolor/22x22/apps/kuickshow.png
+share/icons/hicolor/22x22/apps/kview.png
+share/icons/hicolor/32x32/apps/kcoloredit.png
+share/icons/hicolor/32x32/apps/kdvi.png
+share/icons/hicolor/32x32/apps/kfax.png
+share/icons/hicolor/32x32/apps/kfaxview.png
+share/icons/hicolor/32x32/apps/kgamma.png
+share/icons/hicolor/32x32/apps/kghostview.png
+share/icons/hicolor/32x32/apps/kiconedit.png
+share/icons/hicolor/32x32/apps/kolourpaint.png
+share/icons/hicolor/32x32/apps/kpdf.png
+share/icons/hicolor/32x32/apps/kpovmodeler.png
+share/icons/hicolor/32x32/apps/kruler.png
+share/icons/hicolor/32x32/apps/ksnapshot.png
+share/icons/hicolor/32x32/apps/kuickshow.png
+share/icons/hicolor/32x32/apps/kview.png
+share/icons/hicolor/48x48/apps/kdvi.png
+share/icons/hicolor/48x48/apps/kfax.png
+share/icons/hicolor/48x48/apps/kfaxview.png
+share/icons/hicolor/48x48/apps/kgamma.png
+share/icons/hicolor/48x48/apps/kghostview.png
+share/icons/hicolor/48x48/apps/kiconedit.png
+share/icons/hicolor/48x48/apps/kolourpaint.png
+share/icons/hicolor/48x48/apps/kpdf.png
+share/icons/hicolor/48x48/apps/kpovmodeler.png
+share/icons/hicolor/48x48/apps/kruler.png
+share/icons/hicolor/48x48/apps/ksnapshot.png
+share/icons/hicolor/48x48/apps/kview.png
+share/icons/hicolor/64x64/apps/kghostview.png
+share/icons/hicolor/64x64/apps/kpdf.png
+share/icons/hicolor/scalable/apps/kdvi.svgz
+share/icons/hicolor/scalable/apps/kfax.svgz
+share/icons/hicolor/scalable/apps/kfaxview.svgz
+share/icons/hicolor/scalable/apps/kolourpaint.svgz
+share/icons/hicolor/scalable/apps/kpdf.svgz
+share/icons/hicolor/scalable/apps/ksnapshot.svgz
 share/kde/applnk/Graphics/kruler.desktop
 share/kde/apps/djvumultipage.rc
 share/kde/apps/kcoloredit/kcoloreditui.rc
@@ -1025,89 +1108,6 @@ share/kde/config.kcfg/kghostview.kcfg
 share/kde/config.kcfg/kpdf.kcfg
 share/kde/config.kcfg/kviewshell.kcfg
 share/kde/config/kookarc
-share/kde/icons/crystalsvg/16x16/actions/camera_test.png
-share/kde/icons/crystalsvg/16x16/actions/palette_color.png
-share/kde/icons/crystalsvg/16x16/actions/palette_gray.png
-share/kde/icons/crystalsvg/16x16/actions/palette_halftone.png
-share/kde/icons/crystalsvg/16x16/actions/palette_lineart.png
-share/kde/icons/crystalsvg/16x16/apps/camera.png
-share/kde/icons/crystalsvg/16x16/apps/kviewshell.png
-share/kde/icons/crystalsvg/16x16/apps/photobook.png
-share/kde/icons/crystalsvg/16x16/devices/camera.png
-share/kde/icons/crystalsvg/16x16/mimetypes/kpovmodeler_doc.png
-share/kde/icons/crystalsvg/22x22/apps/photobook.png
-share/kde/icons/crystalsvg/22x22/devices/camera.png
-share/kde/icons/crystalsvg/22x22/filesystems/camera.png
-share/kde/icons/crystalsvg/32x32/apps/kviewshell.png
-share/kde/icons/crystalsvg/32x32/devices/camera.png
-share/kde/icons/crystalsvg/32x32/filesystems/camera.png
-share/kde/icons/crystalsvg/32x32/mimetypes/kpovmodeler_doc.png
-share/kde/icons/crystalsvg/48x48/apps/kviewshell.png
-share/kde/icons/crystalsvg/48x48/mimetypes/kpovmodeler_doc.png
-share/kde/icons/hicolor/128x128/apps/kghostview.png
-share/kde/icons/hicolor/128x128/apps/kpdf.png
-share/kde/icons/hicolor/16x16/apps/kcolorchooser.png
-share/kde/icons/hicolor/16x16/apps/kcoloredit.png
-share/kde/icons/hicolor/16x16/apps/kdvi.png
-share/kde/icons/hicolor/16x16/apps/kfax.png
-share/kde/icons/hicolor/16x16/apps/kfaxview.png
-share/kde/icons/hicolor/16x16/apps/kgamma.png
-share/kde/icons/hicolor/16x16/apps/kghostview.png
-share/kde/icons/hicolor/16x16/apps/kiconedit.png
-share/kde/icons/hicolor/16x16/apps/kolourpaint.png
-share/kde/icons/hicolor/16x16/apps/kpdf.png
-share/kde/icons/hicolor/16x16/apps/kpovmodeler.png
-share/kde/icons/hicolor/16x16/apps/kruler.png
-share/kde/icons/hicolor/16x16/apps/ksnapshot.png
-share/kde/icons/hicolor/16x16/apps/kuickshow.png
-share/kde/icons/hicolor/16x16/apps/kview.png
-share/kde/icons/hicolor/22x22/apps/kcolorchooser.png
-share/kde/icons/hicolor/22x22/apps/kdvi.png
-share/kde/icons/hicolor/22x22/apps/kfax.png
-share/kde/icons/hicolor/22x22/apps/kfaxview.png
-share/kde/icons/hicolor/22x22/apps/kghostview.png
-share/kde/icons/hicolor/22x22/apps/kiconedit.png
-share/kde/icons/hicolor/22x22/apps/kolourpaint.png
-share/kde/icons/hicolor/22x22/apps/kpdf.png
-share/kde/icons/hicolor/22x22/apps/kpovmodeler.png
-share/kde/icons/hicolor/22x22/apps/kruler.png
-share/kde/icons/hicolor/22x22/apps/ksnapshot.png
-share/kde/icons/hicolor/22x22/apps/kuickshow.png
-share/kde/icons/hicolor/22x22/apps/kview.png
-share/kde/icons/hicolor/32x32/apps/kcoloredit.png
-share/kde/icons/hicolor/32x32/apps/kdvi.png
-share/kde/icons/hicolor/32x32/apps/kfax.png
-share/kde/icons/hicolor/32x32/apps/kfaxview.png
-share/kde/icons/hicolor/32x32/apps/kgamma.png
-share/kde/icons/hicolor/32x32/apps/kghostview.png
-share/kde/icons/hicolor/32x32/apps/kiconedit.png
-share/kde/icons/hicolor/32x32/apps/kolourpaint.png
-share/kde/icons/hicolor/32x32/apps/kpdf.png
-share/kde/icons/hicolor/32x32/apps/kpovmodeler.png
-share/kde/icons/hicolor/32x32/apps/kruler.png
-share/kde/icons/hicolor/32x32/apps/ksnapshot.png
-share/kde/icons/hicolor/32x32/apps/kuickshow.png
-share/kde/icons/hicolor/32x32/apps/kview.png
-share/kde/icons/hicolor/48x48/apps/kdvi.png
-share/kde/icons/hicolor/48x48/apps/kfax.png
-share/kde/icons/hicolor/48x48/apps/kfaxview.png
-share/kde/icons/hicolor/48x48/apps/kgamma.png
-share/kde/icons/hicolor/48x48/apps/kghostview.png
-share/kde/icons/hicolor/48x48/apps/kiconedit.png
-share/kde/icons/hicolor/48x48/apps/kolourpaint.png
-share/kde/icons/hicolor/48x48/apps/kpdf.png
-share/kde/icons/hicolor/48x48/apps/kpovmodeler.png
-share/kde/icons/hicolor/48x48/apps/kruler.png
-share/kde/icons/hicolor/48x48/apps/ksnapshot.png
-share/kde/icons/hicolor/48x48/apps/kview.png
-share/kde/icons/hicolor/64x64/apps/kghostview.png
-share/kde/icons/hicolor/64x64/apps/kpdf.png
-share/kde/icons/hicolor/scalable/apps/kdvi.svgz
-share/kde/icons/hicolor/scalable/apps/kfax.svgz
-share/kde/icons/hicolor/scalable/apps/kfaxview.svgz
-share/kde/icons/hicolor/scalable/apps/kolourpaint.svgz
-share/kde/icons/hicolor/scalable/apps/kpdf.svgz
-share/kde/icons/hicolor/scalable/apps/ksnapshot.svgz
 share/kde/mimelnk/text/mrml.desktop
 share/kde/services/camera.protocol
 share/kde/services/djvumultipage.desktop
@@ -1160,31 +1160,6 @@ share/kde/servicetypes/ksvgrenderer.desktop
 @comment in kde: @dirrm share/kde/services
 @comment in kde: @dirrm share/kde/mimelnk/text
 @comment in kde: @dirrm share/kde/mimelnk/image
-@comment in kde: @dirrm share/kde/icons/locolor/32x32/apps
-@comment in kde: @dirrm share/kde/icons/locolor/16x16/apps
-@comment in kde: @dirrm share/kde/icons/hicolor/scalable/apps
-@comment in kde: @dirrm share/kde/icons/hicolor/64x64/apps
-@comment in kde: @dirrm share/kde/icons/hicolor/48x48/apps
-@comment in kde: @dirrm share/kde/icons/hicolor/32x32/apps
-@comment in kde: @dirrm share/kde/icons/hicolor/22x22/apps
-@comment in kde: @dirrm share/kde/icons/hicolor/16x16/apps
-@comment in kde: @dirrm share/kde/icons/hicolor/128x128/apps
-@comment in kde: @dirrm share/kde/icons/crystalsvg/scalable/apps
-@comment in kde: @dirrm share/kde/icons/crystalsvg/64x64/apps
-@comment in kde: @dirrm share/kde/icons/crystalsvg/48x48/mimetypes
-@comment in kde: @dirrm share/kde/icons/crystalsvg/48x48/apps
-@comment in kde: @dirrm share/kde/icons/crystalsvg/32x32/mimetypes
-@comment in kde: @dirrm share/kde/icons/crystalsvg/32x32/filesystems
-@comment in kde: @dirrm share/kde/icons/crystalsvg/32x32/devices
-@comment in kde: @dirrm share/kde/icons/crystalsvg/32x32/apps
-@comment in kde: @dirrm share/kde/icons/crystalsvg/22x22/filesystems
-@comment in kde: @dirrm share/kde/icons/crystalsvg/22x22/devices
-@comment in kde: @dirrm share/kde/icons/crystalsvg/22x22/apps
-@comment in kde: @dirrm share/kde/icons/crystalsvg/16x16/mimetypes
-@comment in kde: @dirrm share/kde/icons/crystalsvg/16x16/devices
-@comment in kde: @dirrm share/kde/icons/crystalsvg/16x16/apps
-@comment in kde: @dirrm share/kde/icons/crystalsvg/16x16/actions
-@comment in kde: @dirrm share/kde/icons/crystalsvg/128x128/apps
 @comment in kde: @dirrm share/kde/config/magic
 @comment in kde: @dirrm share/kde/config.kcfg
 @comment in kde: @dirrm share/kde/config
@@ -1274,6 +1249,30 @@ share/kde/servicetypes/ksvgrenderer.desktop
 @dirrm share/kde/apps/kcoloredit
 @comment in kde: @dirrm share/kde/apps
 @comment in kde: @dirrm share/kde/applnk/Graphics
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/scalable/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/64x64/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/48x48/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/32x32/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/22x22/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/16x16/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/128x128/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor
+@comment in kde: @dirrm share/icons/crystalsvg/scalable/apps
+@comment in kde: @dirrm share/icons/crystalsvg/64x64/apps
+@comment in kde: @dirrm share/icons/crystalsvg/48x48/mimetypes
+@comment in kde: @dirrm share/icons/crystalsvg/48x48/apps
+@comment in kde: @dirrm share/icons/crystalsvg/32x32/mimetypes
+@comment in kde: @dirrm share/icons/crystalsvg/32x32/filesystems
+@comment in kde: @dirrm share/icons/crystalsvg/32x32/devices
+@comment in kde: @dirrm share/icons/crystalsvg/32x32/apps
+@comment in kde: @dirrm share/icons/crystalsvg/22x22/filesystems
+@comment in kde: @dirrm share/icons/crystalsvg/22x22/devices
+@comment in kde: @dirrm share/icons/crystalsvg/22x22/apps
+@comment in kde: @dirrm share/icons/crystalsvg/16x16/mimetypes
+@comment in kde: @dirrm share/icons/crystalsvg/16x16/devices
+@comment in kde: @dirrm share/icons/crystalsvg/16x16/apps
+@comment in kde: @dirrm share/icons/crystalsvg/16x16/actions
+@comment in kde: @dirrm share/icons/crystalsvg/128x128/apps
 @dirrm share/doc/kde/HTML/en/kview
 @dirrm share/doc/kde/HTML/en/kuickshow
 @dirrm share/doc/kde/HTML/en/ksnapshot
diff --git a/graphics/kdegraphics3/distinfo b/graphics/kdegraphics3/distinfo
index 924e4d98f75..389dcb520fc 100644
--- a/graphics/kdegraphics3/distinfo
+++ b/graphics/kdegraphics3/distinfo
@@ -1,11 +1,5 @@
-$NetBSD: distinfo,v 1.43 2007/01/17 10:33:06 markd Exp $
+$NetBSD: distinfo,v 1.44 2007/01/26 03:21:31 markd Exp $
 
-SHA1 (kdegraphics-3.5.5.tar.bz2) = e063f9351e2781cc6a5d23834611fc7dc7dc4fbd
-RMD160 (kdegraphics-3.5.5.tar.bz2) = c6febdf8ebd67110be3f27ada4c00e148403217f
-Size (kdegraphics-3.5.5.tar.bz2) = 7334117 bytes
-SHA1 (post-3.5.5-kdegraphics-CVE-2007-0104.diff) = 885eee20b7afe720e59276ae155f7804f5cd1d55
-RMD160 (post-3.5.5-kdegraphics-CVE-2007-0104.diff) = 27d47660b189b5956f70baf0666ce0ec563e22ea
-Size (post-3.5.5-kdegraphics-CVE-2007-0104.diff) = 2366 bytes
-SHA1 (post-3.5.5-kdegraphics.diff) = f48513bd60956c67aa877f52dd1daa25b41d43bb
-RMD160 (post-3.5.5-kdegraphics.diff) = e67762766b9a77d855e189012c5eff526a9716fc
-Size (post-3.5.5-kdegraphics.diff) = 5324 bytes
+SHA1 (kdegraphics-3.5.6.tar.bz2) = 481d3f3733c042f7dfe7d9fc6620d17f8b945957
+RMD160 (kdegraphics-3.5.6.tar.bz2) = 4cb41696ffb1284252009edfe8bd0933ef541800
+Size (kdegraphics-3.5.6.tar.bz2) = 7332938 bytes