Update to KDE 3.5.7

KHTML
* Implement heuristic cyr encoding detection.
* Implement support for textContent().
* Indicate near mouse pointer if a link wants to open a new browser window.
* Harmonize document.href and .pathname of about:blank windows with other
  browsers.
* Fix jumping to the top right before loading a new page.
* Make frame name lookup locale-independant.
* Make valueOf() and toString() accessible across sites.
* Make setValue() work on radio button and checkboxes.
* overrideMimeType() implementation.
* Fix various crashes and bugs.

KJS
* Support named function expressions.
* Support for localeCompare() function.
* Caller property implementation.
* Improvements:
* Unreserve class keyword as it's often used as an identifier by JS
  programmers.
* Disable UTF-8 validation in libPCRE, since it's incredibly slow.
* Support unicode escape sequences in identifier names.
* Parse null characters.
* toExponential() fix for negative numbers.
* Fixed off-by-one digit error in toFixed().

Kate
* Update cmake highlighter.
* Fix bug in search and replace, placeholder did not work correctly.
* Make cursor in inactive views behave correctly.
* Update selection after paste.
* Multiple views are usable again.

Kimgio
* Fix buffer overflow during writing xview files.

7 files changed, 42 insertions, 123 deletions

diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index 36b14076864..590e6078582 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.124 2007/04/06 12:59:17 markd Exp $
+# $NetBSD: Makefile,v 1.125 2007/05/23 12:57:37 markd Exp $
 
 DISTNAME=	kdelibs-${_KDE_VERSION}
-PKGREVISION=	3
 CATEGORIES=	x11
 COMMENT=	Support libraries for the KDE integrated X11 desktop
 
-PATCH_SITES=	ftp://ftp.kde.org/pub/kde/security_patches/ \
-		http://mirrors.isc.org/pub/kde/security_patches/
-PATCHFILES=	post-3.5.6-kdelibs.diff CVE-2007-1564-kdelibs-3.5.6.diff
+#PATCH_SITES=	ftp://ftp.kde.org/pub/kde/security_patches/ \
+#		http://mirrors.isc.org/pub/kde/security_patches/
+#PATCHFILES=	post-3.5.6-kdelibs.diff CVE-2007-1564-kdelibs-3.5.6.diff
 
 .include "../../meta-pkgs/kde3/Makefile.kde3"
 
diff --git a/x11/kdelibs3/PLIST b/x11/kdelibs3/PLIST
index 692cdc46a1d..0bf67048c6b 100644
--- a/x11/kdelibs3/PLIST
+++ b/x11/kdelibs3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.38 2007/01/26 02:44:28 markd Exp $
+@comment $NetBSD: PLIST,v 1.39 2007/05/23 12:57:45 markd Exp $
 bin/artsmessage
 bin/checkXML
 ${CUPS}bin/cupsdconf
@@ -144,7 +144,6 @@ include/kabc/resource.h
 include/kabc/resourcedir.h
 include/kabc/resourcefile.h
 include/kabc/resourceldapkio.h
-include/kabc/resourcenet.h
 include/kabc/resourceselectdialog.h
 include/kabc/secrecy.h
 include/kabc/sortmode.h
@@ -761,7 +760,6 @@ lib/kde3/dcopserver.la
 lib/kde3/kabc_dir.la
 lib/kde3/kabc_file.la
 lib/kde3/kabc_ldapkio.la
-lib/kde3/kabc_net.la
 lib/kde3/kabcformat_binary.la
 lib/kde3/kaddprinterwizard.la
 lib/kde3/kbuildsycoca.la
@@ -838,7 +836,6 @@ lib/libkabc.la
 lib/libkabc_dir.la
 lib/libkabc_file.la
 lib/libkabc_ldapkio.la
-lib/libkabc_net.la
 lib/libkatepartinterfaces.la
 lib/libkdecore.la
 lib/libkdefakes.la
@@ -3362,6 +3359,7 @@ share/kde/apps/ksgmltools2/customization/de/entities/underArtisticLicense.docboo
 share/kde/apps/ksgmltools2/customization/de/entities/underBSDLicense.docbook
 share/kde/apps/ksgmltools2/customization/de/entities/underFDL.docbook
 share/kde/apps/ksgmltools2/customization/de/entities/underGPL.docbook
+share/kde/apps/ksgmltools2/customization/de/entities/underLGPL.docbook
 share/kde/apps/ksgmltools2/customization/de/entities/underX11License.docbook
 share/kde/apps/ksgmltools2/customization/de/entities/update-doc.docbook
 share/kde/apps/ksgmltools2/customization/de/lang.entities
@@ -3508,6 +3506,7 @@ share/kde/apps/ksgmltools2/customization/fr/entities/underArtisticLicense.docboo
 share/kde/apps/ksgmltools2/customization/fr/entities/underBSDLicense.docbook
 share/kde/apps/ksgmltools2/customization/fr/entities/underFDL.docbook
 share/kde/apps/ksgmltools2/customization/fr/entities/underGPL.docbook
+share/kde/apps/ksgmltools2/customization/fr/entities/underLGPL.docbook
 share/kde/apps/ksgmltools2/customization/fr/entities/underX11License.docbook
 share/kde/apps/ksgmltools2/customization/fr/entities/update-doc.docbook
 share/kde/apps/ksgmltools2/customization/fr/lang.entities
@@ -4988,6 +4987,7 @@ share/kde/mimelnk/audio/x-mpegurl.desktop
 share/kde/mimelnk/audio/x-ms-wma.desktop
 share/kde/mimelnk/audio/x-musepack.desktop
 share/kde/mimelnk/audio/x-oggflac.desktop
+share/kde/mimelnk/audio/x-pn-realaudio-plugin.desktop
 share/kde/mimelnk/audio/x-pn-realaudio.desktop
 share/kde/mimelnk/audio/x-scpls.desktop
 share/kde/mimelnk/audio/x-speex.desktop
@@ -5144,7 +5144,6 @@ share/kde/services/knotify.desktop
 share/kde/services/kresources/kabc/dir.desktop
 share/kde/services/kresources/kabc/file.desktop
 share/kde/services/kresources/kabc/ldapkio.desktop
-share/kde/services/kresources/kabc/net.desktop
 share/kde/services/kresources/kabc_manager.desktop
 share/kde/services/kspell_aspell.desktop
 share/kde/services/kspell_ispell.desktop
diff --git a/x11/kdelibs3/distinfo b/x11/kdelibs3/distinfo
index e64228184f3..5f1e957e01a 100644
--- a/x11/kdelibs3/distinfo
+++ b/x11/kdelibs3/distinfo
@@ -1,21 +1,13 @@
-$NetBSD: distinfo,v 1.85 2007/04/06 12:59:17 markd Exp $
+$NetBSD: distinfo,v 1.86 2007/05/23 12:57:45 markd Exp $
 
-SHA1 (CVE-2007-1564-kdelibs-3.5.6.diff) = a296f0dff11007f835bdbca23b259ad8483aa4c9
-RMD160 (CVE-2007-1564-kdelibs-3.5.6.diff) = 894a9c5f51da21022b9448da957893a57384c065
-Size (CVE-2007-1564-kdelibs-3.5.6.diff) = 2835 bytes
-SHA1 (kdelibs-3.5.6.tar.bz2) = 2cc15499bd2191bd9333cfd1892b5ecf1199fbfd
-RMD160 (kdelibs-3.5.6.tar.bz2) = ce8c088e13f0e59238719600da9c768eac58b57d
-Size (kdelibs-3.5.6.tar.bz2) = 15509460 bytes
-SHA1 (post-3.5.6-kdelibs.diff) = 25424adbddc1968d8d3cec549b5328190cbd7710
-RMD160 (post-3.5.6-kdelibs.diff) = 6cde79c807a39bb070bd8eb380b1e26bed82c803
-Size (post-3.5.6-kdelibs.diff) = 1150 bytes
+SHA1 (kdelibs-3.5.7.tar.bz2) = 45f278311f20d2eb317f2175259f861c0bcf17a9
+RMD160 (kdelibs-3.5.7.tar.bz2) = 006c57ef85956ed3903749cace254bdfdf2f347e
+Size (kdelibs-3.5.7.tar.bz2) = 15576038 bytes
 SHA1 (patch-aa) = be278f29b743c573b71c7804eff26324e78ed779
 SHA1 (patch-ab) = 3a79b3e7fadef1a93a5490b716dace60f3de30a1
 SHA1 (patch-ac) = f4a8fc2bfcf8a414e690eafd51607250b9f51890
 SHA1 (patch-ad) = d8ddcea1a281474b7694979b14744c5e06b56b65
-SHA1 (patch-ae) = b259a376dca4a335fbc5167868330c25c7691912
-SHA1 (patch-af) = 3f9075e84e56da7dac6ba0d893d215cc4cd11bfa
-SHA1 (patch-ag) = 525ba127f5de78d02a14f9c3c9f306fc4e14d1fa
+SHA1 (patch-ae) = e7e8e28fefe09ee32966cf01b59b7c9d6fbd2984
 SHA1 (patch-aj) = 2ec8d33ce6684da7c60759cf395b78fa4ac2eaec
 SHA1 (patch-an) = d34a3cc0ac0b92921bcaeb9b05c5b7a99ee3566c
 SHA1 (patch-ao) = 7ae360b2ee2332ec3017dfd468457f2c1b139308
@@ -24,7 +16,7 @@ SHA1 (patch-aq) = 91d970b5c2fb129e5656cf4841972453c83ba088
 SHA1 (patch-bc) = 434a48d290aa9716b8c6e372419460ebd33cf8ea
 SHA1 (patch-bd) = 2c139b81ff96d1762c14af0bb29275cf66ee8f8d
 SHA1 (patch-bv) = 882355f9dd9cdbbbe14d54e5c59b630ef0347e1c
-SHA1 (patch-cc) = 5581849c63bfc219a8262e83c3c66c7df51fbc1f
+SHA1 (patch-cc) = 136bedb27637ab1679871a4940999e8d32c54a09
 SHA1 (patch-ce) = e9f7a348b0e4be1475ba8f56a8b474f139eb7781
 SHA1 (patch-cf) = 0409b64ee00f355bfc2056e596b519a241fcf522
 SHA1 (patch-da) = ac1888a52f22ac81c0fb51dda48c8e168516a229
diff --git a/x11/kdelibs3/patches/patch-ae b/x11/kdelibs3/patches/patch-ae
index ccf6313253f..d57c0395567 100644
--- a/x11/kdelibs3/patches/patch-ae
+++ b/x11/kdelibs3/patches/patch-ae
@@ -1,6 +1,6 @@
-$NetBSD: patch-ae,v 1.9 2007/01/26 02:44:28 markd Exp $
+$NetBSD: patch-ae,v 1.10 2007/05/23 12:57:45 markd Exp $
 
---- configure.orig	2007-01-24 21:54:16.000000000 +1300
+--- configure.orig	2007-05-17 19:11:02.000000000 +1200
 +++ configure
 @@ -8906,7 +8906,7 @@ darwin* | rhapsody*)
    lt_cv_deplibs_check_method=pass_all
@@ -101,7 +101,7 @@ $NetBSD: patch-ae,v 1.9 2007/01/26 02:44:28 markd Exp $
  	  libltdl_cv_sys_dlopen_deplibs=yes
  	  ;;
  	solaris*)
-@@ -49610,7 +49610,7 @@ echo "$as_me: error: Fast malloc is not 
+@@ -49611,7 +49611,7 @@ echo "$as_me: error: Fast malloc is not 
      esac
      case $target_os in
          linux*) ;;
@@ -110,7 +110,7 @@ $NetBSD: patch-ae,v 1.9 2007/01/26 02:44:28 markd Exp $
          *)
              if test "$kde_fast_malloc" = "notgiven"; then
                  kde_fast_malloc=no
-@@ -56249,7 +56249,7 @@ echo "${ECHO_T}$kde_cv_path" >&6; }
+@@ -56253,7 +56253,7 @@ echo "${ECHO_T}$kde_cv_path" >&6; }
        gssapi_flavor=HEIMDAL
      fi
    else
@@ -119,7 +119,7 @@ $NetBSD: patch-ae,v 1.9 2007/01/26 02:44:28 markd Exp $
  
  gssapi_incdir=NO
  for i in $search_incs;
-@@ -56292,7 +56292,7 @@ done
+@@ -56296,7 +56296,7 @@ done
              GSSAPI_LIBS="-L$gssapi_libdir "
              test "$USE_RPATH" = yes && GSSAPI_RPATH="-R $gssapi_libdir"
            fi
@@ -128,7 +128,7 @@ $NetBSD: patch-ae,v 1.9 2007/01/26 02:44:28 markd Exp $
            with_gssapi=FOUND
            gssapi_flavor=HEIMDAL
            break
-@@ -56336,7 +56336,7 @@ echo "${ECHO_T}searched but not found" >
+@@ -56340,7 +56340,7 @@ echo "${ECHO_T}searched but not found" >
        GSSAPI_LIBS="${GSSAPI_LIBS}-lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err ${LIBRESOLV}"
      else
        gssapi_flavor=HEIMDAL
@@ -137,45 +137,29 @@ $NetBSD: patch-ae,v 1.9 2007/01/26 02:44:28 markd Exp $
      fi
    fi
    if test "x$gssapi_flavor" = "xMIT" ; then
-@@ -56539,18 +56539,12 @@ _ACEOF
- cat confdefs.h >>conftest.$ac_ext
+@@ -56720,10 +56720,11 @@ cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
-+#include <math.h>
- 
--/* Override any GCC internal prototype to avoid an error.
--   Use char because int might match the return type of a GCC
--   builtin and then its argument prototype would still apply.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--char isinf ();
+ #include <math.h>
++float f;
  int
  main ()
  {
--return isinf ();
-+return isinf (0.0);
+-float f = 0.0; isnan(f)
++return isnan(f)
    ;
    return 0;
  }
-@@ -56800,18 +56794,12 @@ _ACEOF
- cat confdefs.h >>conftest.$ac_ext
+@@ -56794,10 +56795,11 @@ cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
-+#include <math.h>
- 
--/* Override any GCC internal prototype to avoid an error.
--   Use char because int might match the return type of a GCC
--   builtin and then its argument prototype would still apply.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--char isnan ();
+ #include <math.h>
++float f;
  int
  main ()
  {
--return isnan ();
-+return isnan (0.0);
+-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
deleted file mode 100644
index 6218b7233fb..00000000000
--- a/x11/kdelibs3/patches/patch-af
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-af,v 1.8 2007/02/05 19:32:18 markd Exp $
-
-kde svn 628618
-
---- khtml/html/html_documentimpl.cpp.orig	2007-02-04 10:47:21.000000000 +1300
-+++ khtml/html/html_documentimpl.cpp
-@@ -222,7 +222,7 @@ ElementImpl *HTMLDocumentImpl::createEle
- 
- void HTMLDocumentImpl::slotHistoryChanged()
- {
--    if ( !m_render )
-+    if ( true || !m_render )
-         return;
- 
-     recalcStyle( Force );
diff --git a/x11/kdelibs3/patches/patch-ag b/x11/kdelibs3/patches/patch-ag
deleted file mode 100644
index 5fa68b6a1a7..00000000000
--- a/x11/kdelibs3/patches/patch-ag
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-ag,v 1.10 2007/04/06 12:59:18 markd Exp $
-
-------------------------------------------------------------------------
-r645387 | porten | 2007-03-22 15:01:13 +0100 (Thu, 22 Mar 2007) | 4 lines
-
-substitute some of the invalid sequences with the standard replacement
-char. this matches Mozilla but not IE which leaves them unchanged (or
-throws an exception)
-
-------------------------------------------------------------------------
---- kjs/function.cpp
-+++ kjs/function.cpp
-@@ -244,11 +244,15 @@ UString decodeURI(ExecState *exec, UStri
-       }
- 
-       // UTF-8 transform
-+      const unsigned long replacementChar = 0xFFFD;
-       unsigned long V;
-       if (n == 2) {
- 	unsigned long yyyyy = octets[0] & 0x1F;
- 	unsigned long zzzzzz = octets[1] & 0x3F;
- 	V = (yyyyy << 6) | zzzzzz;
-+	// 2-byte sequence overlong for this value?
-+	if (V < 0xFF)
-+	  V = replacementChar;
- 	C = UChar((unsigned short)V);
-       }
-       else if (n == 3) {
-@@ -256,6 +260,11 @@ UString decodeURI(ExecState *exec, UStri
- 	unsigned long yyyyyy = octets[1] & 0x3F;
- 	unsigned long zzzzzz = octets[2] & 0x3F;
- 	V = (xxxx << 12) | (yyyyyy << 6) | zzzzzz;
-+	// 3-byte sequence overlong for this value,
-+	// an invalid value or UTF-16 surrogate?
-+	if (V < 0x800 || V == 0xFFFE || V == 0xFFFF ||
-+	    (V >= 0xD800 && V <= 0xDFFF))
-+	  V = replacementChar;
- 	C = UChar((unsigned short)V);
-       }
-       else {
diff --git a/x11/kdelibs3/patches/patch-cc b/x11/kdelibs3/patches/patch-cc
index 77ddc6ea91b..842ebd0e29b 100644
--- a/x11/kdelibs3/patches/patch-cc
+++ b/x11/kdelibs3/patches/patch-cc
@@ -1,26 +1,26 @@
-$NetBSD: patch-cc,v 1.7 2005/05/31 14:13:24 markd Exp $
+$NetBSD: patch-cc,v 1.8 2007/05/23 12:57:46 markd Exp $
 
---- kdeui/ksconfig.cpp.orig	2005-05-24 00:17:17.000000000 +1200
+--- kdeui/ksconfig.cpp.orig	2007-05-14 19:52:25.000000000 +1200
 +++ kdeui/ksconfig.cpp
-@@ -429,6 +429,8 @@ void KSpellConfig::getAvailDictsIspell (
+@@ -442,6 +442,8 @@ void KSpellConfig::getAvailDictsIspell (
    // dictionary path
-   QFileInfo dir ("/usr/lib/ispell");
+   QFileInfo dir ("/usr/lib" KDELIBSUFF "/ispell");
    if (!dir.exists() || !dir.isDir())
 +    dir.setFile ("@LOCALBASE@/lib");
 +  if (!dir.exists() || !dir.isDir())
-     dir.setFile ("/usr/local/lib/ispell");
+     dir.setFile ("/usr/local/lib" KDELIBSUFF "/ispell");
    if (!dir.exists() || !dir.isDir())
      dir.setFile ("/usr/local/share/ispell");
-@@ -498,6 +500,8 @@ void KSpellConfig::getAvailDictsAspell (
+@@ -511,6 +513,8 @@ void KSpellConfig::getAvailDictsAspell (
    if (!dir.exists() || !dir.isDir())
-     dir.setFile ("/usr/lib/aspell-0.60");
+     dir.setFile ("/usr/lib" KDELIBSUFF "/aspell-0.60");
    if (!dir.exists() || !dir.isDir())
 +    dir.setFile ("@LOCALBASE@/lib");
 +  if (!dir.exists() || !dir.isDir())
-     dir.setFile ("/usr/local/lib/aspell");
+     dir.setFile ("/usr/local/lib" KDELIBSUFF "/aspell");
    if (!dir.exists() || !dir.isDir())
      dir.setFile ("/usr/share/aspell");
-@@ -579,6 +583,8 @@ KSpellConfig::fillDicts( QComboBox* box,
+@@ -592,6 +596,8 @@ KSpellConfig::fillDicts( QComboBox* box,
        // dictionary path
        QFileInfo dir ("/usr/lib/ispell");
        if (!dir.exists() || !dir.isDir())
@@ -29,12 +29,12 @@ $NetBSD: patch-cc,v 1.7 2005/05/31 14:13:24 markd Exp $
          dir.setFile ("/usr/local/lib/ispell");
        if (!dir.exists() || !dir.isDir())
          dir.setFile ("/usr/local/share/ispell");
-@@ -649,6 +655,8 @@ KSpellConfig::fillDicts( QComboBox* box,
+@@ -667,6 +673,8 @@ KSpellConfig::fillDicts( QComboBox* box,
        if (!dir.exists() || !dir.isDir())
-         dir.setFile ("/usr/lib/aspell-0.60");
+         dir.setFile ("/usr/lib" KDELIBSUFF "/aspell-0.60");
        if (!dir.exists() || !dir.isDir())
 +        dir.setFile ("@LOCALBASE@/lib");
 +      if (!dir.exists() || !dir.isDir())
-         dir.setFile ("/usr/local/lib/aspell");
+         dir.setFile ("/usr/local/lib" KDELIBSUFF "/aspell");
        if (!dir.exists() || !dir.isDir())
          dir.setFile ("/usr/share/aspell");