[pkgsrc/trunk]: pkgsrc/x11/kdelibs3 Update to KDE 3.4.1

[markd <markd%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9374e6b7b5e7
branches:  trunk
changeset: 494827:9374e6b7b5e7
user:      markd <markd%pkgsrc.org@localhost>
date:      Tue May 31 14:13:23 2005 +0000

description:
Update to KDE 3.4.1

Changes:
* kdecore: Fix in command-line argument handler for clicking on mailto
  urls while kontact was started with arguments
* kdecore: Fix the support for Dante proxies
* kdecore: Fix the "random resolver failure" problem
* kdecore: Fix the support for the IPv6 Blacklist in ioslaves
* kdeui: Fix "Change Icon" in the toolbar editor
* khtml: Fix submitted position for scrolled imagemaps
* khtml: Load external CSS style-sheet with correct charset
* khtml: Apply CSS padding to tables
* khtml: Improve PRE parsing
* khtml: Fix links with WBR tags
* khtml: Parse CSS3 pseudo-classes and pseudo-elements more strict
* khtml: Fix document.all.item
* khtml: Return meaningful HTMLTableCellElement::cellIndex() values
* khtml: Unbreak setting of location.href on windows opened by
  windows.open()
* khtml: Various crash fixes
* khtml: Fixed infinite loop due to onChange from textareas
* khtml: Fix crash in window.setTimeout when Javascript is disabled
* khtml: Fix server-side-push handler to accept bugzilla sending
  "text/html; charset=utf-8" as Content-Type
* khtml: Fix for MMB-pasting onto an empty konqueror window
* kjs: Allow non-ascii letters in identifiers
* kjs: More flexible date string parsing
* kjs: Fixes in escape() and unescape() functions
* kjs: Fixes in RegExp constructor
* kssl: store SSL passwords in the KDE wallet and reuse as needed
* kio: KZip: Fixed double-deletion bug when trying to write to a
  non-writable directory.
* kio: Fix for print:/manager not embedding the right part in Konqueror
* kio: Use correct window icon in Konqueror when showing trash:/
* kfile: Don't show edit dialog when drop-adding items to sidebar
* kfile: If Shift is pressed when menu opens show 'Delete' instead of
  'Trash'
* kio-http: Prevent endless busy loop
* kio-http: Massive speed improvement for deleting Webdav folders
* kio-ftp: Try non-passive mode if passive mode fails
* kio-ftp: Fix parsing of Netware FTP servers, so that files don't all
  appear with a lock (no permissions)
* kutils: Fixed support for back ref \0 (entire matched text)

diffstat:

 x11/kdelibs3/Makefile         |    8 +-
 x11/kdelibs3/PLIST            |    8 +-
 x11/kdelibs3/buildlink3.mk    |    7 +-
 x11/kdelibs3/distinfo         |   21 +-
 x11/kdelibs3/patches/patch-cc |   10 +-
 x11/kdelibs3/patches/patch-da |   13 -
 x11/kdelibs3/patches/patch-db |   16 -
 x11/kdelibs3/patches/patch-dc |  432 ------------------------------------------
 x11/kdelibs3/patches/patch-dd |   15 -
 x11/kdelibs3/patches/patch-de |  259 -------------------------
 x11/kdelibs3/patches/patch-df |   22 --
 x11/kdelibs3/patches/patch-dg |   89 --------
 x11/kdelibs3/patches/patch-dh |   13 -
 x11/kdelibs3/patches/patch-di |   39 ---
 x11/kdelibs3/patches/patch-dj |   65 ------
 x11/kdelibs3/patches/patch-dk |   46 ----
 16 files changed, 26 insertions(+), 1037 deletions(-)

diffs (truncated from 1224 to 300 lines):

diff -r d1ca449ce654 -r 9374e6b7b5e7 x11/kdelibs3/Makefile
--- a/x11/kdelibs3/Makefile     Tue May 31 14:05:57 2005 +0000
+++ b/x11/kdelibs3/Makefile     Tue May 31 14:13:23 2005 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.86 2005/05/13 19:26:47 reed Exp $
+# $NetBSD: Makefile,v 1.87 2005/05/31 14:13:23 markd Exp $
 
 DISTNAME=      kdelibs-${_KDE_VERSION}
-PKGREVISION=   4
 CATEGORIES=    x11
 COMMENT=       Support libraries for the KDE integrated X11 desktop
 
@@ -96,11 +95,14 @@
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../audio/arts/buildlink3.mk"
 .include "../../audio/libaudiofile/buildlink3.mk"
+.include "../../devel/libidn/buildlink3.mk"
 .include "../../devel/pcre/buildlink3.mk"
-.include "../../graphics/openexr/buildlink3.mk"
+.include "../../graphics/jasper/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/libart2/buildlink3.mk"
+.include "../../graphics/openexr/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
+.include "../../net/mDNSResponder/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../textproc/aspell/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
diff -r d1ca449ce654 -r 9374e6b7b5e7 x11/kdelibs3/PLIST
--- a/x11/kdelibs3/PLIST        Tue May 31 14:05:57 2005 +0000
+++ b/x11/kdelibs3/PLIST        Tue May 31 14:13:23 2005 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.24 2005/03/27 22:43:09 markd Exp $
+@comment $NetBSD: PLIST,v 1.25 2005/05/31 14:13:23 markd Exp $
 bin/artsmessage
 bin/checkXML
 ${CUPS}bin/cupsdconf
@@ -637,7 +637,6 @@
 include/kstringvalidator.h
 include/kstyle.h
 include/ksvgiconengine.h
-include/kswap.h
 include/ksycoca.h
 include/ksycocaentry.h
 include/ksycocatype.h
@@ -782,6 +781,7 @@
 lib/kde3/kimg_eps.la
 lib/kde3/kimg_exr.la
 lib/kde3/kimg_ico.la
+lib/kde3/kimg_jp2.la
 lib/kde3/kimg_pcx.la
 lib/kde3/kimg_psd.la
 lib/kde3/kimg_rgb.la
@@ -2994,6 +2994,7 @@
 share/kde/icons/crystalsvg/16x16/actions/editpaste.png
 share/kde/icons/crystalsvg/16x16/actions/editshred.png
 share/kde/icons/crystalsvg/16x16/actions/edittrash.png
+share/kde/icons/crystalsvg/16x16/actions/emptytrash.png
 share/kde/icons/crystalsvg/16x16/actions/encrypted.png
 share/kde/icons/crystalsvg/16x16/actions/eraser.png
 share/kde/icons/crystalsvg/16x16/actions/exec.png
@@ -3400,6 +3401,7 @@
 share/kde/icons/crystalsvg/22x22/actions/editpaste.png
 share/kde/icons/crystalsvg/22x22/actions/editshred.png
 share/kde/icons/crystalsvg/22x22/actions/edittrash.png
+share/kde/icons/crystalsvg/22x22/actions/emptytrash.png
 share/kde/icons/crystalsvg/22x22/actions/encrypted.png
 share/kde/icons/crystalsvg/22x22/actions/eraser.png
 share/kde/icons/crystalsvg/22x22/actions/exec.png
@@ -3732,6 +3734,7 @@
 share/kde/icons/crystalsvg/32x32/actions/editpaste.png
 share/kde/icons/crystalsvg/32x32/actions/editshred.png
 share/kde/icons/crystalsvg/32x32/actions/edittrash.png
+share/kde/icons/crystalsvg/32x32/actions/emptytrash.png
 share/kde/icons/crystalsvg/32x32/actions/encrypted.png
 share/kde/icons/crystalsvg/32x32/actions/exec.png
 share/kde/icons/crystalsvg/32x32/actions/exit.png
@@ -4958,6 +4961,7 @@
 share/kde/services/http_cache_cleaner.desktop
 share/kde/services/https.protocol
 share/kde/services/ico.kimgio
+share/kde/services/jp2.kimgio
 share/kde/services/jpeg.kimgio
 share/kde/services/katepart.desktop
 share/kde/services/kbzip2filter.desktop
diff -r d1ca449ce654 -r 9374e6b7b5e7 x11/kdelibs3/buildlink3.mk
--- a/x11/kdelibs3/buildlink3.mk        Tue May 31 14:05:57 2005 +0000
+++ b/x11/kdelibs3/buildlink3.mk        Tue May 31 14:13:23 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2005/05/11 22:08:19 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2005/05/31 14:13:23 markd Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 KDELIBS_BUILDLINK3_MK:=        ${KDELIBS_BUILDLINK3_MK}+
@@ -34,11 +34,14 @@
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../audio/arts/buildlink3.mk"
 .include "../../audio/libaudiofile/buildlink3.mk"
+.include "../../devel/libidn/buildlink3.mk"
 .include "../../devel/pcre/buildlink3.mk"
-.include "../../graphics/openexr/buildlink3.mk"
+.include "../../graphics/jasper/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/libart2/buildlink3.mk"
+.include "../../graphics/openexr/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
+.include "../../net/mDNSResponder/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../textproc/aspell/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
diff -r d1ca449ce654 -r 9374e6b7b5e7 x11/kdelibs3/distinfo
--- a/x11/kdelibs3/distinfo     Tue May 31 14:05:57 2005 +0000
+++ b/x11/kdelibs3/distinfo     Tue May 31 14:13:23 2005 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.56 2005/05/04 13:45:51 markd Exp $
+$NetBSD: distinfo,v 1.57 2005/05/31 14:13:23 markd Exp $
 
-SHA1 (kdelibs-3.4.0.tar.bz2) = ca3ded4105a500dae5170ccf85cd62af98b33961
-RMD160 (kdelibs-3.4.0.tar.bz2) = 75917f60d115d770b5a8aa3922591e118c6bfdf0
-Size (kdelibs-3.4.0.tar.bz2) = 16861967 bytes
+SHA1 (kdelibs-3.4.1.tar.bz2) = 6f448da6f23a1c67b70c13c96aee74f9c870a936
+RMD160 (kdelibs-3.4.1.tar.bz2) = 56396e21d6807965de621f1a9127d69e9108e6fc
+Size (kdelibs-3.4.1.tar.bz2) = 16853777 bytes
 SHA1 (patch-aa) = be278f29b743c573b71c7804eff26324e78ed779
 SHA1 (patch-ab) = 3a79b3e7fadef1a93a5490b716dace60f3de30a1
 SHA1 (patch-ad) = fc3a7b173dc93bad196fff3ddd9aef65c92dda64
@@ -14,18 +14,7 @@
 SHA1 (patch-bd) = 172e1146d4e1e49a1a61d7ddc415dbfa4e5c4088
 SHA1 (patch-bu) = 65aca46f30be04c0d8177498eac149437b21ba56
 SHA1 (patch-bv) = 882355f9dd9cdbbbe14d54e5c59b630ef0347e1c
-SHA1 (patch-cc) = 3b9024081a1727a925b5e3237378d8b2fc37bb4c
+SHA1 (patch-cc) = 5581849c63bfc219a8262e83c3c66c7df51fbc1f
 SHA1 (patch-ce) = e9f7a348b0e4be1475ba8f56a8b474f139eb7781
 SHA1 (patch-cf) = 0409b64ee00f355bfc2056e596b519a241fcf522
 SHA1 (patch-cg) = e68fc3f4147b1c4760669318319e59bcf67cea51
-SHA1 (patch-da) = f84186eb73af08023f7d9960c2086a60d5042e14
-SHA1 (patch-db) = 3235276a2aad256e59d2c83d49785cb672433abc
-SHA1 (patch-dc) = be18891ac90f164c145140f8286c5bc281fcf70b
-SHA1 (patch-dd) = 7bfa26bfa6962f4ebaaf4015c3c76a769998c062
-SHA1 (patch-de) = 08732b0fac0630b60ebcd92e7b566a323a0eb790
-SHA1 (patch-df) = 4c7c73e8942e6842f58420bbe5b9491e7116002d
-SHA1 (patch-dg) = a10324f6c8e82672a62af45113887e14ea80f344
-SHA1 (patch-dh) = 9981f590f83e4543e2e3478b607aed36afe373c5
-SHA1 (patch-di) = 6bbf926ec725cd3b931a9afc5e209cd3bed054cb
-SHA1 (patch-dj) = a90296d5453d4b7f776338c29300e3c475473d6b
-SHA1 (patch-dk) = 4d7c2fc36d854f6d727cd6be0390901dc031fbe2
diff -r d1ca449ce654 -r 9374e6b7b5e7 x11/kdelibs3/patches/patch-cc
--- a/x11/kdelibs3/patches/patch-cc     Tue May 31 14:05:57 2005 +0000
+++ b/x11/kdelibs3/patches/patch-cc     Tue May 31 14:13:23 2005 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-cc,v 1.6 2005/03/23 21:37:48 markd Exp $
+$NetBSD: patch-cc,v 1.7 2005/05/31 14:13:24 markd Exp $
 
---- kdeui/ksconfig.cpp.orig    2005-02-04 12:33:10.000000000 +1300
+--- kdeui/ksconfig.cpp.orig    2005-05-24 00:17:17.000000000 +1200
 +++ kdeui/ksconfig.cpp
 @@ -429,6 +429,8 @@ void KSpellConfig::getAvailDictsIspell (
    // dictionary path
@@ -29,9 +29,9 @@
          dir.setFile ("/usr/local/lib/ispell");
        if (!dir.exists() || !dir.isDir())
          dir.setFile ("/usr/local/share/ispell");
-@@ -647,6 +653,8 @@ KSpellConfig::fillDicts( QComboBox* box,
-       // FIXME: use "aspell dump config" to find out the dict-dir
-       QFileInfo dir ("/usr/lib/aspell");
+@@ -649,6 +655,8 @@ KSpellConfig::fillDicts( QComboBox* box,
+       if (!dir.exists() || !dir.isDir())
+         dir.setFile ("/usr/lib/aspell-0.60");
        if (!dir.exists() || !dir.isDir())
 +        dir.setFile ("@LOCALBASE@/lib");
 +      if (!dir.exists() || !dir.isDir())
diff -r d1ca449ce654 -r 9374e6b7b5e7 x11/kdelibs3/patches/patch-da
--- a/x11/kdelibs3/patches/patch-da     Tue May 31 14:05:57 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-da,v 1.1 2005/04/12 11:00:03 drochner Exp $
-
---- kimgio/exr.cpp.orig        2004-11-22 04:48:27.000000000 +0100
-+++ kimgio/exr.cpp
-@@ -136,6 +136,8 @@ KDE_EXPORT void kimgio_exr_read( QImageI
-         file.readPixels (dw.min.y, dw.max.y);
- 
-               QImage image(width, height, 32, 0, QImage::BigEndian);
-+              if( image.isNull())
-+                      return;
- 
-               // somehow copy pixels into image
-               for ( int y=0; y < height; y++ ) {
diff -r d1ca449ce654 -r 9374e6b7b5e7 x11/kdelibs3/patches/patch-db
--- a/x11/kdelibs3/patches/patch-db     Tue May 31 14:05:57 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-$NetBSD: patch-db,v 1.1 2005/04/12 11:00:03 drochner Exp $
-
---- kimgio/jp2.cpp.orig        2004-11-22 04:48:27.000000000 +0100
-+++ kimgio/jp2.cpp
-@@ -157,8 +157,9 @@ namespace {
-       void
-       draw_view_gray( gs_t& gs, QImage& qti )
-       {
--              qti.create( jas_image_width( gs.image ), jas_image_height( gs.image ),
--                      8, 256 );
-+              if( !qti.create( jas_image_width( gs.image ), jas_image_height( gs.image ),
-+                      8, 256 ))
-+                      return;
-               for( int i = 0; i < 256; ++i )
-                       qti.setColor( i, qRgb( i, i, i ) );
- 
diff -r d1ca449ce654 -r 9374e6b7b5e7 x11/kdelibs3/patches/patch-dc
--- a/x11/kdelibs3/patches/patch-dc     Tue May 31 14:05:57 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,432 +0,0 @@
-$NetBSD: patch-dc,v 1.2 2005/05/01 04:35:40 markd Exp $
-
---- kimgio/pcx.cpp.orig        2004-11-22 16:48:27.000000000 +1300
-+++ kimgio/pcx.cpp
-@@ -1,5 +1,5 @@
- /* This file is part of the KDE project
--   Copyright (C) 2002-2003 Nadeem Hasan <nhasan%kde.org@localhost>
-+   Copyright (C) 2002-2005 Nadeem Hasan <nhasan%kde.org@localhost>
- 
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-@@ -44,6 +44,11 @@ static QDataStream &operator>>( QDataStr
-   s >> ph.HScreenSize;
-   s >> ph.VScreenSize;
- 
-+  // Skip the rest of the header
-+  Q_UINT8 byte;
-+  while ( s.device()->at() < 128 )
-+    s >> byte;
-+
-   return s;
- }
- 
-@@ -85,25 +90,22 @@ static QDataStream &operator<<( QDataStr
-   return s;
- }
- 
--static PCXHEADER header;
--static QImage img;
--static Q_UINT16 w, h;
--
--void PCXHEADER::reset()
-+PCXHEADER::PCXHEADER()
- {
-+  // Initialize all data to zero
-   QByteArray dummy( 128 );
-   dummy.fill( 0 );
-   QDataStream s( dummy, IO_ReadOnly );
-   s >> *this;
- }
- 
--static void readLine( QDataStream &s, QByteArray &buf )
-+static void readLine( QDataStream &s, QByteArray &buf, const PCXHEADER &header )
- {
-   Q_UINT32 i=0;
-   Q_UINT32 size = buf.size();
-   Q_UINT8 byte, count;
- 
--  if ( header.Encoding == 1 )
-+  if ( header.isCompressed() )
-   {
-     // Uncompress the image data
-     while ( i < size )
-@@ -130,13 +132,14 @@ static void readLine( QDataStream &s, QB
-   }
- }
- 
--static void readImage1( QDataStream &s )
-+static void readImage1( QImage &img, QDataStream &s, const PCXHEADER &header )
- {
-   QByteArray buf( header.BytesPerLine );
- 
--  img.create( w, h, 1, 2, QImage::BigEndian );
-+  if(!img.create( header.width(), header.height(), 1, 2, QImage::BigEndian ))
-+    return;
- 
--  for ( int y=0; y<h; ++y )
-+  for ( int y=0; y<header.height(); ++y )
-   {
-     if ( s.atEnd() )
-     {
-@@ -144,10 +147,11 @@ static void readImage1( QDataStream &s )
-       return;
-     }
- 
--    readLine( s, buf );
--
--    for ( int x=0; x<header.BytesPerLine; ++x )
--      *( img.scanLine( y )+x ) = buf[ x ];
-+    readLine( s, buf, header );
-+    uchar *p = img.scanLine( y );
-+    unsigned int bpl = QMIN((header.width()+7)/8, header.BytesPerLine);
-+    for ( unsigned int x=0; x< bpl; ++x )
-+      p[ x ] = buf[x];
-   }
- 
-   // Set the color palette
-@@ -155,14 +159,15 @@ static void readImage1( QDataStream &s )