Update to KDE 3.5.4

Kicker
* Bookmarks: Look up konsole-bookmarks in the correct directory.
* Fix arrow location on vertical panels.
* Allow manually turning on of previews in the pager at low screen
  resolutions.
Kate
* There exist space characters other than ' ' (character code 32).
* Fixed slow repaints of dynamically wrapped lines.
* Fix crashes when deleting text.
* Fix crash if there are folded regions and then highlighting is changed.
* Fix highlighting # at the beginning of a line as comment.
* Fix horizontal scrollbar and view not synced, if dynamic and static
  word wrap are off.
* Make it possible to reset the background and selected background color.
* Fix broken selection repaints when resizing.
* Fix strange behaviour with pentuple clicks.
* "Find previous" should reverse the original direction, and nothing else.
* Improve Ada support.
* Jump to last non-whitespace character when "End" key is pressed twice.
* Check textLine() return values in KateViewInternal's home() and end()
  functions.
* Make the current document's highlighting mode selected when the
  highlighting config page opens.
* backward text selection doesn't trigger horizontal scroll.
* Improving backward search.
* Fix missing repaints when dynamic word wrap is disabled.
* Fixed highlighting of "case'-':".
* Synchronize the "cached" selection when exposing a search match.
* Fix crash on entering doxygen comment on editing cpp files.
* Also autoindent Q_SLOTS and Q_SIGNALS.
KControl
* Make CDROM info available in Control Centre.
* Properly disable antialiasing by also setting the xrdb resource.
* Fix nic information on AMD64 and others.
* Add sysfs parsing support. Needed for distros that don't have
  /proc/bus/usb anymore.
* Fix long-standing crash in KControls wallpaper-code.
Konsole
* Miscellaneous speedups.
* Upon Prev/Next session, only activate new session when session.count > 1.
* Add 256 color support.
* Add DCOP calls setFont() and font().
* Fix extra character (^L) in konsolepart when using bash vi mode.
* Fix the accelerator key for the Config->Schema tab.
* Fix taking 100% cpu on printing tab-completion list in bash.
* RMB->Close Session and tabbar menu->Close Session now uses the Close
  Confirmation Dialog.
* Reduce flickering when resizing.
KFind
* Fix searching for files greater than 2GB.
* kdesktop
* Fix kscreensaver not starting.
* Fix align-to-grid regression.
kpager
* Fix crash when moving windows.
ktip
* Fix text in RTL languages.
media manager
* Fix regression when using the fstab backend.
* Fix bogus floppy devices appearing in FreeBSD.
* Fix memory leak.
* Fix unmounting on systems that use supermount.
* Make media:/ mount devices over HAL.
* Load mediamanager kded module soon in the startup.

4 files changed, 31 insertions, 29 deletions

diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile
index 6e681c9df8c..de7f88666e6 100644
--- a/x11/kdebase3/Makefile
+++ b/x11/kdebase3/Makefile
@@ -1,13 +1,9 @@
-# $NetBSD: Makefile,v 1.116 2006/06/15 01:35:33 markd Exp $
+# $NetBSD: Makefile,v 1.117 2006/08/02 13:45:51 markd Exp $
 
 DISTNAME=	kdebase-${_KDE_VERSION}
-PKGREVISION=	1
 CATEGORIES=	x11
 COMMENT=	Base modules for the KDE 3 integrated X11 desktop
 
-PATCH_SITES=	ftp://ftp.kde.org/pub/kde/security_patches/
-PATCHFILES=	post-3.5.0-kdebase-kdm.diff
-
 .include "../../meta-pkgs/kde3/Makefile.kde3"
 
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} Daemon.png Daemon.README
diff --git a/x11/kdebase3/PLIST b/x11/kdebase3/PLIST
index f52620b3c7b..086ee5174be 100644
--- a/x11/kdebase3/PLIST
+++ b/x11/kdebase3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.43 2006/06/01 13:46:31 markd Exp $
+@comment $NetBSD: PLIST,v 1.44 2006/08/02 13:45:51 markd Exp $
 bin/appletproxy
 bin/drkonqi
 bin/extensionproxy
@@ -390,6 +390,7 @@ share/applications/kde/arts.desktop
 share/applications/kde/background.desktop
 share/applications/kde/bell.desktop
 share/applications/kde/cache.desktop
+share/applications/kde/cdinfo.desktop
 share/applications/kde/clock.desktop
 share/applications/kde/colors.desktop
 share/applications/kde/componentchooser.desktop
@@ -949,6 +950,9 @@ share/doc/kde/HTML/en/kicker/screenshot_right.png
 share/doc/kde/HTML/en/kicker/taskbar_group.png
 share/doc/kde/HTML/en/kicker/terminals_icon.png
 share/doc/kde/HTML/en/kicker/windowlist_icon.png
+share/doc/kde/HTML/en/kinfocenter/cdinfo/common
+share/doc/kde/HTML/en/kinfocenter/cdinfo/index.cache.bz2
+share/doc/kde/HTML/en/kinfocenter/cdinfo/index.docbook
 share/doc/kde/HTML/en/kinfocenter/common
 share/doc/kde/HTML/en/kinfocenter/devices/common
 share/doc/kde/HTML/en/kinfocenter/devices/index.cache.bz2
@@ -1435,6 +1439,7 @@ share/kde/apps/kconf_update/kcmdisplayrc.upd
 share/kde/apps/kconf_update/kfmclient_3_2.upd
 share/kde/apps/kconf_update/kfmclient_3_2_update.sh
 share/kde/apps/kconf_update/khotkeys_32b1_update.upd
+share/kde/apps/kconf_update/khotkeys_printscreen.upd
 share/kde/apps/kconf_update/kicker-3.1-properSizeSetting.pl
 share/kde/apps/kconf_update/kicker-3.5-kconfigXTize.pl
 share/kde/apps/kconf_update/kicker-3.5-taskbarEnums.pl
@@ -1739,6 +1744,7 @@ share/kde/apps/khelpcenter/searchhandlers/man.desktop
 share/kde/apps/khelpcenter/table-of-contents.xslt
 share/kde/apps/khotkeys/kde32b1.khotkeys
 share/kde/apps/khotkeys/konqueror_gestures_kde321.khotkeys
+share/kde/apps/khotkeys/printscreen.khotkeys
 share/kde/apps/khtml/kpartplugins/khtmlkttsd.desktop
 share/kde/apps/khtml/kpartplugins/khtmlkttsd.rc
 share/kde/apps/kicker/applets/clockapplet.desktop
@@ -3272,7 +3278,8 @@ share/kde/services/tar.protocol
 share/kde/services/textthumbnail.desktop
 share/kde/services/thumbnail.protocol
 share/kde/services/trash.protocol
-share/kde/services/useragentstrings/firefoxoncurrent.desktop
+share/kde/services/useragentstrings/firefox10oncurrent.desktop
+share/kde/services/useragentstrings/firefox15oncurrent.desktop
 share/kde/services/useragentstrings/googlebot.desktop
 share/kde/services/useragentstrings/ie401onwinnt4.desktop
 share/kde/services/useragentstrings/ie45onwinnt5.desktop
@@ -3296,7 +3303,8 @@ share/kde/services/useragentstrings/ns71oncurrent.desktop
 share/kde/services/useragentstrings/ns71onwinnt51.desktop
 share/kde/services/useragentstrings/op403onwinnt4.desktop
 share/kde/services/useragentstrings/op75oncurrent.desktop
-share/kde/services/useragentstrings/safari.desktop
+share/kde/services/useragentstrings/safari12.desktop
+share/kde/services/useragentstrings/safari20.desktop
 share/kde/services/useragentstrings/w3moncurrent.desktop
 share/kde/services/useragentstrings/wgetoncurrent.desktop
 share/kde/services/zip.protocol
@@ -4514,6 +4522,7 @@ ${HAVE_USBVIEW}@dirrm share/kde/apps/kcmusb
 @dirrm share/doc/kde/HTML/en/kinfocenter/interrupts
 @dirrm share/doc/kde/HTML/en/kinfocenter/dma
 @dirrm share/doc/kde/HTML/en/kinfocenter/devices
+@dirrm share/doc/kde/HTML/en/kinfocenter/cdinfo
 @comment in kde: @dirrm share/doc/kde/HTML/en/kinfocenter
 @dirrm share/doc/kde/HTML/en/kicker
 @dirrm share/doc/kde/HTML/en/khelpcenter/visualdict
diff --git a/x11/kdebase3/distinfo b/x11/kdebase3/distinfo
index 5af9c408ede..35955968896 100644
--- a/x11/kdebase3/distinfo
+++ b/x11/kdebase3/distinfo
@@ -1,20 +1,17 @@
-$NetBSD: distinfo,v 1.86 2006/06/15 01:35:33 markd Exp $
+$NetBSD: distinfo,v 1.87 2006/08/02 13:45:51 markd Exp $
 
-SHA1 (kdebase-3.5.3.tar.bz2) = 93f1566343af114b24987ee7b8e0e80877b57f25
-RMD160 (kdebase-3.5.3.tar.bz2) = ef55c72b97577dd86e5c64bf589ff9b2d556ec07
-Size (kdebase-3.5.3.tar.bz2) = 23634194 bytes
-SHA1 (Daemon.png) = e77a42c644beecd66c4b95c0ae68c08c728a4e6d
-RMD160 (Daemon.png) = eb317dc7ac501ee03aac1276856eee14674e3da7
-Size (Daemon.png) = 15725 bytes
 SHA1 (Daemon.README) = eb1e6af52adc02ded77af17e8953134b7e60d23b
 RMD160 (Daemon.README) = 39edd92ed4314397080f32a8caff0ac3f716ecf4
 Size (Daemon.README) = 2191 bytes
+SHA1 (Daemon.png) = e77a42c644beecd66c4b95c0ae68c08c728a4e6d
+RMD160 (Daemon.png) = eb317dc7ac501ee03aac1276856eee14674e3da7
+Size (Daemon.png) = 15725 bytes
 SHA1 (NetBSD-flag-1.0.png) = a9cf264a52ae0a602eec956d91222e299c7dee5c
 RMD160 (NetBSD-flag-1.0.png) = 2eac20df70396169819059a704e6a85ae10234b0
 Size (NetBSD-flag-1.0.png) = 4532 bytes
-SHA1 (post-3.5.0-kdebase-kdm.diff) = 327cd873bfeaea0665364b973245d744fa09c938
-RMD160 (post-3.5.0-kdebase-kdm.diff) = 0b223a8e364540d6c9e877e5f560fe855b50030f
-Size (post-3.5.0-kdebase-kdm.diff) = 508 bytes
+SHA1 (kdebase-3.5.4.tar.bz2) = 18f2bb3643a40f937bf260d5969d6919aa52abf4
+RMD160 (kdebase-3.5.4.tar.bz2) = 29f763ec9de2cf3437b94567b317642e7df5e295
+Size (kdebase-3.5.4.tar.bz2) = 23636847 bytes
 SHA1 (patch-aa) = 28647cdec95367504e582ceb871e67dd3c321e29
 SHA1 (patch-ac) = 8be0f15be839f4f01d3e079501b83e27f1fab2eb
 SHA1 (patch-ad) = 031e5622acb376ce1867d08b35c55bce101e8855
@@ -53,4 +50,4 @@ SHA1 (patch-fg) = bdd6fbbf1f82e174d5ceb70e67763813c13b14dd
 SHA1 (patch-ga) = 40ab73f3e32e8d8e8c58662df7c5dc54bd4acd29
 SHA1 (patch-gb) = b36e23cf6c64e42269b396f389c5a0e24a40e67e
 SHA1 (patch-gc) = e02ddb93ae7aa249b3b3e68690f587b2c98255b8
-SHA1 (patch-gd) = ded2a08514f818b25603fbd54d6750afceff4636
+SHA1 (patch-gd) = 39469384668e4ee7fc489406e2813100fc90aa9b
diff --git a/x11/kdebase3/patches/patch-gd b/x11/kdebase3/patches/patch-gd
index 21670030eed..6270d800e73 100644
--- a/x11/kdebase3/patches/patch-gd
+++ b/x11/kdebase3/patches/patch-gd
@@ -1,17 +1,17 @@
-$NetBSD: patch-gd,v 1.3 2005/11/08 18:25:44 joerg Exp $
+$NetBSD: patch-gd,v 1.4 2006/08/02 13:45:51 markd Exp $
 
---- kcontrol/usbview/usbdevices.cpp.orig	2005-05-24 00:13:32.000000000 +1200
+--- kcontrol/usbview/usbdevices.cpp.orig	2006-07-22 20:15:22.000000000 +1200
 +++ kcontrol/usbview/usbdevices.cpp
-@@ -24,7 +24,7 @@
- #include "usbdb.h"
- #include "usbdevices.h"
+@@ -27,7 +27,7 @@
+ 
+ #include <math.h>
  
 -#ifdef Q_OS_FREEBSD
 +#if defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD)
  #include <sys/ioctl.h>
  #include <sys/param.h>
  #endif
-@@ -134,7 +134,7 @@ QString USBDevice::dump()
+@@ -197,7 +197,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.3 2005/11/08 18:25:44 joerg 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));
-@@ -158,7 +158,7 @@ QString USBDevice::dump()
+@@ -221,7 +221,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.3 2005/11/08 18:25:44 joerg Exp $
  	if ( _power )
  		r += i18n("<tr><td><i>Power Consumption</i></td><td>%1 mA</td></tr>").arg(_power);
  	else
-@@ -186,7 +186,7 @@ QString USBDevice::dump()
+@@ -249,7 +249,7 @@ QString USBDevice::dump()
  }
  
  
@@ -38,7 +38,7 @@ $NetBSD: patch-gd,v 1.3 2005/11/08 18:25:44 joerg Exp $
  bool USBDevice::parse(QString fname)
  {
    _devices.clear();
-@@ -261,7 +261,7 @@ void USBDevice::collectData( int fd, int
+@@ -345,7 +345,7 @@ void USBDevice::collectData( int fd, int
  	_channels     = di.udi_nports;
  	
  	// determine the speed
@@ -47,7 +47,7 @@ $NetBSD: patch-gd,v 1.3 2005/11/08 18:25:44 joerg Exp $
  	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)
+@@ -415,8 +415,10 @@ bool USBDevice::parse(QString fname)
  				}
  			}
  			controller.close();