Update to KDE 3.4.1

Changes:
* Konsole: Allow xterm resize ESC code to work
* Konsole: Fix incorrect schema in detached sessions.
* Konsole: Fix compile errors on amd64 with gcc4
* Konsole: Expand ~ in sessions' Exec=
* Konsole: Fix "Monitor for Activity" and "Monitor for Silence" icons
  are the same.
* kinfocenter: Fix OpenGL graphics card detection
* kicker: Fixed K menu entries sort logic
* kicker: Hide sort buttons in systemtray configuration
* kcmbackground: Fix SVG files unavailable in slide show selector
* kcmfonts: Tooltips under font preview text areas with '&'
* kcontrol: "Clear History" button crashes KControl's "History Sidebar"
  module
* kdesktop: Fix SVG images don't have 'set as wallpaper' entry in
  context menu when dragged to desktop
* kdesktop: Don't execute command immediately when selecting a recent
  command from the "Run Command" dialog
* konqueror: Enable "Move To Trash" inside media:/
* konqueror: If Shift is pressed when menu opens show 'Delete' instead
  of 'Trash'
* konqueror: Fix address bar encryption color stays when using
  back/forward
* konqueror: Added hidden option to not show archives as folder in
  sidebar
* konqueror: Make list view obey preview settings in tooltips
* konqueror: Allow standard tooltips for truncated items in
  non-executable columns
* konqueror: Fix for wrong favicon being shown while typing a URL
* konqueror: Fix for losing meta data in Info List View when adding
  a file
* konqueror: Allow sidebar history to be disabled
* konqueror: Reload plugins after enabling/disabling them so that no
  restart is necessary, and show plugins for the active part, instead
  of always khtml.
* kthememanager: Don't scale up preview
* khelpcenter: Added KDE artwork to index pages
* kio-fish: Fixed mimetype determination over fish: URLs, so that e.g.
  KOffice documents can be opened
* kio-tar: Fix for extracting large files from tar and zip archives
* kio-trash: Fix trashing from USB keys
* kio-trash: Don't mount all automounted directories when starting
  kio_trash to save time

6 files changed, 26 insertions, 54 deletions

diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile
index 7eacd3bd8e5..54bea933840 100644
--- a/x11/kdebase3/Makefile
+++ b/x11/kdebase3/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.81 2005/05/31 10:01:40 dillo Exp $
+# $NetBSD: Makefile,v 1.82 2005/05/31 14:21:23 markd Exp $
 
 DISTNAME=	kdebase-${_KDE_VERSION}
-PKGREVISION=	3
 CATEGORIES=	x11
 COMMENT=	Base modules for the KDE 3 integrated X11 desktop
 
@@ -109,12 +108,6 @@ pre-configure:
 		${MV} -f $${file}.new $${file};				\
 	done
 
-.if ${OPSYS} == "SunOS"
-post-configure:
-	# will be done with a proper configure check in 3.4.1
-	${ECHO} "#define HAVE_SYS_LOADAVG_H 1" >> ${WRKSRC}/config.h
-.endif
-
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/kde/templates/.source/emptydir
 	${INSTALL_DATA} ${DISTDIR}/NetBSD-flag.png ${PREFIX}/${ICONDIR}
diff --git a/x11/kdebase3/PLIST b/x11/kdebase3/PLIST
index 4e76f1d6d3b..5ae63946cd3 100644
--- a/x11/kdebase3/PLIST
+++ b/x11/kdebase3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.35 2005/05/02 20:34:08 reed Exp $
+@comment $NetBSD: PLIST,v 1.36 2005/05/31 14:21:23 markd Exp $
 bin/appletproxy
 bin/drkonqi
 bin/extensionproxy
@@ -1661,6 +1661,7 @@ share/kde/apps/kfontview/kfontviewpart.rc
 share/kde/apps/kfontview/kfontviewui.rc
 share/kde/apps/khelpcenter/glossary.html.in
 share/kde/apps/khelpcenter/glossary.xslt
+share/kde/apps/khelpcenter/index.html.in
 share/kde/apps/khelpcenter/intro.html.in
 share/kde/apps/khelpcenter/khelpcenterui.rc
 share/kde/apps/khelpcenter/plugins/Applications/.directory
@@ -1994,8 +1995,10 @@ share/kde/apps/konsole/Transparent_lightbg.schema
 share/kde/apps/konsole/WhiteOnBlack.schema
 share/kde/apps/konsole/XTerm.schema
 share/kde/apps/konsole/eventsrc
+share/kde/apps/konsole/icons/crystalsvg/16x16/actions/activity.png
 share/kde/apps/konsole/icons/crystalsvg/16x16/actions/opentermblue.png
 share/kde/apps/konsole/icons/crystalsvg/16x16/actions/opentermred.png
+share/kde/apps/konsole/icons/crystalsvg/16x16/actions/silence.png
 share/kde/apps/konsole/icons/crystalsvg/22x22/actions/opentermblue.png
 share/kde/apps/konsole/icons/crystalsvg/22x22/actions/opentermred.png
 share/kde/apps/konsole/icons/crystalsvg/32x32/actions/opentermblue.png
diff --git a/x11/kdebase3/distinfo b/x11/kdebase3/distinfo
index 5eb1b8cc80d..581a161711d 100644
--- a/x11/kdebase3/distinfo
+++ b/x11/kdebase3/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.67 2005/04/15 12:26:00 markd Exp $
+$NetBSD: distinfo,v 1.68 2005/05/31 14:21:23 markd Exp $
 
-SHA1 (kdebase-3.4.0.tar.bz2) = ca61fe258c46b20f5f2397fb71b784786a9510b6
-RMD160 (kdebase-3.4.0.tar.bz2) = 49b70391564ef757dc5195314e6ebeba656f18bc
-Size (kdebase-3.4.0.tar.bz2) = 22670772 bytes
+SHA1 (kdebase-3.4.1.tar.bz2) = 5533ceb91ea9cb01e9c5017d94ef00ec22403850
+RMD160 (kdebase-3.4.1.tar.bz2) = 1cf8837187beb045af8db6d4b2d48940372aeac4
+Size (kdebase-3.4.1.tar.bz2) = 22433034 bytes
 SHA1 (Daemon.png) = e77a42c644beecd66c4b95c0ae68c08c728a4e6d
 RMD160 (Daemon.png) = eb317dc7ac501ee03aac1276856eee14674e3da7
 Size (Daemon.png) = 15725 bytes
@@ -21,8 +21,6 @@ SHA1 (patch-ag) = 89f50ee8b328cd654aebf1da5424e87eb6b42628
 SHA1 (patch-aj) = bedd17a5a04bff32e4441ed1750ae8ab5a4fa323
 SHA1 (patch-ak) = df7ff2bf5ed6bb2442d49df1c277712712a7f966
 SHA1 (patch-al) = 555384dc03ab59845e5794e081dd5d1a92e2959e
-SHA1 (patch-am) = bce35553ece1ba78e58623d4805a9ad76e6cb840
-SHA1 (patch-an) = c651b75f013809b0e75bc14ea44be2bce3424b56
 SHA1 (patch-bb) = 4c85002b95661db18619283e50512f3ab131a0ba
 SHA1 (patch-bc) = c236cc8b3f9caebf2540425232f2d90ec66c70d1
 SHA1 (patch-bx) = d58d16fd484fc0a46c1ae93267af19e73af6f990
@@ -40,4 +38,4 @@ SHA1 (patch-fg) = bdd6fbbf1f82e174d5ceb70e67763813c13b14dd
 SHA1 (patch-ga) = 40ab73f3e32e8d8e8c58662df7c5dc54bd4acd29
 SHA1 (patch-gb) = b36e23cf6c64e42269b396f389c5a0e24a40e67e
 SHA1 (patch-gc) = f3d732fc8d7754b86a0fd9a160857f08ce7a5254
-SHA1 (patch-gd) = f169e7b5e2cd6ef36691abd7c8b669a633ba5af7
+SHA1 (patch-gd) = 32450558645a51699f04c4721fb9218c2f700095
diff --git a/x11/kdebase3/patches/patch-am b/x11/kdebase3/patches/patch-am
deleted file mode 100644
index a4c8f9dde3f..00000000000
--- a/x11/kdebase3/patches/patch-am
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-am,v 1.12 2005/04/14 20:53:30 markd Exp $
-
---- kicker/extensions/kasbar/kasloaditem.cpp.orig	Sun Dec  5 14:22:53 2004
-+++ kicker/extensions/kasbar/kasloaditem.cpp
-@@ -1,6 +1,11 @@
- #include <math.h>
- #include <stdlib.h>
- 
-+#include <config.h>
-+#ifdef HAVE_SYS_LOADAVG_H
-+#include <sys/loadavg.h> // e.g. Solaris
-+#endif
-+
- #include <qpainter.h>
- #include <qbitmap.h>
- #include <qdatetime.h>
diff --git a/x11/kdebase3/patches/patch-an b/x11/kdebase3/patches/patch-an
deleted file mode 100644
index 79432d0dbc2..00000000000
--- a/x11/kdebase3/patches/patch-an
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-an,v 1.5 2005/04/14 20:53:30 markd Exp $
-
---- kcontrol/kfontinst/kfontinst/GetPid.c.orig	2005-04-13 01:05:50.467823000 +1200
-+++ kcontrol/kfontinst/kfontinst/GetPid.c
-@@ -243,6 +243,10 @@ unsigned int kfi_getPid(const char *proc
- #include <pwd.h>
- #include <sys/resource.h>
- #ifdef OS_Solaris
-+#if !defined(_LP64) && _FILE_OFFSET_BITS == 64
-+# undef _FILE_OFFSET_BITS
-+# define _FILE_OFFSET_BITS 32
-+#endif
- #include <procfs.h>
- #else
- #include <sys/procfs.h>
diff --git a/x11/kdebase3/patches/patch-gd b/x11/kdebase3/patches/patch-gd
index 7f7970238c4..be35850bcea 100644
--- a/x11/kdebase3/patches/patch-gd
+++ b/x11/kdebase3/patches/patch-gd
@@ -1,6 +1,6 @@
-$NetBSD: patch-gd,v 1.1 2005/04/14 21:01:48 markd Exp $
+$NetBSD: patch-gd,v 1.2 2005/05/31 14:21:23 markd Exp $
 
---- kcontrol/usbview/usbdevices.cpp.orig	2005-01-04 03:50:45.000000000 +1300
+--- kcontrol/usbview/usbdevices.cpp.orig	2005-05-24 00:13:32.000000000 +1200
 +++ kcontrol/usbview/usbdevices.cpp
 @@ -24,7 +24,7 @@
  #include "usbdb.h"
@@ -9,9 +9,9 @@ $NetBSD: patch-gd,v 1.1 2005/04/14 21:01:48 markd Exp $
 -#ifdef Q_OS_FREEBSD
 +#if defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD)
  #include <sys/ioctl.h>
+ #include <sys/param.h>
  #endif
- 
-@@ -133,7 +133,7 @@ QString USBDevice::dump()
+@@ -134,7 +134,7 @@ QString USBDevice::dump()
    if (!prname.isEmpty())
      pr += "<td>(" + prname +")</td>";
    r += i18n("<tr><td><i>Protocol</i></td>%1</tr>").arg(pr);
@@ -20,7 +20,7 @@ $NetBSD: patch-gd,v 1.1 2005/04/14 21:01:48 markd Exp $
    r += i18n("<tr><td><i>USB Version</i></td><td>%1.%2</td></tr>")
      .arg(_verMajor,0,16)
      .arg(QString::number(_verMinor,16).prepend('0').right(2));
-@@ -157,7 +157,7 @@ QString USBDevice::dump()
+@@ -158,7 +158,7 @@ QString USBDevice::dump()
  
    r += i18n("<tr><td><i>Speed</i></td><td>%1 Mbit/s</td></tr>").arg(_speed);
    r += i18n("<tr><td><i>Channels</i></td><td>%1</td></tr>").arg(_channels);
@@ -29,7 +29,7 @@ $NetBSD: patch-gd,v 1.1 2005/04/14 21:01:48 markd Exp $
  	if ( _power )
  		r += i18n("<tr><td><i>Power Consumption</i></td><td>%1 mA</td></tr>").arg(_power);
  	else
-@@ -185,7 +185,7 @@ QString USBDevice::dump()
+@@ -186,7 +186,7 @@ QString USBDevice::dump()
  }
  
  
@@ -38,7 +38,16 @@ $NetBSD: patch-gd,v 1.1 2005/04/14 21:01:48 markd Exp $
  bool USBDevice::parse(QString fname)
  {
    _devices.clear();
-@@ -325,8 +325,10 @@ bool USBDevice::parse(QString fname)
+@@ -261,7 +261,7 @@ void USBDevice::collectData( int fd, int
+ 	_channels     = di.udi_nports;
+ 	
+ 	// determine the speed
+-#if __FreeBSD_version > 490102
++#if (defined(Q_OS_FREEBSD) && __FreeBSD_version > 490102) || defined(Q_OS_NETBSD)
+ 	switch (di.udi_speed) {
+ 		case USB_SPEED_LOW:  _speed = 1.5;   break;
+ 		case USB_SPEED_FULL: _speed = 12.0;  break;
+@@ -330,8 +330,10 @@ bool USBDevice::parse(QString fname)
  				}
  			}
  			controller.close();