From 0b2bde7af1ec6cec5c1bc674c9049b12fe0deb20 Mon Sep 17 00:00:00 2001
From: Miikka Heikkinen <miikka.heikkinen@digia.com>
Date: Wed, 27 Jan 2010 14:43:54 +0200
Subject: Added support for embedded sis name/uid patching for Symbian

Patch_capabilities.pl script now also patches any embedded sis
file entries in pkg to embed corresponding *_selfsigned.sis instead.

Also the script now removes dependencies to other packages from
patched pkg to reduce unnecessary warnings about missing dependencies
when said dependencies were installed via patched sises.

Reviewed-by: Janne Koskinen
---
 bin/patch_capabilities.pl | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/bin/patch_capabilities.pl b/bin/patch_capabilities.pl
index b6bf5c3..9daa13e 100755
--- a/bin/patch_capabilities.pl
+++ b/bin/patch_capabilities.pl
@@ -111,12 +111,31 @@ if (@ARGV)
         # Parse each line.
         while (<PKG>)
         {
+            # Patch pkg UID
             my $line = $_;
             my $newLine = $line;
-            if ( $line =~ m/^\#.*\(0x[0-9|a-f|A-F]*\).*$/)
+            if ($line =~ m/^\#.*\(0x[0-9|a-f|A-F]*\).*$/)
             {
                 $newLine =~ s/\(0x./\(0xE/;
             }
+
+            # Patch embedded sis name and UID
+            if ($line =~ m/^@.*\.sis.*\(0x[0-9|a-f|A-F]*\).*$/)
+            {
+                $newLine =~ s/\(0x./\(0xE/;
+                if ($line !~ m/^.*_selfsigned.sis.*$/)
+                {
+                    $newLine =~ s/\.sis/_selfsigned\.sis/i;
+                }
+            }
+
+            # Remove all dependencies to other packages to reduce unnecessary error messages
+            # from depended packages that are also patched and therefore have different UID.
+            if ($line =~ m/^\(0x[0-9|a-f|A-F]*\).*\{.*\}$/)
+            {
+                $newLine = ""
+            }
+
             print NEW_PKG $newLine;
 
             chomp ($line);
-- 
cgit v0.12


From c513782f7cbad45b7c91e069ae81552a4bbb2a5f Mon Sep 17 00:00:00 2001
From: Miikka Heikkinen <miikka.heikkinen@digia.com>
Date: Wed, 27 Jan 2010 14:55:54 +0200
Subject: Added a selfsigned version of sqlite3.sis

Reviewed-by: TrustMe
---
 src/s60installs/sqlite3_selfsigned.sis | Bin 0 -> 285088 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 src/s60installs/sqlite3_selfsigned.sis

diff --git a/src/s60installs/sqlite3_selfsigned.sis b/src/s60installs/sqlite3_selfsigned.sis
new file mode 100644
index 0000000..a025ac5
Binary files /dev/null and b/src/s60installs/sqlite3_selfsigned.sis differ
-- 
cgit v0.12


From 41ff82566a360a478766ee16e72958f5441947fc Mon Sep 17 00:00:00 2001
From: Alessandro Portale <alessandro.portale@nokia.com>
Date: Wed, 27 Jan 2010 14:17:59 +0100
Subject: Removing unneeded code from QFontEngine::getGlyphPositions()

Two QVarLengthArray resizes and one local int variable less.

Reviewed-by: Simon Hausmann

	modified:   src/gui/text/qfontengine.cpp
---
 src/gui/text/qfontengine.cpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/gui/text/qfontengine.cpp b/src/gui/text/qfontengine.cpp
index 9343cb7..c000457 100644
--- a/src/gui/text/qfontengine.cpp
+++ b/src/gui/text/qfontengine.cpp
@@ -357,9 +357,6 @@ void QFontEngine::getGlyphPositions(const QGlyphLayout &glyphs, const QTransform
                 ++i;
             }
         } else {
-            positions.resize(glyphs.numGlyphs);
-            glyphs_out.resize(glyphs.numGlyphs);
-            int i = 0;
             while (i < glyphs.numGlyphs) {
                 if (!glyphs.attributes[i].dontPrint) {
                     QFixed gpos_x = xpos + glyphs.offsets[i].x;
-- 
cgit v0.12