| 1 |
yngwin 08/10/28 23:50:10 |
| 2 |
|
| 3 |
Added: qt-3.3.8-fix-compiler-detection.patch |
| 4 |
qt-3.3.8b-cjk-fix.patch |
| 5 |
Log: |
| 6 |
Add patches/fixes for qt3 bugs 172219, 229567 and 244732 |
| 7 |
(Portage version: 2.2_rc12_p11688/cvs/Linux 2.6.26-hh3 i686) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 x11-libs/qt/files/qt-3.3.8-fix-compiler-detection.patch |
| 11 |
|
| 12 |
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 |
| 13 |
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 |
| 14 |
|
| 15 |
Index: qt-3.3.8-fix-compiler-detection.patch |
| 16 |
=================================================================== |
| 17 |
--- qt-x11-free-3.3.8-orig/configure 2008-10-28 15:43:35.000000000 +0100 |
| 18 |
+++ qt-x11-free-3.3.8/configure 2008-10-28 15:45:48.000000000 +0100 |
| 19 |
@@ -3079,15 +3079,15 @@ |
| 20 |
g++*) |
| 21 |
# GNU C++ |
| 22 |
QMAKE_CONF_COMPILER=`grep "QMAKE_CXX[^_A-Z0-9a-z]" $QMAKESPEC/qmake.conf | sed "s,.* *= *\(.*\)$,\1,"` |
| 23 |
- COMPILER_VERSION=`${QMAKE_CONF_COMPILER} --version 2>/dev/null` |
| 24 |
+ COMPILER_VERSION=`${QMAKE_CONF_COMPILER} -dumpversion 2>/dev/null` |
| 25 |
case "$COMPILER_VERSION" in |
| 26 |
- *2.95.*) |
| 27 |
+ 2.95.*) |
| 28 |
COMPILER_VERSION="2.95.*" |
| 29 |
;; |
| 30 |
- *3.*) |
| 31 |
+ 3.*) |
| 32 |
COMPILER_VERSION="3.*" |
| 33 |
;; |
| 34 |
- *4.*) |
| 35 |
+ 4.*) |
| 36 |
COMPILER_VERSION="4" |
| 37 |
;; |
| 38 |
*) |
| 39 |
|
| 40 |
|
| 41 |
|
| 42 |
1.1 x11-libs/qt/files/qt-3.3.8b-cjk-fix.patch |
| 43 |
|
| 44 |
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 |
| 45 |
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 |
| 46 |
|
| 47 |
Index: qt-3.3.8b-cjk-fix.patch |
| 48 |
=================================================================== |
| 49 |
--- src/kernel/qfontdatabase.cpp 2008-07-10 06:17:31.000000000 +0800 |
| 50 |
+++ src/kernel/qfontdatabase.cpp 2008-07-10 06:27:53.000000000 +0800 |
| 51 |
@@ -960,19 +960,17 @@ |
| 52 |
#ifdef Q_WS_X11 |
| 53 |
if (script == QFont::Han) { |
| 54 |
// modify script according to locale |
| 55 |
- static QFont::Script defaultHan = QFont::UnknownScript; |
| 56 |
- if (defaultHan == QFont::UnknownScript) { |
| 57 |
- QCString locale = setlocale(LC_ALL, NULL); |
| 58 |
- if (locale.contains("ko")) |
| 59 |
- defaultHan = QFont::Han_Korean; |
| 60 |
- else if (locale.contains("zh_TW") || locale.contains("zh_HK")) |
| 61 |
- defaultHan = QFont::Han_TraditionalChinese; |
| 62 |
- else if (locale.contains("zh")) |
| 63 |
- defaultHan = QFont::Han_SimplifiedChinese; |
| 64 |
- else |
| 65 |
- defaultHan = QFont::Han_Japanese; |
| 66 |
+ static QFont::Script defaultHan = QFont::Han; |
| 67 |
+ QCString locale = setlocale(LC_ALL, NULL); |
| 68 |
+ if (locale.contains("ko")) |
| 69 |
+ defaultHan = QFont::Han_Korean; |
| 70 |
+ else if (locale.contains("zh_TW") || locale.contains("zh_HK")) |
| 71 |
+ defaultHan = QFont::Han_TraditionalChinese; |
| 72 |
+ else if (locale.contains("zh")) |
| 73 |
+ defaultHan = QFont::Han_SimplifiedChinese; |
| 74 |
+ else if (locale.contains("jp")) |
| 75 |
+ defaultHan = QFont::Han_Japanese; |
| 76 |
- } |
| 77 |
script = defaultHan; |
| 78 |
} |
| 79 |
#endif |
Archives