Update to KDE 3.5.8

core libs
* Small performance improvements.
* Reworked KCmdLineArgs::makeURL to make "kpdf a:b" work when a:b is an
  existing file in the current directory.
* Be more robust against addressbar spoofing.
* A hostname may resolve to multiple addresses. When connection to one
  timeouts, we should not immediately give up. Instead, we try the other
  addresses.
http ioslave
* Fix crash on broken servers.
* Fix Connection failed Url Frame Redirection.
* Fix session cookies not always accepted.
* Fix persistent cookies are treated like session cookies.
* Fix a cross-site cookie injection vulnerability.
* Fix for correctly propagating HTTP response headers > 8K.
* Fix http responses containing just a header cause Konqueror to wait
  indefinitely for a response.
* Fix problem with cookies in konqueror when server specified as IP adress.
* Fix per-site cookie policy does not apply to cookies set for subdomains.
KHTML
* Fix handling of font-variant:inherit.
* Fix GMail/Firefox yet again.
* Fix confused cursor shapes if mail and new-window links appear on the
  same page.
* Fix cannot type text into boxes on riteaid.com.
* Optimize descendant selector matching.
* Fix invalid placing of image.
* Default to "UTF-8" per section 2 of the draft W3C "The XMLHttpRequest
  Object" specification.
kjs
* Do not convert accented latin1 characters into undrawable char in
  websites using advanced JavaScript.

5 files changed, 124 insertions, 57 deletions

diff --git a/x11/kdelibs3/patches/patch-ac b/x11/kdelibs3/patches/patch-ac
index e9f6d0859a2..817edb93521 100644
--- a/x11/kdelibs3/patches/patch-ac
+++ b/x11/kdelibs3/patches/patch-ac
@@ -1,11 +1,11 @@
-$NetBSD: patch-ac,v 1.4 2006/03/22 23:44:06 minskim Exp $
+$NetBSD: patch-ac,v 1.5 2007/10/20 10:36:15 markd Exp $
 
---- kdecore/Makefile.in.orig	2006-01-21 04:41:31.000000000 -0800
+--- kdecore/Makefile.in.orig	2007-10-09 03:42:13.000000000 +1300
 +++ kdecore/Makefile.in
-@@ -782,7 +782,7 @@ libkdecore_la_SOURCES=libintl.cpp kappli
- #>- libkdecore_la_LDFLAGS = $(QT_LDFLAGS) $(KDE_RPATH) $(KDE_MT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) -version-info 6:0:2 -no-undefined
- #>+ 1
- libkdecore_la_LDFLAGS = $(QT_LDFLAGS) $(KDE_RPATH) $(KDE_MT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) -version-info 6:0:2 -no-undefined $(KDE_NO_UNDEFINED)
+@@ -697,7 +697,7 @@ libkdecore_la_SOURCES=libintl.cpp kappli
+ 	kqiodevicegzip_p.cpp ktimezones.cpp ksycoca_skel.cpp kappdcopiface_skel.cpp kdebugdcopiface_skel.cpp
+ 
+ libkdecore_la_LDFLAGS = $(QT_LDFLAGS) $(KDE_RPATH) $(KDE_MT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) -version-info 6:0:2 -no-undefined
 -libkdecore_la_LIBADD = malloc/libklmalloc.la network/libkdecorenetwork.la $(SVGICON_LIB) ../dcop/libDCOP.la ../libltdl/libltdlc.la $(LIB_XEXT) $(LIBRESOLV) $(LIBUTIL) $(LIBART_LIBS) $(LIB_IDN) ../kdefx/libkdefx.la
 +libkdecore_la_LIBADD = malloc/libklmalloc.la network/libkdecorenetwork.la $(SVGICON_LIB) ../dcop/libDCOP.la ../libltdl/libltdlc.la $(LIB_XEXT) $(LIBZ) $(LIBRESOLV) $(LIBUTIL) $(LIBART_LIBS) $(LIB_IDN) ../kdefx/libkdefx.la
  libkdecore_la_NMCHECK = $(srcdir)/libkdecore.nmcheck
diff --git a/x11/kdelibs3/patches/patch-ae b/x11/kdelibs3/patches/patch-ae
index d57c0395567..48195bbe5ff 100644
--- a/x11/kdelibs3/patches/patch-ae
+++ b/x11/kdelibs3/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.10 2007/05/23 12:57:45 markd Exp $
+$NetBSD: patch-ae,v 1.11 2007/10/20 10:36:15 markd Exp $
 
---- configure.orig	2007-05-17 19:11:02.000000000 +1200
+--- configure.orig	2007-10-09 03:42:25.000000000 +1300
 +++ configure
-@@ -8906,7 +8906,7 @@ darwin* | rhapsody*)
+@@ -8315,7 +8315,7 @@ darwin* | rhapsody*)
    lt_cv_deplibs_check_method=pass_all
    ;;
  
@@ -11,7 +11,7 @@ $NetBSD: patch-ae,v 1.10 2007/05/23 12:57:45 markd Exp $
    if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
      case $host_cpu in
      i*86 )
-@@ -11845,7 +11845,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -11114,7 +11114,7 @@ if test -z "$aix_libpath"; then aix_libp
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -20,7 +20,7 @@ $NetBSD: patch-ae,v 1.10 2007/05/23 12:57:45 markd Exp $
        archive_cmds='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
        hardcode_libdir_flag_spec='-R$libdir'
        hardcode_direct=yes
-@@ -12410,7 +12410,7 @@ kfreebsd*-gnu*)
+@@ -11679,7 +11679,7 @@ kfreebsd*-gnu*)
    dynamic_linker='GNU ld.so'
    ;;
  
@@ -29,7 +29,7 @@ $NetBSD: patch-ae,v 1.10 2007/05/23 12:57:45 markd Exp $
    objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
    version_type=freebsd-$objformat
    case $version_type in
-@@ -14870,7 +14870,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -13995,7 +13995,7 @@ if test -z "$aix_libpath"; then aix_libp
    freebsd-elf*)
      archive_cmds_need_lc_CXX=no
      ;;
@@ -38,7 +38,7 @@ $NetBSD: patch-ae,v 1.10 2007/05/23 12:57:45 markd Exp $
      # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
      # conventions
      ld_shlibs_CXX=yes
-@@ -15581,7 +15581,7 @@ echo $ECHO_N "checking for $compiler opt
+@@ -14706,7 +14706,7 @@ echo $ECHO_N "checking for $compiler opt
  	    ;;
  	esac
  	;;
@@ -47,7 +47,7 @@ $NetBSD: patch-ae,v 1.10 2007/05/23 12:57:45 markd Exp $
  	# FreeBSD uses GNU C++
  	;;
        hpux9* | hpux10* | hpux11*)
-@@ -16183,7 +16183,7 @@ kfreebsd*-gnu*)
+@@ -15308,7 +15308,7 @@ kfreebsd*-gnu*)
    dynamic_linker='GNU ld.so'
    ;;
  
@@ -56,7 +56,7 @@ $NetBSD: patch-ae,v 1.10 2007/05/23 12:57:45 markd Exp $
    objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
    version_type=freebsd-$objformat
    case $version_type in
-@@ -18816,7 +18816,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -17797,7 +17797,7 @@ if test -z "$aix_libpath"; then aix_libp
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -65,7 +65,7 @@ $NetBSD: patch-ae,v 1.10 2007/05/23 12:57:45 markd Exp $
        archive_cmds_F77='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
        hardcode_libdir_flag_spec_F77='-R$libdir'
        hardcode_direct_F77=yes
-@@ -19381,7 +19381,7 @@ kfreebsd*-gnu*)
+@@ -18362,7 +18362,7 @@ kfreebsd*-gnu*)
    dynamic_linker='GNU ld.so'
    ;;
  
@@ -74,7 +74,7 @@ $NetBSD: patch-ae,v 1.10 2007/05/23 12:57:45 markd Exp $
    objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
    version_type=freebsd-$objformat
    case $version_type in
-@@ -21136,7 +21136,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -20085,7 +20085,7 @@ if test -z "$aix_libpath"; then aix_libp
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -83,7 +83,7 @@ $NetBSD: patch-ae,v 1.10 2007/05/23 12:57:45 markd Exp $
        archive_cmds_GCJ='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
        hardcode_libdir_flag_spec_GCJ='-R$libdir'
        hardcode_direct_GCJ=yes
-@@ -21701,7 +21701,7 @@ kfreebsd*-gnu*)
+@@ -20650,7 +20650,7 @@ kfreebsd*-gnu*)
    dynamic_linker='GNU ld.so'
    ;;
  
@@ -92,16 +92,7 @@ $NetBSD: patch-ae,v 1.10 2007/05/23 12:57:45 markd Exp $
    objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
    version_type=freebsd-$objformat
    case $version_type in
-@@ -25104,7 +25104,7 @@ else
- 	linux*)
- 	  libltdl_cv_sys_dlopen_deplibs=yes
- 	  ;;
--	netbsd*|openbsd*|freebsd*)
-+	netbsd*|openbsd*|freebsd*|dragonfly*)
- 	  libltdl_cv_sys_dlopen_deplibs=yes
- 	  ;;
- 	solaris*)
-@@ -49611,7 +49611,7 @@ echo "$as_me: error: Fast malloc is not 
+@@ -45210,7 +45210,7 @@ echo "$as_me: error: Fast malloc is not 
      esac
      case $target_os in
          linux*) ;;
@@ -110,7 +101,7 @@ $NetBSD: patch-ae,v 1.10 2007/05/23 12:57:45 markd Exp $
          *)
              if test "$kde_fast_malloc" = "notgiven"; then
                  kde_fast_malloc=no
-@@ -56253,7 +56253,7 @@ echo "${ECHO_T}$kde_cv_path" >&6; }
+@@ -51069,7 +51069,7 @@ echo "${ECHO_T}$kde_cv_path" >&6; }
        gssapi_flavor=HEIMDAL
      fi
    else
@@ -119,7 +110,7 @@ $NetBSD: patch-ae,v 1.10 2007/05/23 12:57:45 markd Exp $
  
  gssapi_incdir=NO
  for i in $search_incs;
-@@ -56296,7 +56296,7 @@ done
+@@ -51112,7 +51112,7 @@ done
              GSSAPI_LIBS="-L$gssapi_libdir "
              test "$USE_RPATH" = yes && GSSAPI_RPATH="-R $gssapi_libdir"
            fi
@@ -128,7 +119,7 @@ $NetBSD: patch-ae,v 1.10 2007/05/23 12:57:45 markd Exp $
            with_gssapi=FOUND
            gssapi_flavor=HEIMDAL
            break
-@@ -56340,7 +56340,7 @@ echo "${ECHO_T}searched but not found" >
+@@ -51156,7 +51156,7 @@ echo "${ECHO_T}searched but not found" >
        GSSAPI_LIBS="${GSSAPI_LIBS}-lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err ${LIBRESOLV}"
      else
        gssapi_flavor=HEIMDAL
@@ -137,29 +128,3 @@ $NetBSD: patch-ae,v 1.10 2007/05/23 12:57:45 markd Exp $
      fi
    fi
    if test "x$gssapi_flavor" = "xMIT" ; then
-@@ -56720,10 +56720,11 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- #include <math.h>
-+float f;
- int
- main ()
- {
--float f = 0.0; isnan(f)
-+return isnan(f)
-   ;
-   return 0;
- }
-@@ -56794,10 +56795,11 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- #include <math.h>
-+float f;
- int
- main ()
- {
--float f = 0.0; isinf(f)
-+return isinf(f)
-   ;
-   return 0;
- }
diff --git a/x11/kdelibs3/patches/patch-af b/x11/kdelibs3/patches/patch-af
new file mode 100644
index 00000000000..0d56885a7da
--- /dev/null
+++ b/x11/kdelibs3/patches/patch-af
@@ -0,0 +1,46 @@
+$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
new file mode 100644
index 00000000000..3029f872ac4
--- /dev/null
+++ b/x11/kdelibs3/patches/patch-ak
@@ -0,0 +1,43 @@
+$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
new file mode 100644
index 00000000000..7a983d56376
--- /dev/null
+++ b/x11/kdelibs3/patches/patch-al
@@ -0,0 +1,13 @@
+$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;
+ }