rev 13851 - branches/qt4-x11/debian/patches
Fathi Boudra
fabo at alioth.debian.org
Fri Feb 20 09:16:30 UTC 2009
Author: fabo
Date: 2009-02-20 09:16:30 +0000 (Fri, 20 Feb 2009)
New Revision: 13851
Added:
branches/qt4-x11/debian/patches/0273-odbc-64bit-compile.diff
branches/qt4-x11/debian/patches/21_fix_ppc_build.diff
branches/qt4-x11/debian/patches/22_fix_qiconvcodec.diff
Modified:
branches/qt4-x11/debian/patches/09_qmake_lflags_as-needed.diff
branches/qt4-x11/debian/patches/series
Log:
Add patches 21 and 22, stolen upstream.
Add patch 0273 from qt-copy.
Enable patch 07.
Added: branches/qt4-x11/debian/patches/0273-odbc-64bit-compile.diff
===================================================================
--- branches/qt4-x11/debian/patches/0273-odbc-64bit-compile.diff (rev 0)
+++ branches/qt4-x11/debian/patches/0273-odbc-64bit-compile.diff 2009-02-20 09:16:30 UTC (rev 13851)
@@ -0,0 +1,23 @@
+qt-bugs@ issue:
+QtSw task ID:
+applied: no
+author: Alex Merry
+
+--- a/src/sql/drivers/odbc/qsql_odbc.cpp
++++ b/src/sql/drivers/odbc/qsql_odbc.cpp
+@@ -64,13 +64,13 @@ QT_BEGIN_NAMESPACE
+ #endif
+
+ // newer platform SDKs use SQLLEN instead of SQLINTEGER
+-#if defined(SQLLEN) || defined(Q_OS_WIN64)
++#if defined(SQLLEN) || defined(Q_OS_WIN64) || (defined(Q_OS_UNIX) && !defined(Q_OS_MAC))
+ # define QSQLLEN SQLLEN
+ #else
+ # define QSQLLEN SQLINTEGER
+ #endif
+
+-#if defined(SQLULEN) || defined(Q_OS_WIN64)
++#if defined(SQLULEN) || defined(Q_OS_WIN64) || (defined(Q_OS_UNIX) && !defined(Q_OS_MAC))
+ # define QSQLULEN SQLULEN
+ #else
+ # define QSQLULEN SQLUINTEGER
Modified: branches/qt4-x11/debian/patches/09_qmake_lflags_as-needed.diff
===================================================================
--- branches/qt4-x11/debian/patches/09_qmake_lflags_as-needed.diff 2009-02-19 22:29:31 UTC (rev 13850)
+++ branches/qt4-x11/debian/patches/09_qmake_lflags_as-needed.diff 2009-02-20 09:16:30 UTC (rev 13851)
@@ -5,7 +5,7 @@
--- a/configure
+++ b/configure
-@@ -452,6 +452,8 @@ mkdir -p "$outpath/config.tests"
+@@ -495,6 +495,8 @@ mkdir -p "$outpath/config.tests"
rm -f "$outpath/config.tests/.qmake.cache"
cp "$QMAKE_VARS_FILE" "$outpath/config.tests/.qmake.cache"
Added: branches/qt4-x11/debian/patches/21_fix_ppc_build.diff
===================================================================
--- branches/qt4-x11/debian/patches/21_fix_ppc_build.diff (rev 0)
+++ branches/qt4-x11/debian/patches/21_fix_ppc_build.diff 2009-02-20 09:16:30 UTC (rev 13851)
@@ -0,0 +1,11 @@
+--- a/src/corelib/arch/qatomic_powerpc.h
++++ b/src/corelib/arch/qatomic_powerpc.h
+@@ -188,7 +188,7 @@ inline bool QBasicAtomicInt::testAndSetR
+ "lwarx %[result]," _Q_VALUE "\n"
+ "xor. %[result], %[result], %[expectedValue]\n"
+ "bne $+12\n"
+- "stwcx. %[newValue],0,%[_q_value]\n"
++ "stwcx. %[newValue]," _Q_VALUE "\n"
+ "bne- $-16\n"
+ : [result] "=&r" (result),
+ _Q_VALUE_MEMORY_OPERAND
Added: branches/qt4-x11/debian/patches/22_fix_qiconvcodec.diff
===================================================================
--- branches/qt4-x11/debian/patches/22_fix_qiconvcodec.diff (rev 0)
+++ branches/qt4-x11/debian/patches/22_fix_qiconvcodec.diff 2009-02-20 09:16:30 UTC (rev 13851)
@@ -0,0 +1,68 @@
+--- a/src/corelib/codecs/qiconvcodec.cpp
++++ b/src/corelib/codecs/qiconvcodec.cpp
+@@ -83,6 +83,8 @@ static Ptr_iconv_close ptr_iconv_close =
+
+ QT_BEGIN_NAMESPACE
+
++extern bool qt_locale_initialized;
++
+ QIconvCodec::QIconvCodec()
+ : utf16Codec(0)
+ {
+@@ -182,8 +184,9 @@ QString QIconvCodec::convertToUnicode(co
+ }
+ } else {
+ QThreadStorage<QIconvCodec::IconvState *> *ts = toUnicodeState();
+- if (!ts) {
++ if (!qt_locale_initialized || !ts) {
+ // we're running after the Q_GLOBAL_STATIC has been deleted
++ // or before the QCoreApplication initialization
+ // bad programmer, no cookie for you
+ return QString::fromLatin1(chars, len);
+ }
+@@ -305,9 +308,14 @@ QByteArray QIconvCodec::convertFromUnico
+ #endif
+
+ QThreadStorage<QIconvCodec::IconvState *> *ts = fromUnicodeState();
+- if (!ts) {
++ if (!qt_locale_initialized || !ts) {
+ // we're running after the Q_GLOBAL_STATIC has been deleted
++ // or before the QCoreApplication initialization
+ // bad programmer, no cookie for you
++ if (!len)
++ // this is a special case - zero-sized string should be
++ // translated to empty but not-null QByteArray.
++ return QByteArray("");
+ return QString::fromRawData(uc, len).toLatin1();
+ }
+ IconvState *&state = ts->localData();
+@@ -384,8 +392,8 @@ QByteArray QIconvCodec::convertFromUnico
+ // fall through
+ case EINVAL:
+ {
+- ++inBytes;
+- --inBytesLeft;
++ inBytes += sizeof(QChar);
++ inBytesLeft -= sizeof(QChar);
+ break;
+ }
+ case E2BIG:
+--- a/src/corelib/kernel/qcoreapplication.cpp
++++ b/src/corelib/kernel/qcoreapplication.cpp
+@@ -163,6 +163,8 @@ void Q_CORE_EXPORT qt_call_post_routines
+ bool QCoreApplicationPrivate::is_app_running = false;
+ // app closing down if true
+ bool QCoreApplicationPrivate::is_app_closing = false;
++// initialized in qcoreapplication and in qtextstream autotest when setlocale is called.
++Q_AUTOTEST_EXPORT bool qt_locale_initialized = false;
+
+
+ Q_CORE_EXPORT uint qGlobalPostedEventsCount()
+@@ -440,6 +442,7 @@ void QCoreApplication::init()
+
+ #ifdef Q_OS_UNIX
+ setlocale(LC_ALL, ""); // use correct char set mapping
++ qt_locale_initialized = true;
+ #endif
+
+ #ifdef Q_WS_WIN
Modified: branches/qt4-x11/debian/patches/series
===================================================================
--- branches/qt4-x11/debian/patches/series 2009-02-19 22:29:31 UTC (rev 13850)
+++ branches/qt4-x11/debian/patches/series 2009-02-20 09:16:30 UTC (rev 13851)
@@ -7,6 +7,7 @@
0234-fix-mysql-threaded.diff
0245-fix-randr-changes-detecting.diff
0255-qtreeview-selection-columns-hidden.diff
+0273-odbc-64bit-compile.diff
# debian patches
01_qmake_for_debian.diff
@@ -14,7 +15,7 @@
03_launch_moc-qt4.diff
04_launch_uic-qt4.diff
05_append_qt4_target.diff
-# Fixed upstream 07_trust_dpkg-arch_over_uname-m.diff
+07_trust_dpkg-arch_over_uname-m.diff
09_qmake_lflags_as-needed.diff
10_config_tests_fixes.diff
14_add_libraries_to_gui_build_where_actually_needed.diff
@@ -24,6 +25,8 @@
18_enable_qt3support_qtwebkit_debug_info.diff
19_install_qdoc3.diff
20_fix_ftbfs_callgrindChildExitCode.diff
+21_fix_ppc_build.diff
+22_fix_qiconvcodec.diff
30_webkit_unaligned_access.diff
40_alpha_ice.diff
41_disable_opengl_visibility.diff
More information about the pkg-kde-commits
mailing list