rev 9701 - in trunk/packages/qt-x11-free/debian: . patches
Modestas Vainius
modax-guest at alioth.debian.org
Mon Mar 10 10:43:53 UTC 2008
Author: modax-guest
Date: 2008-03-10 10:43:53 +0000 (Mon, 10 Mar 2008)
New Revision: 9701
Added:
trunk/packages/qt-x11-free/debian/patches/61_easter_asian_languagues.diff
Removed:
trunk/packages/qt-x11-free/debian/patches/61_fcfontmatch_fontwidth_fix.diff
Modified:
trunk/packages/qt-x11-free/debian/changelog
trunk/packages/qt-x11-free/debian/patches/series
Log:
Fix for #468430 - broken font substitution for Asian languagues
Modified: trunk/packages/qt-x11-free/debian/changelog
===================================================================
--- trunk/packages/qt-x11-free/debian/changelog 2008-03-09 20:05:33 UTC (rev 9700)
+++ trunk/packages/qt-x11-free/debian/changelog 2008-03-10 10:43:53 UTC (rev 9701)
@@ -1,4 +1,4 @@
-qt-x11-free (3:3.3.8b-5~pre1) unstable; urgency=low
+qt-x11-free (3:3.3.8b-5~pre2) unstable; urgency=low
+++ Changes by Modestas Vainius:
@@ -11,6 +11,10 @@
* Cleanup README.Debian: remove old information about non-threaded version
of Qt3 and substitude contacts of previous maintainers with
Debian Qt/KDE Maintainers (debian-qt-kde at lists.debian.org).
+ * Drop 61_fcfontmatch_fontwidth_fix.diff patch. A bit different fix was
+ applied upstream.
+ * Add 61_easter_asian_languagues.diff to fix font substitution for Eastern
+ Asian languages under other locales (Closes: #468430).
+++ Changes by Fathi Boudra:
Added: trunk/packages/qt-x11-free/debian/patches/61_easter_asian_languagues.diff
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/61_easter_asian_languagues.diff (rev 0)
+++ trunk/packages/qt-x11-free/debian/patches/61_easter_asian_languagues.diff 2008-03-10 10:43:53 UTC (rev 9701)
@@ -0,0 +1,39 @@
+--- qt-x11-free-3.3.8b/src/kernel/qfontdatabase.cpp 2008-01-15 21:09:13.000000000 +0200
++++ qt-x11-free-3.3.8b/src/kernel/qfontdatabase.cpp 2008-03-10 11:34:22.000000000 +0200
+@@ -966,20 +966,22 @@
+
+ #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;
+- }
+- script = defaultHan;
++ // modify script according to locale
++ static QFont::Script defaultHan;
++ 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("ja"))
++ defaultHan = QFont::Han_Japanese;
++ else
++ defaultHan = QFont::Han; // don't change
++
++ script = defaultHan;
+ }
+ #endif
+
Deleted: trunk/packages/qt-x11-free/debian/patches/61_fcfontmatch_fontwidth_fix.diff
Modified: trunk/packages/qt-x11-free/debian/patches/series
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/series 2008-03-09 20:05:33 UTC (rev 9700)
+++ trunk/packages/qt-x11-free/debian/patches/series 2008-03-10 10:43:53 UTC (rev 9701)
@@ -46,7 +46,7 @@
53_xinerama_dialog_placement_fix.diff
54_seli_xinerama.diff
60_gnu_hurd_support.diff
-61_fcfontmatch_fontwidth_fix.diff
+61_easter_asian_languagues.diff
63_qmake_hurd.diff
65_gcc-4.2_qbuttons.h-fix.diff
66_gcc-4.3_compile-fix.diff
More information about the pkg-kde-commits
mailing list