rpms/qt/devel qt-3.3.6-fontrendering-#214570.patch, NONE, 1.1 qt-3.3.6-fontrendering-214371.patch, NONE, 1.1 qt-3.3.6-fontrendering-ml_IN-209974.patch, NONE, 1.1 qt-3.3.6-fontrendering-ml_IN-217657.patch, NONE, 1.1 qt.spec, 1.126, 1.127 qt-3.3.6-fontrendering-as_IN-211436.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Dec 6 13:50:26 UTC 2006
Author: than
Update of /cvs/dist/rpms/qt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10222
Modified Files:
qt.spec
Added Files:
qt-3.3.6-fontrendering-#214570.patch
qt-3.3.6-fontrendering-214371.patch
qt-3.3.6-fontrendering-ml_IN-209974.patch
qt-3.3.6-fontrendering-ml_IN-217657.patch
Removed Files:
qt-3.3.6-fontrendering-as_IN-211436.patch
Log Message:
- Resolves: bz#214371, bn_IN font rendering
- Resolves: bz#217657, ml_IN issue with cursor position
- Resolves: bz#217638, regression bug in qt
- Resolves: bz#209974, Vowel position set properly
- Resolves: bz#214570, Rendering is not fine for 'RA' 09B0
qt-3.3.6-fontrendering-#214570.patch:
qscriptengine_x11.cpp | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
--- NEW FILE qt-3.3.6-fontrendering-#214570.patch ---
--- qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp.fontrendering-#214570 2006-11-13 15:31:30.000000000 +0100
+++ qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp 2006-11-13 15:33:54.000000000 +0100
@@ -1238,10 +1238,6 @@
unsigned short ra = script_base + 0x30; //it was const unsigned short ra before modification
const unsigned short halant = script_base + 0x4d;
const unsigned short nukta = script_base + 0x3c;
- if(script ==14) //assamese //modification starts from here
- {
- ra = script_base + 0x70;
- }
int len = item->length;
IDEBUG(">>>>> indic shape: from=%d, len=%d invalid=%d", item->from, item->length, invalid);
@@ -1286,7 +1282,11 @@
IDEBUG(" %d: %4x", i, reordered[i]);
}
#endif
-
+ unsigned short *chkAssamese=reordered.data();
+ if((script == QFont::Bengali) && (*chkAssamese==0x09F0)) //if it is assamese ra
+ {
+ ra = script_base + 0x70;
+ }
if (len != 1) {
unsigned short *uc = reordered.data();
bool beginsWithRa = FALSE;
qt-3.3.6-fontrendering-214371.patch:
qscriptengine_x11.cpp | 5 ++++-
1 files changed, 4 insertions(+), 1 deletion(-)
--- NEW FILE qt-3.3.6-fontrendering-214371.patch ---
diff -pruN qt-x11-free-3.3.6.org/src/kernel/qscriptengine_x11.cpp qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp
--- qt-x11-free-3.3.6.org/src/kernel/qscriptengine_x11.cpp 2006-12-04 18:47:11.000000000 +0530
+++ qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp 2006-12-05 12:05:10.000000000 +0530
@@ -1412,7 +1412,10 @@ static bool indic_shape_syllable(QOpenTy
toPos += 2;
if (script == QFont::Devanagari || script == QFont::Gujarati || script == QFont::Bengali) {
if (matra_position == Post || matra_position == Split) {
- toPos = matra+1;
+ if (matra_position == Post )
+ toPos = matra;
+ else
+ toPos = matra+1;
matra -= 2;
}
} else if (script == QFont::Kannada) {
qt-3.3.6-fontrendering-ml_IN-209974.patch:
qscriptengine_x11.cpp | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE qt-3.3.6-fontrendering-ml_IN-209974.patch ---
--- qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp.orig 2006-11-29 17:17:26.000000000 +0100
+++ qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp 2006-11-29 17:22:34.000000000 +0100
@@ -864,7 +864,7 @@
None, None, None, Post,
None, None, None, None,
- None, Post, None, None,
+ None, None, None, None,
None, None, None, None,
None, None, Post, Post,
qt-3.3.6-fontrendering-ml_IN-217657.patch:
qfont_x11.cpp | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE qt-3.3.6-fontrendering-ml_IN-217657.patch ---
diff -pruN qt-x11-free-3.3.6.org/src/kernel/qfont_x11.cpp qt-x11-free-3.3.6/src/kernel/qfont_x11.cpp
--- qt-x11-free-3.3.6.org/src/kernel/qfont_x11.cpp 2006-03-08 00:00:00.000000000 +0530
+++ qt-x11-free-3.3.6/src/kernel/qfont_x11.cpp 2006-12-04 18:49:09.000000000 +0530
@@ -709,7 +709,7 @@ int QFontMetrics::charWidth( const QStri
if ( script >= QFont::Arabic && script <= QFont::Khmer ) {
// complex script shaping. Have to do some hard work
int from = QMAX( 0, pos - 8 );
- int to = QMIN( (int)str.length(), pos + 8 );
+ int to = str.length();
QConstString cstr( str.unicode()+from, to-from);
QTextEngine layout( cstr.string(), d );
layout.itemize( QTextEngine::WidthOnly );
Index: qt.spec
===================================================================
RCS file: /cvs/dist/rpms/qt/devel/qt.spec,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- qt.spec 9 Nov 2006 20:16:22 -0000 1.126
+++ qt.spec 6 Dec 2006 13:50:23 -0000 1.127
@@ -1,7 +1,7 @@
Summary: The shared library for the Qt GUI toolkit.
Name: qt
Version: 3.3.7
-Release: 1%{?dist}
+Release: 2%{?dist}
Epoch: 1
License: GPL/QPL
Group: System Environment/Libraries
@@ -35,7 +35,10 @@
Patch29: qt-3.3.6-fontrendering-as_IN-209972.patch
Patch30: qt-3.3.6-fontrendering-bn_IN-209975.patch
Patch31: qt-3.3.6-fontrendering-te_IN-211259.patch
-Patch32: qt-3.3.6-fontrendering-as_IN-211436.patch
+Patch32: qt-3.3.6-fontrendering-214371.patch
+Patch33: qt-3.3.6-fontrendering-#214570.patch
+Patch34: qt-3.3.6-fontrendering-ml_IN-209974.patch
+Patch35: qt-3.3.6-fontrendering-ml_IN-217657.patch
# immodule patches
Patch50: qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-pre.patch
@@ -265,7 +268,10 @@
%patch29 -p1 -b .fontrendering-as_IN-bz#209972
%patch30 -p1 -b .fontrendering-bn_IN-bz#209975
%patch31 -p1 -b .fontrendering-te_IN-bz#211259
-%patch32 -p1 -b .fontrendering-as_IN-bz211436
+%patch32 -p1 -b .fontrendering-bz#214371
+%patch33 -p1 -b .fontrendering-#214570
+%patch34 -p1 -b .fontrendering-#209974
+%patch35 -p1 -b .fontrendering-ml_IN-217657
%if %{immodule}
%patch50 -p1 -b .pre
@@ -553,6 +559,13 @@
%changelog
+* Wed Dec 06 2006 Than Ngo <than at redhat.com> - 1:3.3.7-2.fc7
+- Resolves: bz#214371, bn_IN font rendering
+- Resolves: bz#217657, ml_IN issue with cursor position
+- Resolves: bz#217638, regression bug in qt
+- Resolves: bz#209974, Vowel position set properly
+- Resolves: bz#214570, Rendering is not fine for 'RA' 09B0
+
* Thu Nov 09 2006 Than Ngo <than at redhat.com> 1:3.3.7-1.fc6
- update to 3.3.7
- fix #209097, ml_IN font rendering
--- qt-3.3.6-fontrendering-as_IN-211436.patch DELETED ---
More information about the fedora-cvs-commits
mailing list