Revert "Revert "Synced kdelibs-4.2.1 with tree""

This reverts commit 24f8154470a3fb6d0845a23720306dc1bf2ce6bf.

4 files changed, 71 insertions, 2 deletions

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index 630bf2115f7..c9f3f769771 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*kdelibs-4.2.1-r2 (11 Mar 2009)
+
+  11 Mar 2009; Maciej Mrozowski (reavertm) <reavertm@poczta.fm>
+  +files/kdelibs-4.2.1-kcatalog.patch, -kdelibs-4.2.1-r1.ebuild,
+  +kdelibs-4.2.1-r2.ebuild:
+  Synced with tree
+
   10 Mar 2009; Maciej Mrozowski (reavertm) <reavertm@poczta.fm>
   +files/kdelibs-4.2.1-qt4.5.patch:
   Added missing patch
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index a23458f07a3..2298314818c 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -7,11 +7,12 @@ AUX kdelibs-4.1.1-cmake-modules.patch 2905 RMD160 d7043d4153927ab655c4d763038902
 AUX kdelibs-4.2.0-kded.patch 2435 RMD160 66b98f6b532b2b45a4d7539b95088b473a3fe90d SHA1 89a3845b5ca33038cdbaa7a3a4bc2a12eb53bbc9 SHA256 4addbe384870d8ba2bdcb715b7b0fecc9b956201ba87e1c772e939b63e7cd538
 AUX kdelibs-4.2.0-klauncher.patch 2877 RMD160 42432fc21fd08f725b3c0551eb1b2388376dadf5 SHA1 069afec796194d2fbb3b7730077ee10b5d48c6ef SHA256 624d16db755fd1efbc0121a25f3497eb4453212ca2f376f2ad62ba78a30b1d72
 AUX kdelibs-4.2.0-knode_crash.patch 404 RMD160 ecb72bd6ef1a111b155780d85a2dde026ffdf2fc SHA1 08aecb72471af440b6e32c3a062fed6e12579004 SHA256 a2e7417cecb55b7fcd706703520233546210fe250e7846df04df911019acffc4
+AUX kdelibs-4.2.1-kcatalog.patch 1611 RMD160 6a2acc649e7f2cb08ca22ed8eecb6313cb32eb0f SHA1 7a0ad824246106d7ed3fbd310725fd4df0f31189 SHA256 3a1dbff55da070638233bcf6f91e16b70c4562a3b4a31f8e5529a5f3f960e248
 AUX kdelibs-4.2.1-qt4.5.patch 19805 RMD160 4a266bdbe3d9dcc088f7abbffc2b46714d57208a SHA1 9490015fb83982d0aeac3a1b7918fa4262957782 SHA256 2a3ffd511d25d8a4fc4a8e246e97245a78af7766a33c6baac382568da04dc791
 DIST kdelibs-4.2.1.tar.bz2 10049614 RMD160 8099366677a4d238d8cfa18862f74c4fafa49ef7 SHA1 d2214b9864b64e4a8382a9f593d082c801c58571 SHA256 25ee5be213c4f1ccaf6f19a1a2375c3b23f6e2b4602a45542758e58782a0864d
 DIST kdelibs-4.2.65.tar.lzma 8373343 RMD160 dd032a5698325147bf0ae23d0e6c0b2ca4626806 SHA1 8b480f4565f9c2f6847a5f14cdd699f302b1884f SHA256 efada135fc3a174148dd96717b95805d0fbcd10b9f093a40b98ba37b1d4a9164
-EBUILD kdelibs-4.2.1-r1.ebuild 6941 RMD160 efcf8c213563d20a397165ffb16bb41c1a5d48de SHA1 1cbcc1b634a4ce5a0b3512aa99de569143f79d39 SHA256 d95b4c38d300573ee8201b56fee1b3dc55848b71148876ed7013b843df597a15
+EBUILD kdelibs-4.2.1-r2.ebuild 7046 RMD160 42a63132c84c38787fd1d0c275dcfcf3677831be SHA1 c49fb0b49886b20e5d3475998fe2022c7f4653a1 SHA256 07d91aa9d0d7886ddc4c52028c1f4535a2f53b7eb9dae73d99022baddddd532b
 EBUILD kdelibs-4.2.65.ebuild 6533 RMD160 6dccd06babb52a7fd5077ceee8da7d022e248e1e SHA1 a33baf941b7c8efc1d33d6bc811931cf49df3a2e SHA256 b888de5eb708cde6b5f286c212a5f955f8d8a8da63c3e3b1d1ea3462caead1d9
 EBUILD kdelibs-9999.ebuild 6522 RMD160 aa9830b18e09ad79e6de3d1763f730699fe34fce SHA1 3b3ad9e7d416db959607b502cd3c9129b67ae352 SHA256 cabd75249a7bbf07311f62d43e6920749b8b8ff572ed5b246127212810e666cf
-MISC ChangeLog 11533 RMD160 5f102eca079e8fc419268cbe7d12cce6cc689e74 SHA1 01fec3b5d06f680154f75538a57c44417e4dba10 SHA256 175653f59c17230e8e4ca674b262eb2fb85bc58536307aace6c26d1d90aa9f20
+MISC ChangeLog 11743 RMD160 c80d9f19d612f9c52ad506043539508f333a8a79 SHA1 c81c7d4652dc1ac61e540d8ad7c2ce227e6e9551 SHA256 aeb40d70042fc9bd27bbc7b052056ca308618b122d1023c936e73ce0e07ce5e7
 MISC metadata.xml 402 RMD160 8991971dbbb15472b4501c538a85517353ba2c31 SHA1 b5428ffe34e12cb89d8ff66ff743a7d20b52ae33 SHA256 347f16542b0bbba7ed2183538b350eeb4ac224cb122108cef1ce10a2d4400473
diff --git a/kde-base/kdelibs/files/kdelibs-4.2.1-kcatalog.patch b/kde-base/kdelibs/files/kdelibs-4.2.1-kcatalog.patch
new file mode 100644
index 00000000000..40d4884645a
--- /dev/null
+++ b/kde-base/kdelibs/files/kdelibs-4.2.1-kcatalog.patch
@@ -0,0 +1,59 @@
+Index: kcatalog.cpp
+===================================================================
+--- kcatalog.cpp	(revision 938013)
++++ kcatalog.cpp	(working copy)
+@@ -30,6 +30,24 @@
+ #include <locale.h>
+ #include "gettext.h"
+ 
++
++static bool s_localeSet = false;
++
++// Initialize the locale very early during application startup
++// This is necessary for e.g. toLocal8Bit() to work, even before
++// a Q[Core]Application exists (David)
++int kInitializeLocale()
++{
++    setlocale(LC_ALL, "");
++#if QT_VERSION >= 0x040500
++    extern Q_CORE_EXPORT bool qt_locale_initialized; // in Qt since 4.5.0
++    qt_locale_initialized = true; // as recommended by Thiago
++#endif
++    s_localeSet = true;
++    return 1;
++}
++Q_CONSTRUCTOR_FUNCTION(kInitializeLocale)
++
+ // not defined on win32 :(
+ #ifdef _WIN32
+ # ifndef LC_MESSAGES
+@@ -50,7 +68,6 @@
+ 
+   QByteArray systemLanguage;
+ 
+-  static int localeSet;
+   static QByteArray currentLanguage;
+ 
+   void setupGettextEnv ();
+@@ -62,17 +79,15 @@
+   return debug << c.d->language << " " << c.d->name << " " << c.d->localeDir;
+ }
+ 
+-int KCatalogPrivate::localeSet = 0;
+ QByteArray KCatalogPrivate::currentLanguage;
+ 
+ KCatalog::KCatalog(const QString & name, const QString & language )
+   : d( new KCatalogPrivate )
+ {
+-  // Set locales only once.
+-  if (! KCatalogPrivate::localeSet) {
+-    setlocale(LC_ALL, "");
+-    KCatalogPrivate::localeSet = 1;
+-  }
++    // Set locales if the static initializer didn't work
++    if (!s_localeSet) {
++        kInitializeLocale();
++    }
+ 
+   // Find locale directory for this catalog.
+   QString localeDir = catalogLocaleDir( name, language );
diff --git a/kde-base/kdelibs/kdelibs-4.2.1-r1.ebuild b/kde-base/kdelibs/kdelibs-4.2.1-r2.ebuild
index 39412e25249..bd9da258e0f 100644
--- a/kde-base/kdelibs/kdelibs-4.2.1-r1.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.2.1-r2.ebuild
@@ -108,11 +108,13 @@ RDEPEND="${COMMONDEPEND}
 # upstream patches / dist patches
 # {FILESDIR}/${P}-qt4.5.patch is upstream revision 934640
 # and fixes upstream bug 186038 and Gentoo bug 261367
+# ${FILESDIR}/${P}-kcatalog.patch fixes remaining issues on both bugs
 PATCHES=(
 	"${FILESDIR}/dist/09_disable_debug_messages_if_not_explicitly_enabled.patch"
 	"${FILESDIR}/dist/20_use_dejavu_as_default_font.patch"
 	"${FILESDIR}/dist/23_solid_no_double_build.patch"
 	"${FILESDIR}/${P}-qt4.5.patch"
+	"${FILESDIR}/${P}-kcatalog.patch"
 )
 
 src_prepare() {