Update KDE4 to 4.3.2

KDE 4.3.2 brings a nice number of bugfixes, some critical, some just
fixing small annoyances:
* Many crashers have been fixed in KDE's core libraries, bringing more
  stability to all applications
* KWin's window compositing effects have been further stabilized by fixing
  a number of bugs in effect plugins such as the famous coverswitch window
  switcher
* The biggest number of bugs for this release has been fixed in KMail,
  KDE's email client, making it more reliable and usable by correcting a
  number of display issues
* Saving files over themselves works again in Okular, KDE's document viewer

8 files changed, 289 insertions, 29 deletions

diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile
index 435aa93a2e2..25f2c3703c3 100644
--- a/x11/kdelibs4/Makefile
+++ b/x11/kdelibs4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/10/02 19:18:59 markd Exp $
+# $NetBSD: Makefile,v 1.2 2009/10/11 08:13:40 markd Exp $
 
 DISTNAME=	kdelibs-${_KDE_VERSION}
 CATEGORIES=	x11
@@ -11,7 +11,6 @@ COMMENT=	Support libraries for the KDE integrated X11 desktop
 .include "../../meta-pkgs/kde4/Makefile.kde4"
 
 CONFLICTS=	kdelibs-[0-9]*
-PKG_DESTDIR_SUPPORT=	user-destdir
 
 # BUILD_MAKE_FLAGS+= VERBOSE=1
 
diff --git a/x11/kdelibs4/PLIST b/x11/kdelibs4/PLIST
index 8c44a0a3268..dd4ad03b6cd 100644
--- a/x11/kdelibs4/PLIST
+++ b/x11/kdelibs4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2009/10/02 19:18:59 markd Exp $
+@comment $NetBSD: PLIST,v 1.2 2009/10/11 08:13:40 markd Exp $
 bin/checkXML
 bin/kbuildsycoca4
 bin/kconfig_compiler
@@ -2501,6 +2501,7 @@ share/kde/apps/ksgmltools2/customization/es/entities/underArtisticLicense.docboo
 share/kde/apps/ksgmltools2/customization/es/entities/underBSDLicense.docbook
 share/kde/apps/ksgmltools2/customization/es/entities/underFDL.docbook
 share/kde/apps/ksgmltools2/customization/es/entities/underGPL.docbook
+share/kde/apps/ksgmltools2/customization/es/entities/underLGPL.docbook
 share/kde/apps/ksgmltools2/customization/es/entities/underX11License.docbook
 share/kde/apps/ksgmltools2/customization/es/entities/update-doc.docbook
 share/kde/apps/ksgmltools2/customization/es/lang.entities
diff --git a/x11/kdelibs4/distinfo b/x11/kdelibs4/distinfo
index 22709ac1974..51b934b530a 100644
--- a/x11/kdelibs4/distinfo
+++ b/x11/kdelibs4/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.1.1.1 2009/10/02 19:18:56 markd Exp $
+$NetBSD: distinfo,v 1.2 2009/10/11 08:13:40 markd Exp $
 
-SHA1 (kdelibs-4.3.1.tar.bz2) = 511532852caca9302c643fded4013ef1f57d5433
-RMD160 (kdelibs-4.3.1.tar.bz2) = 25c8d6225813a677d4f1e1006f18b0d5c14f9003
-Size (kdelibs-4.3.1.tar.bz2) = 10510833 bytes
+SHA1 (kdelibs-4.3.2.tar.bz2) = 37f8dd8275bffbcb0e01f9f133a20856329dfa0c
+RMD160 (kdelibs-4.3.2.tar.bz2) = 93a5c29a470023585006c26c956146e21d1bcdfb
+Size (kdelibs-4.3.2.tar.bz2) = 10515372 bytes
 SHA1 (patch-aa) = 7146107f78bbc618cf80479195581f29fc6b5977
 SHA1 (patch-ab) = aec1140bef01199f067b079c30d95fea1814839d
 SHA1 (patch-ac) = 223a97a63907477314b69040e1bca3e2ff8cc7b7
@@ -11,4 +11,7 @@ SHA1 (patch-ag) = af1e58512984726a4efaf315bb958a9a529638b8
 SHA1 (patch-ah) = b583dbe1b712984bbe002cc9143352729fba94ed
 SHA1 (patch-ai) = 75b18b8ac0da0eda398d717b9ee3a2af68bcebe4
 SHA1 (patch-aj) = 8520c322d4579e9485253c8e8b130669b0f8b618
-SHA1 (patch-ak) = ef85a1a01e902f98db5fda5b7b27c6a3739dbfd8
+SHA1 (patch-ba) = 9e980afeb09d5b4561638efb339f981b6273d18e
+SHA1 (patch-bb) = df8e42a167d1fa46dfe2cef5b92e6c9aae5b565d
+SHA1 (patch-bc) = 97ba6045f4ff28423d2a565487305a1f6420ce57
+SHA1 (patch-bd) = dd08b9f7c4c158db5b9e5cdd7777bff6979cb26c
diff --git a/x11/kdelibs4/patches/patch-ak b/x11/kdelibs4/patches/patch-ak
deleted file mode 100644
index 8707889397c..00000000000
--- a/x11/kdelibs4/patches/patch-ak
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ak,v 1.1.1.1 2009/10/02 19:19:00 markd Exp $
-
-SVN commit 1028997.
-
---- kdecore/network/k3socketdevice.cpp.orig	2009-09-24 09:21:38.000000000 -0600
-+++ kdecore/network/k3socketdevice.cpp	2009-09-24 09:23:15.000000000 -0600
-@@ -352,9 +352,13 @@ bool KSocketDevice::connect(const KResol
-   if (kde_connect(m_sockfd, address.address(), address.length()) == -1)
-     {
-       if (errno == EISCONN)
--	return true;		// we're already connected
-+	{
-+	  KActiveSocketBase::open(Unbuffered | mode);
-+	  return true;		// we're already connected
-+	}
-       else if (errno == EALREADY || errno == EINPROGRESS)
- 	{
-+	  KActiveSocketBase::open(Unbuffered | mode);
- 	  setError(InProgress);
- 	  return true;
- 	}
diff --git a/x11/kdelibs4/patches/patch-ba b/x11/kdelibs4/patches/patch-ba
new file mode 100644
index 00000000000..cd9a462d77a
--- /dev/null
+++ b/x11/kdelibs4/patches/patch-ba
@@ -0,0 +1,16 @@
+$NetBSD: patch-ba,v 1.1 2009/10/11 08:13:40 markd Exp $
+
+KDE svn 1032787
+
+--- khtml/khtml_part.cpp.orig	2009-10-02 21:18:12.000000000 +1300
++++ khtml/khtml_part.cpp
+@@ -609,8 +609,7 @@ KHTMLPart::~KHTMLPart()
+ 
+   if ( d->m_view )
+   {
+-    d->m_view->hide();
+-    d->m_view->viewport()->hide();
++    widget()->hide();
+     d->m_view->m_part = 0;
+   }
+ 
diff --git a/x11/kdelibs4/patches/patch-bb b/x11/kdelibs4/patches/patch-bb
new file mode 100644
index 00000000000..ddad55f73bc
--- /dev/null
+++ b/x11/kdelibs4/patches/patch-bb
@@ -0,0 +1,138 @@
+$NetBSD: patch-bb,v 1.1 2009/10/11 08:13:40 markd Exp $
+
+KDE svn 1032185
+
+--- kdecore/localization/klocale.cpp.orig	2009-10-02 21:18:08.000000000 +1300
++++ kdecore/localization/klocale.cpp
+@@ -22,6 +22,7 @@
+ */
+ 
+ #include "klocale.h"
++#include "klocale_p.h"
+ 
+ #include <config.h>
+ 
+@@ -242,7 +243,6 @@ public:
+   // Handling of translation catalogs
+   QStringList languageList;
+ 
+-  QMutex* mutex;
+   QList<KCatalogName> catalogNames; // list of all catalogs (regardless of language)
+   QList<KCatalog> catalogs; // list of all found catalogs, one instance per catalog name and language
+   int numberOfSysCatalogs; // number of catalogs that each app draws from
+@@ -276,7 +276,6 @@ public:
+ KLocalePrivate::KLocalePrivate(const QString& catalog, KConfig *config, const QString &language_, const QString &country_)
+     : language(language_),
+       country(country_),
+-      mutex(new QMutex(QMutex::Recursive)),
+       useTranscript(false),
+       codecForEncoding(0),
+       languages(0), calendar(0),
+@@ -311,7 +310,7 @@ KLocale::KLocale(const QString& catalog,
+ void KLocalePrivate::initMainCatalogs()
+ {
+   KLocaleStaticData *s = staticData;
+-  QMutexLocker lock(mutex);
++  QMutexLocker lock(kLocaleMutex());
+ 
+   if (!s->maincatalog.isEmpty()) {
+       // If setMainCatalog was called, then we use that (e.g. korgac calls setMainCatalog("korganizer") to use korganizer.po)
+@@ -541,7 +540,7 @@ bool KLocale::setLanguage(const QString 
+ 
+ bool KLocalePrivate::setLanguage(const QString & _language, KConfig *config)
+ {
+-  QMutexLocker lock(mutex);
++  QMutexLocker lock(kLocaleMutex());
+   languageList.removeAll( _language );
+   languageList.prepend( _language ); // let us consider this language to be the most important one
+ 
+@@ -563,7 +562,7 @@ bool KLocale::setLanguage(const QStringL
+ 
+ bool KLocalePrivate::setLanguage(const QStringList & languages)
+ {
+-  QMutexLocker lock(mutex);
++  QMutexLocker lock(kLocaleMutex());
+   // This list might contain
+   // 1) some empty strings that we have to eliminate
+   // 2) duplicate entries like in de:fr:de, where we have to keep the first occurrence of a language in order
+@@ -685,7 +684,7 @@ QString KLocale::country() const
+ 
+ void KLocale::insertCatalog( const QString & catalog )
+ {
+-  QMutexLocker lock(d->mutex);
++  QMutexLocker lock(kLocaleMutex());
+     int pos = d->catalogNames.indexOf(KCatalogName(catalog));
+     if (pos != -1) {
+         ++d->catalogNames[pos].loadCount;
+@@ -736,7 +735,7 @@ void KLocalePrivate::updateCatalogs( )
+ 
+ void KLocale::removeCatalog(const QString &catalog)
+ {
+-    QMutexLocker lock(d->mutex);
++    QMutexLocker lock(kLocaleMutex());
+     int pos = d->catalogNames.indexOf(KCatalogName(catalog));
+     if (pos == -1)
+         return;
+@@ -749,7 +748,7 @@ void KLocale::removeCatalog(const QStrin
+ 
+ void KLocale::setActiveCatalog(const QString &catalog)
+ {
+-    QMutexLocker lock(d->mutex);
++    QMutexLocker lock(kLocaleMutex());
+     int pos = d->catalogNames.indexOf(KCatalogName(catalog));
+     if (pos == -1)
+         return;
+@@ -759,7 +758,6 @@ void KLocale::setActiveCatalog(const QSt
+ 
+ KLocale::~KLocale()
+ {
+-    delete d->mutex;
+     delete d->calendar;
+     delete d->languages;
+     delete d;
+@@ -788,7 +786,7 @@ void KLocalePrivate::translate_priv(cons
+                 << "Fix the program" << endl;
+   }
+ 
+-  QMutexLocker locker(mutex);
++  QMutexLocker locker(kLocaleMutex());
+   // determine the fallback string
+   QString fallback;
+   if ( msgid_plural == NULL )
+@@ -1370,7 +1368,7 @@ QString KLocale::formatByteSize( double 
+     //Kibi-byte             KiB             2^10    1,024 bytes
+ 
+     if (d->byteSizeFmt.size() == 0) {
+-        QMutexLocker lock(d->mutex);
++        QMutexLocker lock(kLocaleMutex());
+         // Pretranslated format strings for byte sizes.
+         #define CACHEBYTEFMT(x) { \
+             QString s; \
+@@ -2568,7 +2566,6 @@ KLocale::KLocale(const KLocale & rhs) : 
+ {
+   d->languages = 0; // Don't copy languages
+   d->calendar = 0; // Don't copy the calendar
+-  d->mutex = 0; // Don't copy the mutex
+ }
+ 
+ KLocale & KLocale::operator=(const KLocale & rhs)
+@@ -2583,8 +2580,7 @@ KLocale & KLocale::operator=(const KLoca
+ 
+ void KLocale::copyCatalogsTo(KLocale *locale)
+ {
+-    QMutexLocker lock(d->mutex);
+-    QMutexLocker lockOther(locale->d->mutex);
++    QMutexLocker lock(kLocaleMutex());
+     locale->d->catalogNames = d->catalogNames;
+     locale->d->updateCatalogs();
+ }
+@@ -2656,3 +2652,9 @@ KLocale::DigitSet KLocale::dateTimeDigit
+ {
+     return d->dateTimeDigitSet;
+ }
++
++Q_GLOBAL_STATIC_WITH_ARGS(QMutex, s_kLocaleMutex, (QMutex::Recursive))
++QMutex* kLocaleMutex()
++{
++    return s_kLocaleMutex();
++}
diff --git a/x11/kdelibs4/patches/patch-bc b/x11/kdelibs4/patches/patch-bc
new file mode 100644
index 00000000000..b12abf376da
--- /dev/null
+++ b/x11/kdelibs4/patches/patch-bc
@@ -0,0 +1,107 @@
+$NetBSD: patch-bc,v 1.1 2009/10/11 08:13:40 markd Exp $
+
+KDE svn 1032185
+
+--- kdecore/localization/klocalizedstring.cpp.orig	2009-07-22 03:16:08.000000000 +1200
++++ kdecore/localization/klocalizedstring.cpp
+@@ -24,6 +24,7 @@
+ #include <kglobal.h>
+ #include <kdebug.h>
+ #include <klocale.h>
++#include <klocale_p.h>
+ #include <kcomponentdata.h>
+ #include <klibrary.h>
+ #include <kstandarddirs.h>
+@@ -126,8 +127,6 @@ class KLocalizedStringPrivateStatics
+ 
+     QHash<QString, KuitSemantics*> formatters;
+ 
+-    QMutex mutex;
+-
+     KLocalizedStringPrivateStatics () :
+         theFence("|/|"),
+         startInterp("$["),
+@@ -144,9 +143,7 @@ class KLocalizedStringPrivateStatics
+ 
+         translits(),
+ 
+-        formatters(),
+-
+-        mutex(QMutex::Recursive)
++        formatters()
+     {}
+ 
+     ~KLocalizedStringPrivateStatics ()
+@@ -216,7 +213,7 @@ QString KLocalizedString::toString (cons
+ QString KLocalizedStringPrivate::toString (const KLocale *locale) const
+ {
+     KLocalizedStringPrivateStatics *s = staticsKLSP;
+-    QMutexLocker lock(&s->mutex);
++    QMutexLocker lock(kLocaleMutex());
+ 
+     // Assure the message has been supplied.
+     if (msg.isEmpty())
+@@ -474,7 +471,7 @@ QString KLocalizedStringPrivate::postFor
+                                              const QString &ctxt) const
+ {
+     KLocalizedStringPrivateStatics *s = staticsKLSP;
+-    QMutexLocker lock(&s->mutex);
++    QMutexLocker lock(kLocaleMutex());
+ 
+     QString final = text;
+ 
+@@ -499,7 +496,7 @@ QString KLocalizedStringPrivate::substit
+                                                        bool &fallback) const
+ {
+     KLocalizedStringPrivateStatics *s = staticsKLSP;
+-    QMutexLocker lock(&s->mutex);
++    QMutexLocker lock(kLocaleMutex());
+ 
+     if (s->ktrs == NULL)
+         // Scripting engine not available.
+@@ -564,7 +561,7 @@ int KLocalizedStringPrivate::resolveInte
+     // fallback is set to true if Transcript evaluation requested so.
+ 
+     KLocalizedStringPrivateStatics *s = staticsKLSP;
+-    QMutexLocker lock(&s->mutex);
++    QMutexLocker lock(kLocaleMutex());
+ 
+     result.clear();
+     fallback = false;
+@@ -716,7 +713,7 @@ int KLocalizedStringPrivate::resolveInte
+ QVariant KLocalizedStringPrivate::segmentToValue (const QString &seg) const
+ {
+     KLocalizedStringPrivateStatics *s = staticsKLSP;
+-    QMutexLocker lock(&s->mutex);
++    QMutexLocker lock(kLocaleMutex());
+ 
+     // Return invalid variant if segment is either not a proper
+     // value reference, or the reference is out of bounds.
+@@ -751,7 +748,7 @@ QString KLocalizedStringPrivate::postTra
+                                                  const QString &final) const
+ {
+     KLocalizedStringPrivateStatics *s = staticsKLSP;
+-    QMutexLocker lock(&s->mutex);
++    QMutexLocker lock(kLocaleMutex());
+ 
+     if (s->ktrs == NULL)
+         // Scripting engine not available.
+@@ -945,7 +942,7 @@ extern "C"
+ void KLocalizedStringPrivate::loadTranscript ()
+ {
+     KLocalizedStringPrivateStatics *s = staticsKLSP;
+-    QMutexLocker lock(&s->mutex);
++    QMutexLocker lock(kLocaleMutex());
+ 
+     s->loadTranscriptCalled = true;
+     s->ktrs = NULL; // null indicates that Transcript is not available
+@@ -979,7 +976,8 @@ void KLocalizedStringPrivate::notifyCata
+         return;
+     }
+     KLocalizedStringPrivateStatics *s = staticsKLSP;
+-    QMutexLocker lock(&s->mutex);
++    // Very important: do not the mutex here.
++    //QMutexLocker lock(kLocaleMutex());
+ 
+     // Find script modules for all included language/catalogs that have them,
+     // and remember their paths.
diff --git a/x11/kdelibs4/patches/patch-bd b/x11/kdelibs4/patches/patch-bd
new file mode 100644
index 00000000000..d2315f0a01d
--- /dev/null
+++ b/x11/kdelibs4/patches/patch-bd
@@ -0,0 +1,17 @@
+$NetBSD: patch-bd,v 1.1 2009/10/11 08:13:40 markd Exp $
+
+KDE svn 1032185
+
+--- /dev/null	2009-10-11 17:43:10.000000000 +1300
++++ kdecore/localization/klocale_p.h
+@@ -0,0 +1,10 @@
++#ifndef KLOCALE_P_H
++#define KLOCALE_P_H
++
++class QMutex;
++
++// Used by both KLocale and KLocalizedString, since they call each other.
++QMutex* kLocaleMutex();
++
++#endif /* KLOCALE_P_H */
++