diff --git a/qt-x11-opensource-src-4.3.4-as_IN-437440.patch b/qt-all-opensource-src-4.4.0-rc1-as_IN-437440.patch similarity index 58% rename from qt-x11-opensource-src-4.3.4-as_IN-437440.patch rename to qt-all-opensource-src-4.4.0-rc1-as_IN-437440.patch index 54751b7..b300574 100644 --- a/qt-x11-opensource-src-4.3.4-as_IN-437440.patch +++ b/qt-all-opensource-src-4.4.0-rc1-as_IN-437440.patch @@ -1,6 +1,7 @@ ---- qt-x11-opensource-src-4.3.4/src/gui/text/qscriptengine.cpp 2008-02-19 23:17:19.000000000 +0530 -+++ qscriptengine.cpp_mod 2008-04-01 17:39:48.000000000 +0530 -@@ -2174,7 +2174,7 @@ static const unsigned char indicPosition +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, @@ -9,17 +10,17 @@ None, None, None, None, None, None, None, None, None, None, None, None, -@@ -2814,7 +2814,7 @@ static bool indic_shape_syllable(QOpenTy - int script = item->script; - Q_ASSERT(script >= QUnicodeTables::Devanagari && script <= QUnicodeTables::Sinhala); - const unsigned short script_base = 0x0900 + 0x80*(script-QUnicodeTables::Devanagari); +@@ -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; - -@@ -2856,6 +2856,19 @@ static bool indic_shape_syllable(QOpenTy - unsigned short *uc = reordered.data(); + bool control = false; +@@ -1212,6 +1212,19 @@ + HB_UChar16 *uc = reordered; bool beginsWithRa = false; + // Exception in Bengali Script @@ -31,7 +32,7 @@ + // 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 == QUnicodeTables::Bengali) && (*uc==0x09F0)){ ++ if((script == HB_Script_Bengali) && (*uc==0x09F0)){ + ra = script_base + 0x70; + } + diff --git a/qt.spec b/qt.spec index 22132fd..63106f8 100644 --- a/qt.spec +++ b/qt.spec @@ -34,7 +34,7 @@ Source5: qconfig-multilib.h # 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 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||: %changelog * Tue Apr 08 2008 Kevin Kofler 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 4.4.0-0.3.rc1 - qt-4.4.0-rc1