Update to KDE 3.5.6

5 files changed, 111 insertions, 69 deletions

diff --git a/misc/kdeaddons3/Makefile b/misc/kdeaddons3/Makefile
index 36c5db9d882..c5dfaa26ae3 100644
--- a/misc/kdeaddons3/Makefile
+++ b/misc/kdeaddons3/Makefile
@@ -1,14 +1,11 @@
-# $NetBSD: Makefile,v 1.49 2007/01/17 23:47:21 wiz Exp $
+# $NetBSD: Makefile,v 1.50 2007/01/26 03:06:54 markd Exp $
 
 DISTNAME=	kdeaddons-${_KDE_VERSION}
-PKGREVISION=	3
 CATEGORIES=	misc
 COMMENT=	Add ons for the KDE integrated X11 desktop
 
 .include "../../meta-pkgs/kde3/Makefile.kde3"
 
-USE_DIRS+=		xdg-1.1
-
 REPLACE_PERL+=		knewsticker-scripts/bbc.pl \
 			knewsticker-scripts/newsrss.pl \
 			knewsticker-scripts/stock.pl
@@ -17,6 +14,7 @@ REPLACE_PERL+=		knewsticker-scripts/bbc.pl \
 
 .include "../../meta-pkgs/kde3/kde3.mk"
 .include "../../games/kdegames3/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../misc/kdepim3/buildlink3.mk"
 .include "../../multimedia/kdemultimedia3/buildlink3.mk"
 .include "../../x11/kdebase3/buildlink3.mk"
diff --git a/misc/kdeaddons3/PLIST b/misc/kdeaddons3/PLIST
index f7bf1c55553..2d3dfaa7973 100644
--- a/misc/kdeaddons3/PLIST
+++ b/misc/kdeaddons3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2006/08/02 14:06:59 markd Exp $
+@comment $NetBSD: PLIST,v 1.18 2007/01/26 03:06:54 markd Exp $
 bin/atlantikdesigner
 bin/fsview
 bin/jpegorient
@@ -139,6 +139,49 @@ share/doc/kde/HTML/en/konq-plugins/validators/index.docbook
 share/doc/kde/HTML/en/konq-plugins/webarchiver/common
 share/doc/kde/HTML/en/konq-plugins/webarchiver/index.cache.bz2
 share/doc/kde/HTML/en/konq-plugins/webarchiver/index.docbook
+share/icons/crystalsvg/16x16/actions/babelfish.png
+share/icons/crystalsvg/16x16/actions/cssvalidator.png
+share/icons/crystalsvg/16x16/actions/domtreeviewer.png
+share/icons/crystalsvg/16x16/actions/htmlvalidator.png
+share/icons/crystalsvg/16x16/actions/imagegallery.png
+share/icons/crystalsvg/16x16/actions/minitools.png
+share/icons/crystalsvg/16x16/actions/validators.png
+share/icons/crystalsvg/16x16/actions/webarchiver.png
+share/icons/crystalsvg/16x16/apps/konqsidebar_delicious.png
+share/icons/crystalsvg/16x16/apps/konqsidebar_mediaplayer.png
+share/icons/crystalsvg/16x16/apps/konqsidebar_news.png
+share/icons/crystalsvg/16x16/apps/ktimemon.png
+share/icons/crystalsvg/16x16/apps/synaescope.png
+share/icons/crystalsvg/22x22/actions/babelfish.png
+share/icons/crystalsvg/22x22/actions/cssvalidator.png
+share/icons/crystalsvg/22x22/actions/domtreeviewer.png
+share/icons/crystalsvg/22x22/actions/htmlvalidator.png
+share/icons/crystalsvg/22x22/actions/imagegallery.png
+share/icons/crystalsvg/22x22/actions/minitools.png
+share/icons/crystalsvg/22x22/actions/validators.png
+share/icons/crystalsvg/22x22/actions/webarchiver.png
+share/icons/crystalsvg/22x22/apps/konqsidebar_mediaplayer.png
+share/icons/crystalsvg/32x32/actions/minitools.png
+share/icons/crystalsvg/32x32/apps/konqsidebar_mediaplayer.png
+share/icons/crystalsvg/32x32/apps/ktimemon.png
+share/icons/crystalsvg/48x48/actions/minitools.png
+share/icons/crystalsvg/48x48/apps/konqsidebar_mediaplayer.png
+share/icons/hicolor/128x128/apps/metabar.png
+share/icons/hicolor/16x16/apps/atlantikdesigner.png
+share/icons/hicolor/16x16/apps/ksig.png
+share/icons/hicolor/16x16/apps/metabar.png
+share/icons/hicolor/22x22/apps/fsview.png
+share/icons/hicolor/32x32/apps/atlantikdesigner.png
+share/icons/hicolor/32x32/apps/fsview.png
+share/icons/hicolor/32x32/apps/ksig.png
+share/icons/hicolor/32x32/apps/metabar.png
+share/icons/hicolor/48x48/apps/metabar.png
+share/icons/hicolor/64x64/apps/metabar.png
+share/icons/hicolor/scalable/apps/metabar.svgz
+share/icons/locolor/16x16/apps/autorefresh.png
+share/icons/locolor/16x16/apps/ktimemon.png
+share/icons/locolor/32x32/apps/konqsidebar_mediaplayer.png
+share/icons/locolor/32x32/apps/ktimemon.png
 share/kde/applnk/.hidden/arkplugin.desktop
 share/kde/applnk/.hidden/katefll.desktop
 share/kde/applnk/.hidden/kcmkuick.desktop
@@ -291,49 +334,6 @@ share/kde/apps/noatun/wavecapture.plugin
 share/kde/config.kcfg/kbinaryclock.kcfg
 share/kde/config.kcfg/konq_sidebarnews.kcfg
 share/kde/config/translaterc
-share/kde/icons/crystalsvg/16x16/actions/babelfish.png
-share/kde/icons/crystalsvg/16x16/actions/cssvalidator.png
-share/kde/icons/crystalsvg/16x16/actions/domtreeviewer.png
-share/kde/icons/crystalsvg/16x16/actions/htmlvalidator.png
-share/kde/icons/crystalsvg/16x16/actions/imagegallery.png
-share/kde/icons/crystalsvg/16x16/actions/minitools.png
-share/kde/icons/crystalsvg/16x16/actions/validators.png
-share/kde/icons/crystalsvg/16x16/actions/webarchiver.png
-share/kde/icons/crystalsvg/16x16/apps/konqsidebar_delicious.png
-share/kde/icons/crystalsvg/16x16/apps/konqsidebar_mediaplayer.png
-share/kde/icons/crystalsvg/16x16/apps/konqsidebar_news.png
-share/kde/icons/crystalsvg/16x16/apps/ktimemon.png
-share/kde/icons/crystalsvg/16x16/apps/synaescope.png
-share/kde/icons/crystalsvg/22x22/actions/babelfish.png
-share/kde/icons/crystalsvg/22x22/actions/cssvalidator.png
-share/kde/icons/crystalsvg/22x22/actions/domtreeviewer.png
-share/kde/icons/crystalsvg/22x22/actions/htmlvalidator.png
-share/kde/icons/crystalsvg/22x22/actions/imagegallery.png
-share/kde/icons/crystalsvg/22x22/actions/minitools.png
-share/kde/icons/crystalsvg/22x22/actions/validators.png
-share/kde/icons/crystalsvg/22x22/actions/webarchiver.png
-share/kde/icons/crystalsvg/22x22/apps/konqsidebar_mediaplayer.png
-share/kde/icons/crystalsvg/32x32/actions/minitools.png
-share/kde/icons/crystalsvg/32x32/apps/konqsidebar_mediaplayer.png
-share/kde/icons/crystalsvg/32x32/apps/ktimemon.png
-share/kde/icons/crystalsvg/48x48/actions/minitools.png
-share/kde/icons/crystalsvg/48x48/apps/konqsidebar_mediaplayer.png
-share/kde/icons/hicolor/128x128/apps/metabar.png
-share/kde/icons/hicolor/16x16/apps/atlantikdesigner.png
-share/kde/icons/hicolor/16x16/apps/ksig.png
-share/kde/icons/hicolor/16x16/apps/metabar.png
-share/kde/icons/hicolor/22x22/apps/fsview.png
-share/kde/icons/hicolor/32x32/apps/atlantikdesigner.png
-share/kde/icons/hicolor/32x32/apps/fsview.png
-share/kde/icons/hicolor/32x32/apps/ksig.png
-share/kde/icons/hicolor/32x32/apps/metabar.png
-share/kde/icons/hicolor/48x48/apps/metabar.png
-share/kde/icons/hicolor/64x64/apps/metabar.png
-share/kde/icons/hicolor/scalable/apps/metabar.svgz
-share/kde/icons/locolor/16x16/apps/autorefresh.png
-share/kde/icons/locolor/16x16/apps/ktimemon.png
-share/kde/icons/locolor/32x32/apps/konqsidebar_mediaplayer.png
-share/kde/icons/locolor/32x32/apps/ktimemon.png
 share/kde/mimelnk/application/x-win-lnk.desktop
 share/kde/services/akregator_konqplugin.desktop
 share/kde/services/ark_plugin.desktop
@@ -369,23 +369,6 @@ share/kde/services/webarchivethumbnail.desktop
 @comment in kde: @dirrm share/kde/services/kaddressbook
 @comment in kde: @dirrm share/kde/services
 @comment in kde: @dirrm share/kde/mimelnk/application
-@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/48x48/apps
-@comment in kde: @dirrm share/kde/icons/crystalsvg/48x48/actions
-@comment in kde: @dirrm share/kde/icons/crystalsvg/32x32/apps
-@comment in kde: @dirrm share/kde/icons/crystalsvg/32x32/actions
-@comment in kde: @dirrm share/kde/icons/crystalsvg/22x22/apps
-@comment in kde: @dirrm share/kde/icons/crystalsvg/22x22/actions
-@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/config.kcfg
 @comment in kde: @dirrm share/kde/config
 @dirrm share/kde/apps/microformat/pics
@@ -438,6 +421,23 @@ share/kde/services/webarchivethumbnail.desktop
 @comment in kdepim: @dirrm share/kde/apps/akregator/pics
 @comment in kde: @dirrm share/kde/apps
 @comment in kde: @dirrm share/kde/applnk/.hidden
+@comment in kde: @dirrm share/icons/locolor/32x32/apps
+@comment in kde: @dirrm share/icons/locolor/16x16/apps
+@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 kde: @dirrm share/icons/crystalsvg/48x48/apps
+@comment in kde: @dirrm share/icons/crystalsvg/48x48/actions
+@comment in kde: @dirrm share/icons/crystalsvg/32x32/apps
+@comment in kde: @dirrm share/icons/crystalsvg/32x32/actions
+@comment in kde: @dirrm share/icons/crystalsvg/22x22/apps
+@comment in kde: @dirrm share/icons/crystalsvg/22x22/actions
+@comment in kde: @dirrm share/icons/crystalsvg/16x16/apps
+@comment in kde: @dirrm share/icons/crystalsvg/16x16/actions
 @dirrm share/doc/kde/HTML/en/konq-plugins/webarchiver
 @dirrm share/doc/kde/HTML/en/konq-plugins/validators
 @dirrm share/doc/kde/HTML/en/konq-plugins/uachanger
diff --git a/misc/kdeaddons3/distinfo b/misc/kdeaddons3/distinfo
index 90507875486..3a5ab7d3024 100644
--- a/misc/kdeaddons3/distinfo
+++ b/misc/kdeaddons3/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.30 2006/10/12 11:00:19 markd Exp $
+$NetBSD: distinfo,v 1.31 2007/01/26 03:06:54 markd Exp $
 
-SHA1 (kdeaddons-3.5.5.tar.bz2) = 05c719cba9f3673d6995421ba4abdb08a05eb53f
-RMD160 (kdeaddons-3.5.5.tar.bz2) = 4a8e43e3268dc687de049482be57e1372a6abea3
-Size (kdeaddons-3.5.5.tar.bz2) = 1663195 bytes
+SHA1 (kdeaddons-3.5.6.tar.bz2) = e5788066ac1e19f020d649282ba3a4ae7ffd46f1
+RMD160 (kdeaddons-3.5.6.tar.bz2) = 3fd024b901896cc76a848ab57eb3e2ae99b6a202
+Size (kdeaddons-3.5.6.tar.bz2) = 1667731 bytes
 SHA1 (patch-aa) = 68cea80eaf8f9c457f9d4a74a32f0da549699878
+SHA1 (patch-ab) = fc3cfcc5bf83a3720f9e39a9d08f70bcc79a5833
+SHA1 (patch-ac) = 20aa80b69b1c7597a7610587ea37f190c38bfe60
diff --git a/misc/kdeaddons3/patches/patch-ab b/misc/kdeaddons3/patches/patch-ab
new file mode 100644
index 00000000000..062e6e6c349
--- /dev/null
+++ b/misc/kdeaddons3/patches/patch-ab
@@ -0,0 +1,15 @@
+$NetBSD: patch-ab,v 1.1 2007/01/26 03:06:54 markd Exp $
+
+kde svn revision 626814
+
+--- konq-plugins/webarchiver/webarchivecreator.cpp.orig	2005-10-11 03:53:13.000000000 +1300
++++ konq-plugins/webarchiver/webarchivecreator.cpp
+@@ -32,7 +32,7 @@
+ 
+ extern "C"
+ {
+-	ThumbCreator *new_creator()
++	ThumbCreator * KDE_EXPORT new_creator()
+ 	{
+ 		return new WebArchiveCreator;
+ 	}
diff --git a/misc/kdeaddons3/patches/patch-ac b/misc/kdeaddons3/patches/patch-ac
new file mode 100644
index 00000000000..0c2f91fb6f9
--- /dev/null
+++ b/misc/kdeaddons3/patches/patch-ac
@@ -0,0 +1,27 @@
+$NetBSD: patch-ac,v 1.1 2007/01/26 03:06:54 markd Exp $
+
+kde svn revision 626814
+
+--- konq-plugins/webarchiver/archivedialog.cpp.orig	2006-07-22 20:08:01.000000000 +1200
++++ konq-plugins/webarchiver/archivedialog.cpp
+@@ -395,12 +395,15 @@ void ArchiveDialog::saveArchiveRecursive
+ QString ArchiveDialog::handleLink(const KURL& _url, const QString& _link)
+ {
+    KURL url(getAbsoluteURL(_url, _link));
+-   QString tarFileName;
+ 
+-   if (m_state==Retrieving)
+-      m_urlsToDownload.append(url);
+-   else if (m_state==Saving)
+-      tarFileName = m_downloadedURLDict[url.url()];
++   QString tarFileName;
++   if (kapp->authorizeURLAction("redirect", _url, url))
++   {
++       if (m_state==Retrieving)
++           m_urlsToDownload.append(url);
++       else if (m_state==Saving)
++           tarFileName = m_downloadedURLDict[url.url()];
++   }
+ 
+    return tarFileName;
+ }