* [gentoo-commits] gentoo-x86 commit in x11-libs/qt/files: qt-3.3.8-fix-compiler-detection.patch qt-3.3.8b-cjk-fix.patch
@ 2008-10-28 23:50 99% Ben de Groot (yngwin)
0 siblings, 0 replies; 1+ results
From: Ben de Groot (yngwin) @ 2008-10-28 23:50 UTC (permalink / raw
To: gentoo-commits
yngwin 08/10/28 23:50:10
Added: qt-3.3.8-fix-compiler-detection.patch
qt-3.3.8b-cjk-fix.patch
Log:
Add patches/fixes for qt3 bugs 172219, 229567 and 244732
(Portage version: 2.2_rc12_p11688/cvs/Linux 2.6.26-hh3 i686)
Revision Changes Path
1.1 x11-libs/qt/files/qt-3.3.8-fix-compiler-detection.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt/files/qt-3.3.8-fix-compiler-detection.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt/files/qt-3.3.8-fix-compiler-detection.patch?rev=1.1&content-type=text/plain
Index: qt-3.3.8-fix-compiler-detection.patch
===================================================================
--- qt-x11-free-3.3.8-orig/configure 2008-10-28 15:43:35.000000000 +0100
+++ qt-x11-free-3.3.8/configure 2008-10-28 15:45:48.000000000 +0100
@@ -3079,15 +3079,15 @@
g++*)
# GNU C++
QMAKE_CONF_COMPILER=`grep "QMAKE_CXX[^_A-Z0-9a-z]" $QMAKESPEC/qmake.conf | sed "s,.* *= *\(.*\)$,\1,"`
- COMPILER_VERSION=`${QMAKE_CONF_COMPILER} --version 2>/dev/null`
+ COMPILER_VERSION=`${QMAKE_CONF_COMPILER} -dumpversion 2>/dev/null`
case "$COMPILER_VERSION" in
- *2.95.*)
+ 2.95.*)
COMPILER_VERSION="2.95.*"
;;
- *3.*)
+ 3.*)
COMPILER_VERSION="3.*"
;;
- *4.*)
+ 4.*)
COMPILER_VERSION="4"
;;
*)
1.1 x11-libs/qt/files/qt-3.3.8b-cjk-fix.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt/files/qt-3.3.8b-cjk-fix.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt/files/qt-3.3.8b-cjk-fix.patch?rev=1.1&content-type=text/plain
Index: qt-3.3.8b-cjk-fix.patch
===================================================================
--- src/kernel/qfontdatabase.cpp 2008-07-10 06:17:31.000000000 +0800
+++ src/kernel/qfontdatabase.cpp 2008-07-10 06:27:53.000000000 +0800
@@ -960,19 +960,17 @@
#ifdef Q_WS_X11
if (script == QFont::Han) {
// modify script according to locale
- static QFont::Script defaultHan = QFont::UnknownScript;
- if (defaultHan == QFont::UnknownScript) {
- QCString locale = setlocale(LC_ALL, NULL);
- if (locale.contains("ko"))
- defaultHan = QFont::Han_Korean;
- else if (locale.contains("zh_TW") || locale.contains("zh_HK"))
- defaultHan = QFont::Han_TraditionalChinese;
- else if (locale.contains("zh"))
- defaultHan = QFont::Han_SimplifiedChinese;
- else
- defaultHan = QFont::Han_Japanese;
+ static QFont::Script defaultHan = QFont::Han;
+ QCString locale = setlocale(LC_ALL, NULL);
+ if (locale.contains("ko"))
+ defaultHan = QFont::Han_Korean;
+ else if (locale.contains("zh_TW") || locale.contains("zh_HK"))
+ defaultHan = QFont::Han_TraditionalChinese;
+ else if (locale.contains("zh"))
+ defaultHan = QFont::Han_SimplifiedChinese;
+ else if (locale.contains("jp"))
+ defaultHan = QFont::Han_Japanese;
- }
script = defaultHan;
}
#endif
^ permalink raw reply [relevance 99%]
Results 1-1 of 1 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2008-10-28 23:50 99% [gentoo-commits] gentoo-x86 commit in x11-libs/qt/files: qt-3.3.8-fix-compiler-detection.patch qt-3.3.8b-cjk-fix.patch Ben de Groot (yngwin)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox