Update to KDE 4.3.3

KDE 4.3.3 has a number of improvements that will make your life just a
little bit better. Some of KWin's effects have been smoothed and freed
of visual glitches, JuK should now be more stable, KDE PIM has seen its
share of improvements while in the back-rooms of KDE, the developers are
working hard on porting all applications to the new Akonadi storage and
cache.

5 files changed, 4 insertions, 286 deletions

diff --git a/x11/kdelibs4/distinfo b/x11/kdelibs4/distinfo
index 51b934b530a..3c679720ff9 100644
--- a/x11/kdelibs4/distinfo
+++ b/x11/kdelibs4/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.2 2009/10/11 08:13:40 markd Exp $
+$NetBSD: distinfo,v 1.3 2009/11/04 11:05:52 markd Exp $
 
-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 (kdelibs-4.3.3.tar.bz2) = 89b55982e007c44835a9da0f540dd57fa096df45
+RMD160 (kdelibs-4.3.3.tar.bz2) = 3d6a2c971cef12fb2cb9ba64a10200b2cf098043
+Size (kdelibs-4.3.3.tar.bz2) = 10516364 bytes
 SHA1 (patch-aa) = 7146107f78bbc618cf80479195581f29fc6b5977
 SHA1 (patch-ab) = aec1140bef01199f067b079c30d95fea1814839d
 SHA1 (patch-ac) = 223a97a63907477314b69040e1bca3e2ff8cc7b7
@@ -11,7 +11,3 @@ SHA1 (patch-ag) = af1e58512984726a4efaf315bb958a9a529638b8
 SHA1 (patch-ah) = b583dbe1b712984bbe002cc9143352729fba94ed
 SHA1 (patch-ai) = 75b18b8ac0da0eda398d717b9ee3a2af68bcebe4
 SHA1 (patch-aj) = 8520c322d4579e9485253c8e8b130669b0f8b618
-SHA1 (patch-ba) = 9e980afeb09d5b4561638efb339f981b6273d18e
-SHA1 (patch-bb) = df8e42a167d1fa46dfe2cef5b92e6c9aae5b565d
-SHA1 (patch-bc) = 97ba6045f4ff28423d2a565487305a1f6420ce57
-SHA1 (patch-bd) = dd08b9f7c4c158db5b9e5cdd7777bff6979cb26c
diff --git a/x11/kdelibs4/patches/patch-ba b/x11/kdelibs4/patches/patch-ba
deleted file mode 100644
index cd9a462d77a..00000000000
--- a/x11/kdelibs4/patches/patch-ba
+++ /dev/null
@@ -1,16 +0,0 @@
-$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
deleted file mode 100644
index ddad55f73bc..00000000000
--- a/x11/kdelibs4/patches/patch-bb
+++ /dev/null
@@ -1,138 +0,0 @@
-$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
deleted file mode 100644
index b12abf376da..00000000000
--- a/x11/kdelibs4/patches/patch-bc
+++ /dev/null
@@ -1,107 +0,0 @@
-$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
deleted file mode 100644
index d2315f0a01d..00000000000
--- a/x11/kdelibs4/patches/patch-bd
+++ /dev/null
@@ -1,17 +0,0 @@
-$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 */
-+