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.

16 files changed, 40 insertions, 351 deletions

diff --git a/x11/kde4-l10n-de/PLIST b/x11/kde4-l10n-de/PLIST
index e97c8e7fe78..91bb7618216 100644
--- a/x11/kde4-l10n-de/PLIST
+++ b/x11/kde4-l10n-de/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2009/10/11 08:13:40 markd Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/11/04 11:05:53 markd Exp $
 man/de/man1/adddebug.1
 man/de/man1/ark.1
 man/de/man1/cheatmake.1
@@ -2152,6 +2152,7 @@ share/locale/de/LC_MESSAGES/libphonon.mo
 share/locale/de/LC_MESSAGES/libplasma.mo
 share/locale/de/LC_MESSAGES/libplasmaclock.mo
 share/locale/de/LC_MESSAGES/libplasmaweather.mo
+share/locale/de/LC_MESSAGES/librtm.mo
 share/locale/de/LC_MESSAGES/libtaskmanager.mo
 share/locale/de/LC_MESSAGES/lokalize.mo
 share/locale/de/LC_MESSAGES/lskat.mo
diff --git a/x11/kde4-l10n-de/distinfo b/x11/kde4-l10n-de/distinfo
index 4db9be17073..ccef507832c 100644
--- a/x11/kde4-l10n-de/distinfo
+++ b/x11/kde4-l10n-de/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2009/10/11 08:13:40 markd Exp $
+$NetBSD: distinfo,v 1.3 2009/11/04 11:05:53 markd Exp $
 
-SHA1 (kde-l10n-de-4.3.2.tar.bz2) = aa393d26e92670efb4167644720ba2aae6ca41cc
-RMD160 (kde-l10n-de-4.3.2.tar.bz2) = 932e33b6dc91899f648a00581283d77fa6fcc2a1
-Size (kde-l10n-de-4.3.2.tar.bz2) = 20260134 bytes
+SHA1 (kde-l10n-de-4.3.3.tar.bz2) = 70cc4aa8857f67ca7dd675c4c39f0ceac98f8122
+RMD160 (kde-l10n-de-4.3.3.tar.bz2) = 18389eb81e4da8c1a21f0579801606ae1d1d5962
+Size (kde-l10n-de-4.3.3.tar.bz2) = 20265869 bytes
diff --git a/x11/kde4-l10n-en_GB/distinfo b/x11/kde4-l10n-en_GB/distinfo
index 01e273cad09..df429979134 100644
--- a/x11/kde4-l10n-en_GB/distinfo
+++ b/x11/kde4-l10n-en_GB/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2009/10/11 08:13:40 markd Exp $
+$NetBSD: distinfo,v 1.3 2009/11/04 11:05:53 markd Exp $
 
-SHA1 (kde-l10n-en_GB-4.3.2.tar.bz2) = 45fc26b7a30ac618571acf72501bd1a99f212cbf
-RMD160 (kde-l10n-en_GB-4.3.2.tar.bz2) = c9b18b0f63dfa46c926b9d93a942a744b42b04f7
-Size (kde-l10n-en_GB-4.3.2.tar.bz2) = 3876532 bytes
+SHA1 (kde-l10n-en_GB-4.3.3.tar.bz2) = 43031f21070d563ba02579ce68979fe839e50232
+RMD160 (kde-l10n-en_GB-4.3.3.tar.bz2) = 6efcc9e3c1def8e522ff7adfdac0698972d5d77a
+Size (kde-l10n-en_GB-4.3.3.tar.bz2) = 3867266 bytes
diff --git a/x11/kde4-l10n-nl/PLIST b/x11/kde4-l10n-nl/PLIST
index a64a0f0cecc..9607d807f21 100644
--- a/x11/kde4-l10n-nl/PLIST
+++ b/x11/kde4-l10n-nl/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2009/10/11 08:13:40 markd Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/11/04 11:05:53 markd Exp $
 man/nl/man1/fixincludes.1
 man/nl/man1/kalzium.1
 man/nl/man1/kappfinder.1
@@ -1373,6 +1373,7 @@ share/locale/nl/LC_MESSAGES/libphonon.mo
 share/locale/nl/LC_MESSAGES/libplasma.mo
 share/locale/nl/LC_MESSAGES/libplasmaclock.mo
 share/locale/nl/LC_MESSAGES/libplasmaweather.mo
+share/locale/nl/LC_MESSAGES/librtm.mo
 share/locale/nl/LC_MESSAGES/libtaskmanager.mo
 share/locale/nl/LC_MESSAGES/lokalize.mo
 share/locale/nl/LC_MESSAGES/lskat.mo
diff --git a/x11/kde4-l10n-nl/distinfo b/x11/kde4-l10n-nl/distinfo
index 66444ca7be9..b59e6609f20 100644
--- a/x11/kde4-l10n-nl/distinfo
+++ b/x11/kde4-l10n-nl/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2009/10/11 08:13:40 markd Exp $
+$NetBSD: distinfo,v 1.3 2009/11/04 11:05:53 markd Exp $
 
-SHA1 (kde-l10n-nl-4.3.2.tar.bz2) = 4d0eb15547ecaafc717337f9ac91472fb277bb27
-RMD160 (kde-l10n-nl-4.3.2.tar.bz2) = fca6b9a97dc2348bc95110c9d04dbbb8a7bdc2e9
-Size (kde-l10n-nl-4.3.2.tar.bz2) = 12994611 bytes
+SHA1 (kde-l10n-nl-4.3.3.tar.bz2) = 9b7524f6e985b04d3197716cbd81e916ed448fb3
+RMD160 (kde-l10n-nl-4.3.3.tar.bz2) = 27f1d490da9d1d90db54c88b9ddbbad335bb8e6c
+Size (kde-l10n-nl-4.3.3.tar.bz2) = 12994787 bytes
diff --git a/x11/kdebase-runtime4/distinfo b/x11/kdebase-runtime4/distinfo
index 4597fabe15d..cc4801443e3 100644
--- a/x11/kdebase-runtime4/distinfo
+++ b/x11/kdebase-runtime4/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 (kdebase-runtime-4.3.2.tar.bz2) = 33bb1da691d1ab75d1fbe5bcac38f105cddab709
-RMD160 (kdebase-runtime-4.3.2.tar.bz2) = e3694468e6056ffea03a922a3b7fb01db3c6fc4f
-Size (kdebase-runtime-4.3.2.tar.bz2) = 7331247 bytes
+SHA1 (kdebase-runtime-4.3.3.tar.bz2) = 43f0b96cbb3c61523fbd283d11c2a5eedde0c9a2
+RMD160 (kdebase-runtime-4.3.3.tar.bz2) = 03dadfbdf036a5a6118b36a943bd1e517cef8534
+Size (kdebase-runtime-4.3.3.tar.bz2) = 7329976 bytes
 SHA1 (patch-ab) = f6af1c3e2502a91add9ceaa5375e76aee1e8c20c
 SHA1 (patch-ac) = 6bb21775f48d7a7155712524162a2de736391f40
 SHA1 (patch-ad) = 285fbd72b3be665776acc61a55f3d65f35e338c4
diff --git a/x11/kdebase-workspace4/distinfo b/x11/kdebase-workspace4/distinfo
index 088ad02f8cf..49838a4eb55 100644
--- a/x11/kdebase-workspace4/distinfo
+++ b/x11/kdebase-workspace4/distinfo
@@ -1,4 +1,4 @@
-$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 (Daemon.README) = eb1e6af52adc02ded77af17e8953134b7e60d23b
 RMD160 (Daemon.README) = 39edd92ed4314397080f32a8caff0ac3f716ecf4
@@ -9,9 +9,9 @@ Size (Daemon.png) = 15725 bytes
 SHA1 (NetBSD-flag-1.0.png) = a9cf264a52ae0a602eec956d91222e299c7dee5c
 RMD160 (NetBSD-flag-1.0.png) = 2eac20df70396169819059a704e6a85ae10234b0
 Size (NetBSD-flag-1.0.png) = 4532 bytes
-SHA1 (kdebase-workspace-4.3.2.tar.bz2) = 3a07f3e64abd324e0b8a3aeab1ae2c13e75ea026
-RMD160 (kdebase-workspace-4.3.2.tar.bz2) = e3dc7959e8a51091cf5e32c367549d7666453efb
-Size (kdebase-workspace-4.3.2.tar.bz2) = 62494257 bytes
+SHA1 (kdebase-workspace-4.3.3.tar.bz2) = 2839e913cecef8ead0685bd50e9515ccd8bc0a9d
+RMD160 (kdebase-workspace-4.3.3.tar.bz2) = 48ab90a519c7811e9fe4aa4e77f06134d2dc4afa
+Size (kdebase-workspace-4.3.3.tar.bz2) = 62496238 bytes
 SHA1 (patch-ab) = a1dc303cdb27bb4cb3067d347baedabefbca8353
 SHA1 (patch-ac) = 5420c39a055e6208097cf48db5513f7c9db09bef
 SHA1 (patch-ad) = ac0907cc59c5f0976cdbe152bb7fb0a4592bbe84
diff --git a/x11/kdebase4/distinfo b/x11/kdebase4/distinfo
index 862e1aac25e..acbb2658243 100644
--- a/x11/kdebase4/distinfo
+++ b/x11/kdebase4/distinfo
@@ -1,6 +1,5 @@
-$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 (kdebase-4.3.2.tar.bz2) = c9c65dc596c8c48974fbe4099f340371de147fa8
-RMD160 (kdebase-4.3.2.tar.bz2) = 9d34189746ee7b99840388d1a45d6ffaef795f19
-Size (kdebase-4.3.2.tar.bz2) = 4273532 bytes
-SHA1 (patch-aa) = a25428863150185b0a389ed260e186a6b30cb6fb
+SHA1 (kdebase-4.3.3.tar.bz2) = 7459ea75312961b4802626edd22dc291370be329
+RMD160 (kdebase-4.3.3.tar.bz2) = 7fdc0f5cb3574b6707ae8f005eb887126ca2339e
+Size (kdebase-4.3.3.tar.bz2) = 4275500 bytes
diff --git a/x11/kdebase4/patches/patch-aa b/x11/kdebase4/patches/patch-aa
deleted file mode 100644
index fb0b6f5265a..00000000000
--- a/x11/kdebase4/patches/patch-aa
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2009/10/11 08:13:40 markd Exp $
-
-KDE svn 1032180
-
---- apps/dolphin/src/panels/terminal/terminalpanel.cpp.orig	2009-08-27 20:17:51.000000000 +1200
-+++ apps/dolphin/src/panels/terminal/terminalpanel.cpp
-@@ -23,7 +23,6 @@
- #include <kde_terminal_interface_v2.h>
- #include <kparts/part.h>
- #include <kshell.h>
--#include <kio/netaccess.h>
- 
- #include <QBoxLayout>
- #include <QShowEvent>
-@@ -58,13 +57,12 @@ void TerminalPanel::setUrl(const KUrl& u
-     }
- 
-     Panel::setUrl(url);
--    KUrl mostLocalUrl = KIO::NetAccess::mostLocalUrl(url, 0);
-     const bool sendInput = (m_terminal != 0)
-                            && (m_terminal->foregroundProcessId() == -1)
-                            && isVisible()
--                           && mostLocalUrl.isLocalFile();
-+                           && url.isLocalFile();
-     if (sendInput) {
--        m_terminal->sendInput("cd " + KShell::quoteArg(mostLocalUrl.toLocalFile()) + '\n');
-+        m_terminal->sendInput("cd " + KShell::quoteArg(url.toLocalFile()) + '\n');
-     }
- 
- }
diff --git a/x11/kdebindings4-python/distinfo b/x11/kdebindings4-python/distinfo
index 91728601e6e..b062556e3ad 100644
--- a/x11/kdebindings4-python/distinfo
+++ b/x11/kdebindings4-python/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2009/10/11 08:13:40 markd Exp $
+$NetBSD: distinfo,v 1.3 2009/11/04 11:05:53 markd Exp $
 
-SHA1 (kdebindings-4.3.2.tar.bz2) = 72416301dce5362535bd3c09ffd6d2f884409fc4
-RMD160 (kdebindings-4.3.2.tar.bz2) = 038aaddf18e2dee9f48ea48f767f77bec1799ec5
-Size (kdebindings-4.3.2.tar.bz2) = 4878928 bytes
+SHA1 (kdebindings-4.3.3.tar.bz2) = 34ddcfd5d338962b8623b9dd9c2b850a621e4040
+RMD160 (kdebindings-4.3.3.tar.bz2) = 587fd37cc2369a39fb1cf97e164afc40294f97b2
+Size (kdebindings-4.3.3.tar.bz2) = 4881799 bytes
 SHA1 (patch-aa) = f01b1d350a8e79e639f46c797baf035684275158
 SHA1 (patch-ab) = cae51d216ad914009b4e9c80a17a172ec5a5eaec
diff --git a/x11/kdelibs-experimental4/distinfo b/x11/kdelibs-experimental4/distinfo
index f9f7c4b4ba9..8bdbccda151 100644
--- a/x11/kdelibs-experimental4/distinfo
+++ b/x11/kdelibs-experimental4/distinfo
@@ -1,5 +1,5 @@
-$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-experimental-4.3.2.tar.bz2) = 79e34cff9fdcca8fc0e06a0bf524b08abf815705
-RMD160 (kdelibs-experimental-4.3.2.tar.bz2) = 49c9005ffd4124f940c0c3088857e0add44afcfb
-Size (kdelibs-experimental-4.3.2.tar.bz2) = 26904 bytes
+SHA1 (kdelibs-experimental-4.3.3.tar.bz2) = 68a98febc551a7d98a78798864ff85f556fda12b
+RMD160 (kdelibs-experimental-4.3.3.tar.bz2) = 69e868445f706bcf1a90714feafac5a0728f2595
+Size (kdelibs-experimental-4.3.3.tar.bz2) = 26910 bytes
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 */
-+