rpms/qt/devel qt-all-opensource-src-4.4.0-rc1-as_IN-437440.patch, NONE, 1.1 qt.spec, 1.171, 1.172 qt-x11-opensource-src-4.3.4-as_IN-437440.patch, 1.2, NONE

[Kevin Kofler (kkofler)]

Author: kkofler

Update of /cvs/pkgs/rpms/qt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27597/devel

Modified Files:
	qt.spec 
Added Files:
	qt-all-opensource-src-4.4.0-rc1-as_IN-437440.patch 
Removed Files:
	qt-x11-opensource-src-4.3.4-as_IN-437440.patch 
Log Message:
Port the as_IN patch to Qt 4.4 (the code moved to harfbuzz).

qt-all-opensource-src-4.4.0-rc1-as_IN-437440.patch:

--- NEW FILE qt-all-opensource-src-4.4.0-rc1-as_IN-437440.patch ---
diff -ur qt-all-opensource-src-4.4.0-rc1/src/3rdparty/harfbuzz/src/harfbuzz-indic.cpp qt-all-opensource-src-4.4.0-rc1-as_IN-437440/src/3rdparty/harfbuzz/src/harfbuzz-indic.cpp
--- qt-all-opensource-src-4.4.0-rc1/src/3rdparty/harfbuzz/src/harfbuzz-indic.cpp	2008-04-02 18:33:48.000000000 +0200
+++ qt-all-opensource-src-4.4.0-rc1-as_IN-437440/src/3rdparty/harfbuzz/src/harfbuzz-indic.cpp	2008-04-08 04:37:45.000000000 +0200
@@ -552,7 +552,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,
@@ -1169,7 +1169,7 @@
     HB_Script script = item->item.script;
     assert(script >= HB_Script_Devanagari && script <= HB_Script_Sinhala);
     const unsigned short script_base = 0x0900 + 0x80*(script-HB_Script_Devanagari);
-    const unsigned short ra = script_base + 0x30;
+    unsigned short ra = script_base + 0x30;
     const unsigned short halant = script_base + 0x4d;
     const unsigned short nukta = script_base + 0x3c;
     bool control = false;
@@ -1212,6 +1212,19 @@
         HB_UChar16 *uc = reordered;
         bool beginsWithRa = false;
 
+	// Exception in Bengali Script
+        //
+        // Bengali script supports two languages bengali and assamese
+        // Unfortunately for both languages there is different ra defined in same script chart
+        // for Bengali it ra is 'Base+ 0x30' and for assamese 'Base+0x70'
+        // Base is same 0x0980
+        // To handle this exception we need to change ra to from const to normal variable 
+        // and aslo need to change ra to 'Base+0x70' whenever we will get assamese language
+	//character in data
+	if((script == HB_Script_Bengali) && (*uc==0x09F0)){
+	  ra  = script_base + 0x70;
+	}
+
         // Rule 1: find base consonant
         //
         // The shaping engine finds the base consonant of the


Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -r1.171 -r1.172
--- qt.spec	8 Apr 2008 01:38:32 -0000	1.171
+++ qt.spec	8 Apr 2008 02:44:04 -0000	1.172
@@ -34,7 +34,7 @@
 
 # multilib hacks 
 Patch2: qt-x11-opensource-src-4.2.2-multilib.patch
-Patch5: qt-x11-opensource-src-4.3.4-as_IN-437440.patch
+Patch5: qt-all-opensource-src-4.4.0-rc1-as_IN-437440.patch
 
 ## qt-copy patches
 #define qt_copy 20080404
@@ -787,7 +787,7 @@
 %changelog
 * Tue Apr 08 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.4.0-0.4.rc1
 - updated patch for #437440 ([as-IN] Consonant combination issue) by Pravin Satpute
-- actually enable the patch
+- port the patch to Qt 4.4 (the code moved to harfbuzz) and reenable it
 
 * Fri Apr 04 2008 Rex Dieter <rdieter at fedoraproject.org> 4.4.0-0.3.rc1
 - qt-4.4.0-rc1


--- qt-x11-opensource-src-4.3.4-as_IN-437440.patch DELETED ---