[ooo-build-commit] Branch 'ooo-build-3-1' - patches/dev300

[Kalman "" Szalai]

 patches/dev300/apply                         |    3 +++
 patches/dev300/msitrans-problemchecksum.diff |   11 +++++++++++
 2 files changed, 14 insertions(+)

New commits:
commit 40fbddf51d6e3bb781c83699ed37dea8134f8785
Author: Kalman Szalai - KAMI <kami911 at gmail.com>
Date:   Wed Jun 10 18:54:39 2009 +0200

    Enables building multi language installsets with problematic msitrans.exe
    
    It seems I have new (Windows SDK) msitrans.exe with problematic behavior, so I added md5 checksum:
    748206e54fc93efe6a1aaa9d491f3ad1 to the database. This enables to create multi language pack
    under Windows. We have to test the final installsets.
    
    * patches/dev300/apply:
    * patches/dev300/msitrans-problemchecksum.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 12ee739..532297c 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1463,6 +1463,9 @@ boost-patch.diff, tml
 # fixes for visual studio express 2005 ( ooo-build only )
 2005-express-stl-remove.diff, noelpwer, i#71404
 
+# This enables building multi language installsets with new (Windows SDK) problematic msitrans.exe
+msitrans-problemchecksum.diff, kami
+
 [ MultilanguageWin32Only ]
 # Multi-language installer stuff
 win32-multi-lang-installer.diff, i#66062, i#88638, i#88639, tml
diff --git a/patches/dev300/msitrans-problemchecksum.diff b/patches/dev300/msitrans-problemchecksum.diff
new file mode 100644
index 0000000..8ad7b75
--- /dev/null
+++ b/patches/dev300/msitrans-problemchecksum.diff
@@ -0,0 +1,11 @@
+--- solenv/bin/modules/installer/windows/msiglobal.pm.original	2009-06-10 18:45:19.000000000 +0200
++++ solenv/bin/modules/installer/windows/msiglobal.pm	2009-06-10 18:46:35.000000000 +0200
+@@ -1025,7 +1025,7 @@
+ 			my $digest = Digest::MD5->new->addfile(*FILE)->hexdigest;			
+ 			close(FILE);
+ 
+-			my @problemchecksums = ("b66190a70145a57773ec769e16777b29", "aa25d3445b94ffde8ef0c1efb77a56b8");
++			my @problemchecksums = ("b66190a70145a57773ec769e16777b29", "aa25d3445b94ffde8ef0c1efb77a56b8", "748206e54fc93efe6a1aaa9d491f3ad1");
+ 			my $isproblemchecksum = 0;
+ 			
+ 			foreach my $problemchecksum ( @problemchecksums )