rev 14207 - in trunk/packages/kdelibs/debian: . patches

[George Kiagiadakis]

Author: gkiagia-guest
Date: 2009-04-04 00:33:52 +0000 (Sat, 04 Apr 2009)
New Revision: 14207

Added:
   trunk/packages/kdelibs/debian/patches/24_runtime_qt45_locale_initialization.diff
Modified:
   trunk/packages/kdelibs/debian/changelog
   trunk/packages/kdelibs/debian/patches/series
Log:
Add patch from suse to detect Qt 4.5 at runtime and initialize locale
by dynamically loading the qt_locale_initialized symbol exported by Qt 4.5.
This fixes the kcmdlineargs locale bug when kdelibs is built with Qt 4.4 and used with 4.5.


Modified: trunk/packages/kdelibs/debian/changelog
===================================================================
--- trunk/packages/kdelibs/debian/changelog	2009-04-03 23:29:56 UTC (rev 14206)
+++ trunk/packages/kdelibs/debian/changelog	2009-04-04 00:33:52 UTC (rev 14207)
@@ -1,4 +1,4 @@
-kde4libs (4:4.2.2-0r2) UNRELEASED; urgency=low
+kde4libs (4:4.2.2-0r3) UNRELEASED; urgency=low
 
   * New upstream release.
 
@@ -17,10 +17,15 @@
   
   +++ Changes by Aurelien Jarno:
   
-  * Update 15_kfreebsd.diff (Closes #520123).
+  * Update 15_kfreebsd.diff (Closes: #520123).
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 31 Mar 2009 05:44:42 +0200
+  +++ Changes by George Kiagiadakis:
 
+  * Add patch 24_runtime_qt45_locale_initialization.diff to fix locale
+    initialization when kde is run with Qt 4.5 but built with Qt 4.4.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 04 Apr 2009 02:48:46 +0300
+
 kde4libs (4:4.2.1-2) unstable; urgency=low
 
   * Upload to unstable.

Added: trunk/packages/kdelibs/debian/patches/24_runtime_qt45_locale_initialization.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/24_runtime_qt45_locale_initialization.diff	                        (rev 0)
+++ trunk/packages/kdelibs/debian/patches/24_runtime_qt45_locale_initialization.diff	2009-04-04 00:33:52 UTC (rev 14207)
@@ -0,0 +1,40 @@
+Index: kdelibs/kdecore/CMakeLists.txt
+===================================================================
+--- kdelibs.orig/kdecore/CMakeLists.txt	2009-04-04 01:57:18.000000000 +0300
++++ kdelibs/kdecore/CMakeLists.txt	2009-04-04 01:57:49.000000000 +0300
+@@ -275,7 +275,7 @@
+ 
+ kde4_add_library(kdecore SHARED ${kdecore_LIB_SRCS})
+ 
+-target_link_libraries(kdecore ${QT_QTCORE_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTDBUS_LIBRARY} ${QT_QTXML_LIBRARY} ${ZLIB_LIBRARY} ${kdecore_OPTIONAL_LIBS})
++target_link_libraries(kdecore ${QT_QTCORE_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTDBUS_LIBRARY} ${QT_QTXML_LIBRARY} ${ZLIB_LIBRARY} ${kdecore_OPTIONAL_LIBS} dl)
+ 
+ if(WIN32)
+   set(kdecore_LINK_INTERFACE_LIBRARIES  ${QT_QTDBUS_LIBRARY} ${QT_QTCORE_LIBRARY} ${KDEWIN32_LIBRARIES})
+Index: kdelibs/kdecore/localization/kcatalog.cpp
+===================================================================
+--- kdelibs.orig/kdecore/localization/kcatalog.cpp	2009-04-04 01:57:30.000000000 +0300
++++ kdelibs/kdecore/localization/kcatalog.cpp	2009-04-04 01:57:49.000000000 +0300
+@@ -26,6 +26,8 @@
+ 
+ #include <kdebug.h>
+ 
++#include <dlfcn.h>
++#include <string.h>
+ #include <stdlib.h>
+ #include <locale.h>
+ #include "gettext.h"
+@@ -39,10 +41,9 @@
+ 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
++    if (strncmp(qVersion(), "4.5", 3) == 0) { // it's Qt 4.5
++        *(bool*)dlsym(RTLD_DEFAULT, "qt_locale_initialized") = true;
++    }
+     s_localeSet = true;
+     return 1;
+ }

Modified: trunk/packages/kdelibs/debian/patches/series
===================================================================
--- trunk/packages/kdelibs/debian/patches/series	2009-04-03 23:29:56 UTC (rev 14206)
+++ trunk/packages/kdelibs/debian/patches/series	2009-04-04 00:33:52 UTC (rev 14207)
@@ -10,3 +10,4 @@
 20_use_dejavu_as_default_font.diff
 22_hack_in_etc_kde4_in_kstandarddirs.diff
 23_solid_no_double_build.diff
+24_runtime_qt45_locale_initialization.diff