[PATCH] 4.0.6.2 build errors

[Jakub Kościelak]

Hi All,

I am building LO 4.0.6.2 and there are some errors.
I know that 4.0 is EOL. I think 4.1 and 4.2 are affected too.

1 When I build version only en-US, autotextshare_en-us.zip is formed and 
is located in the solver/wntmsci12.pro/pck,
but when I build with --with-lang = "pl de" option, then thisfile isn't 
created, only the files in pland de version, because of this an error 
occurres during the buildingof the installation file.msi. Is this a 
known bug?

As I remember en-US is always build, because this is "native language", 
and I don't need to use --with-lang "en-US pl de".

Thus I think, there is a bug.


2 There is an errorin archive 
http://dev-www.libreoffice.org/src/libvisio-0.0.31.tar.bz2 (downloaded 
after the command make fetch) in / build/win32/libvisio.vcproj, "> "is 
missing.
I attach the patch.
Because of this the LO doesn't build.
Strange that no one has reportedthis error, and ithas not been 
corrected, when everybody who built the LO had to encounter this;-)
This also probably applies to 4.1, 4.2 .
In the version libvisio-0.0.30.tar.bz2 everything was ok.

3 There is a bug in / solenv / bin / modules / installer / windows file 
msiglobal.pm.
my $ comment = $ allvariableshashref-> {'PRODUCTNAME'}; returns the name 
without the quotation marks,
If the product name is one word (like LibreOffice) that is not a 
problem, but as in my custom build name has two parts and there is a 
space between, which results in erroneous launch of msiinfo.exe with 
parameters.
I attach the patch.


All the best,
Jakub Kościelak

libvisio.vcproj.patch


*** ./a/libvisio.vcproj	2013-08-28 09:50:52.000000000 +0200
--- ./b/libvisio.vcproj	2013-11-13 19:40:14.379125000 +0100
***************
*** 871,876 ****
--- 871,877 ----
   			</File>
   			<File
   				RelativePath="..\..\src\lib\VSDXTheme.h"
+ 				>
   			</File>
   			<File
   				RelativePath="..\..\src\lib\VSDZipStream.h"


msibuild.pm.patch


*** ./a/msiglobal.pm	2013-10-12 01:22:28.211661200 +0200
--- ./b/msiglobal.pm	2013-11-16 13:21:41.555071700 +0100
***************
*** 597,602 ****
--- 597,616 ----
       return $subject;
   }
   
+ #################################################################
+ # Returning the comment for the Summary Information Stream
+ #################################################################
+
+ sub get_comment_for_sis
+ {
+     my ( $allvariableshashref ) = @_;
+
+     my $comment = $allvariableshashref->{'PRODUCTNAME'};
+
+     $comment = "\"" . $comment . "\"";
+
+     return $comment;
+ }
   ######################################################################
   # Returning the security for the Summary Information Stream
   ######################################################################
***************
*** 635,641 ****
       my $title = "\"Installation database\"";
       my $author = get_author_for_sis();
       my $subject = get_subject_for_sis($allvariableshashref);
!     my $comment = $allvariableshashref->{'PRODUCTNAME'};
       my $keywords = "\"Install,MSI\"";
       my $appname = "\"Windows Installer\"";
       my $security = get_security_for_sis();
--- 649,655 ----
       my $title = "\"Installation database\"";
       my $author = get_author_for_sis();
       my $subject = get_subject_for_sis($allvariableshashref);
!     my $comment = get_comment_for_sis($allvariableshashref);
       my $keywords = "\"Install,MSI\"";
       my $appname = "\"Windows Installer\"";
       my $security = get_security_for_sis();

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freedesktop.org/archives/libreoffice/attachments/20131118/dc1e47bd/attachment.html>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: libvisio.vcproj.patch
Type: text/x-patch
Size: 323 bytes
Desc: not available
URL: <http://lists.freedesktop.org/archives/libreoffice/attachments/20131118/dc1e47bd/attachment.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: msibuild.pm.patch
Type: text/x-patch
Size: 1542 bytes
Desc: not available
URL: <http://lists.freedesktop.org/archives/libreoffice/attachments/20131118/dc1e47bd/attachment-0001.bin>