rpms/qt/devel qt-3.3.8-fontrendering-#214570.patch, NONE, 1.1 qt-3.3.8-fontrendering-as_IN-209972.patch, NONE, 1.1 qt.spec, 1.133, 1.134 qt-3.3.6-fontrendering-#214570.patch, 1.2, NONE qt-3.3.6-fontrendering-as_IN-209972.patch, 1.1, NONE

[fedora-cvs-commits at redhat.com]

Author: than

Update of /cvs/dist/rpms/qt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22914

Modified Files:
	qt.spec 
Added Files:
	qt-3.3.8-fontrendering-#214570.patch 
	qt-3.3.8-fontrendering-as_IN-209972.patch 
Removed Files:
	qt-3.3.6-fontrendering-#214570.patch 
	qt-3.3.6-fontrendering-as_IN-209972.patch 
Log Message:
- adjust qt-3.3.8-fontrendering-as_IN-209972.patch and
  qt-3.3.8-fontrendering-#214570.patch for qt-3.3.8



qt-3.3.8-fontrendering-#214570.patch:
 qscriptengine_x11.cpp |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE qt-3.3.8-fontrendering-#214570.patch ---
--- qt-x11-free-3.3.8/src/kernel/qscriptengine_x11.cpp.orig	2007-04-11 15:05:34.000000000 +0200
+++ qt-x11-free-3.3.8/src/kernel/qscriptengine_x11.cpp	2007-04-11 15:22:19.000000000 +0200
@@ -1240,7 +1240,7 @@
     int script = item->script;
     Q_ASSERT(script >= QFont::Devanagari && script <= QFont::Sinhala);
     const unsigned short script_base = 0x0900 + 0x80*(script-QFont::Devanagari);
-    const unsigned short ra = script_base + 0x30;
+    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;
 
@@ -1278,6 +1278,11 @@
     }
 #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.8-fontrendering-as_IN-209972.patch:
 qscriptengine_x11.cpp |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE qt-3.3.8-fontrendering-as_IN-209972.patch ---
--- qt-x11-free-3.3.8/src/kernel/qscriptengine_x11.cpp.orig	2007-04-11 15:05:34.000000000 +0200
+++ qt-x11-free-3.3.8/src/kernel/qscriptengine_x11.cpp	2007-04-11 15:22:19.000000000 +0200
@@ -601,7 +601,7 @@
     None, None, None, None,
     None, None, None, None,
 
-    None, None, None, None,
+    Below, None, None, None,
     None, None, None, None,
     None, None, None, None,
     None, None, None, None,


Index: qt.spec
===================================================================
RCS file: /cvs/dist/rpms/qt/devel/qt.spec,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- qt.spec	2 Apr 2007 09:00:37 -0000	1.133
+++ qt.spec	11 Apr 2007 13:28:18 -0000	1.134
@@ -1,7 +1,7 @@
 Summary: The shared library for the Qt GUI toolkit.
 Name: qt
 Version: 3.3.8
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch: 1
 License: GPL/QPL
 Group: System Environment/Libraries
@@ -32,10 +32,10 @@
 Patch26: qt-3.3.6-fontrendering-punjabi-209970.patch
 Patch27: qt-3.3.6-fontrendering-ml_IN-209097.patch
 Patch28: qt-3.3.6-fontrendering-or_IN-209098.patch
-Patch29: qt-3.3.6-fontrendering-as_IN-209972.patch
+Patch29: qt-3.3.8-fontrendering-as_IN-209972.patch
 Patch31: qt-3.3.6-fontrendering-te_IN-211259.patch
 Patch32: qt-3.3.6-fontrendering-214371.patch
-Patch33: qt-3.3.6-fontrendering-#214570.patch
+Patch33: qt-3.3.8-fontrendering-#214570.patch
 Patch34: qt-3.3.6-fontrendering-ml_IN-209974.patch
 Patch35: qt-3.3.6-fontrendering-ml_IN-217657.patch
 
@@ -564,6 +564,10 @@
 
 
 %changelog
+* Wed Apr 11 2007 Than Ngo <than at redhat.com> - 1:3.3.8-4.fc7
+- adjust qt-3.3.8-fontrendering-as_IN-209972.patch and
+  qt-3.3.8-fontrendering-#214570.patch for qt-3.3.8
+
 * Mon Apr 02 2007 Than Ngo <than at redhat.com> - 1:3.3.8-3.fc7
 - apply patches to fix
    Qt UTF-8 overlong sequence decoding vulnerability


--- qt-3.3.6-fontrendering-#214570.patch DELETED ---


--- qt-3.3.6-fontrendering-as_IN-209972.patch DELETED ---