Update to kde 3.5.9

minor bugfixes.

5 files changed, 5 insertions, 111 deletions

diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index 434a4adbd9c..2711907c96d 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.134 2008/02/12 12:20:44 joerg Exp $
+# $NetBSD: Makefile,v 1.135 2008/02/20 09:49:56 markd Exp $
 
 DISTNAME=	kdelibs-${_KDE_VERSION}
-PKGREVISION=	6
 CATEGORIES=	x11
 COMMENT=	Support libraries for the KDE integrated X11 desktop
 
diff --git a/x11/kdelibs3/distinfo b/x11/kdelibs3/distinfo
index 8058f5be57b..a588328fed6 100644
--- a/x11/kdelibs3/distinfo
+++ b/x11/kdelibs3/distinfo
@@ -1,17 +1,14 @@
-$NetBSD: distinfo,v 1.90 2007/11/13 11:19:18 markd Exp $
+$NetBSD: distinfo,v 1.91 2008/02/20 09:49:56 markd Exp $
 
-SHA1 (kdelibs-3.5.8.tar.bz2) = b524a5d9969e7319bb5ffb926a39fd6afb39b2ed
-RMD160 (kdelibs-3.5.8.tar.bz2) = e3524ca8613fca338a0530213e921fbfae56e866
-Size (kdelibs-3.5.8.tar.bz2) = 15557343 bytes
+SHA1 (kdelibs-3.5.9.tar.bz2) = b8197d94075a54f90f08a9ef7bed95ccf53e12ad
+RMD160 (kdelibs-3.5.9.tar.bz2) = 9ac02bf2314de387b2aa9664703c72b0613fcbb3
+Size (kdelibs-3.5.9.tar.bz2) = 15568675 bytes
 SHA1 (patch-aa) = be278f29b743c573b71c7804eff26324e78ed779
 SHA1 (patch-ab) = 3a79b3e7fadef1a93a5490b716dace60f3de30a1
 SHA1 (patch-ac) = 205f99e8749c32bf445e23f6076dd642c10c8186
 SHA1 (patch-ad) = d8ddcea1a281474b7694979b14744c5e06b56b65
 SHA1 (patch-ae) = b609ee21da08885fd359b9a163d428cbb3955e74
-SHA1 (patch-af) = 75f3bb66c4d626c23acba34f59195156b58bc20d
 SHA1 (patch-aj) = 2ec8d33ce6684da7c60759cf395b78fa4ac2eaec
-SHA1 (patch-ak) = f08f6c60a5171fe1501fa3575fa6d222657dcb2f
-SHA1 (patch-al) = 15100d65ed0ea2888288b77660e992ec9cba87df
 SHA1 (patch-an) = d34a3cc0ac0b92921bcaeb9b05c5b7a99ee3566c
 SHA1 (patch-ao) = 7ae360b2ee2332ec3017dfd468457f2c1b139308
 SHA1 (patch-ap) = 94037230bb3d12549195d52b98ffdd821f94f90d
diff --git a/x11/kdelibs3/patches/patch-af b/x11/kdelibs3/patches/patch-af
deleted file mode 100644
index 0d56885a7da..00000000000
--- a/x11/kdelibs3/patches/patch-af
+++ /dev/null
@@ -1,46 +0,0 @@
-$NetBSD: patch-af,v 1.10 2007/10/20 10:36:15 markd Exp $
-
-SVN commit 724472
-
---- kdecore/kstartupinfo.cpp.orig	2007-10-08 22:51:55.000000000 +1300
-+++ kdecore/kstartupinfo.cpp
-@@ -545,7 +545,7 @@ void KStartupInfo::handleAutoAppStartedS
- 
- void KStartupInfo::setNewStartupId( QWidget* window, const QCString& startup_id )
-     {
--    long activate = true;
-+    bool activate = true;
-     kapp->setStartupId( startup_id );
-     if( window != NULL )
-         {
-@@ -937,7 +937,7 @@ QCString KStartupInfo::createNewStartupI
- #ifdef Q_WS_X11
-     extern Time qt_x_user_time;
- #else
--    long qt_x_user_time = 0;
-+    unsigned long qt_x_user_time = 0;
- #endif
-     QCString id = QString( "%1;%2;%3;%4_TIME%5" ).arg( hostname ).arg( tm.tv_sec )
-         .arg( tm.tv_usec ).arg( getpid()).arg( qt_x_user_time ).utf8();
-@@ -1078,7 +1078,9 @@ unsigned long KStartupInfoId::timestamp(
-     if( pos >= 0 )
-         {
-         bool ok;
--        long time = d->id.mid( pos + 5 ).toLong( &ok );
-+        unsigned long time = d->id.mid( pos + 5 ).toULong( &ok );
-+	if( !ok && d->id[ pos + 5 ] == '-' ) // try if it's as a negative signed number perhaps
-+	    time = d->id.mid( pos + 5 ).toLong( &ok );
-         if( ok )
-             return time;
-         }
-@@ -1093,7 +1095,9 @@ unsigned long KStartupInfoId::timestamp(
-         if( pos2 >= 0 )
-             {
-             bool ok;
--            long time = d->id.mid( pos2 + 1, pos1 - pos2 - 1 ).toLong( &ok );
-+            unsigned long time = d->id.mid( pos2 + 1, pos1 - pos2 - 1 ).toULong( &ok );
-+	    if( !ok && d->id[ pos + 5 ] == '-' ) // try if it's as a negative signed number perhaps
-+		time = d->id.mid( pos2 + 1, pos1 - pos2 - 1 ).toLong( &ok );
-             if( ok )
-                 return time;
-             }
diff --git a/x11/kdelibs3/patches/patch-ak b/x11/kdelibs3/patches/patch-ak
deleted file mode 100644
index 3029f872ac4..00000000000
--- a/x11/kdelibs3/patches/patch-ak
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD: patch-ak,v 1.7 2007/10/20 10:36:15 markd Exp $
-
-svn revision 726097
-
---- kioslave/http/http.cc	2007/09/26 17:08:43	717341
-+++ kioslave/http/http.cc	2007/10/17 04:11:51	726097
-@@ -3409,10 +3409,6 @@
- 
-   } while (!m_bEOF && (len || noHeader) && (headerSize < maxHeaderSize) && (gets(buffer, sizeof(buffer)-1)));
- 
--  // Send the current response before processing starts or it
--  // might never get sent...
--  forwardHttpResponseHeader();
--
-   // Now process the HTTP/1.1 upgrade
-   QStringList::Iterator opt = upgradeOffers.begin();
-   for( ; opt != upgradeOffers.end(); ++opt) {
-@@ -3818,6 +3814,10 @@
-     mimeType( m_strMimeType );
-   }
- 
-+  // Do not move send response header before any redirection as it seems
-+  // to screw up some sites. See BR# 150904.
-+  forwardHttpResponseHeader();
-+
-   if (m_request.method == HTTP_HEAD)
-      return true;
- 
-@@ -3830,10 +3830,10 @@
-         // Check...
-         createCacheEntry(m_strMimeType, expireDate); // Create a cache entry
-         if (!m_request.fcache)
--	    {
--		m_request.bCachedWrite = false; // Error creating cache entry.
--		kdDebug(7113) << "(" << m_pid << ") Error creating cache entry for " << m_request.url.url()<<"!\n";
--	    }
-+        {
-+          m_request.bCachedWrite = false; // Error creating cache entry.
-+          kdDebug(7113) << "(" << m_pid << ") Error creating cache entry for " << m_request.url.url()<<"!\n";
-+        }
-         m_request.expireDate = expireDate;
-         m_maxCacheSize = config()->readNumEntry("MaxCacheSize", DEFAULT_MAX_CACHE_SIZE) / 2;
-      }
diff --git a/x11/kdelibs3/patches/patch-al b/x11/kdelibs3/patches/patch-al
deleted file mode 100644
index 7a983d56376..00000000000
--- a/x11/kdelibs3/patches/patch-al
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-al,v 1.4 2007/10/20 10:36:15 markd Exp $
-
---- kinit/start_kdeinit_wrapper.c.orig	2007-10-19 00:15:58.000000000 +1300
-+++ kinit/start_kdeinit_wrapper.c
-@@ -85,7 +85,7 @@ int main(int argc, char **argv)
-    if(argc == 0)
-       return 1;
-    argv[0] = "start_kdeinit";
--   execv("start_kdeinit",argv);
-+   execvp("start_kdeinit",argv);
-    perror("start_kdeinit");
-    return 1;
- }