mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix installing for --enable-mergelibs

Browse Source 
Use gid_File_Lib_Oox instead of auto_File_Lib_vcl which is not defined
in that case.
No idea what the code is about though.

Change-Id: I675268a3490dd1421ecf1a82ede0db527d176744
This commit is contained in:
Matúš Kukan
2013-04-16 11:31:58 +02:00
parent 06575c858d
commit fdb6b39d68
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
instsetoo_native/util/openoffice.lst.in
View File

@@ -64,7 +64,7 @@ LibreOffice
PACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@ PACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
PACKAGEREVISION {buildid} PACKAGEREVISION {buildid}
LICENSENAME LGPL LICENSENAME LGPL
GLOBALFILEGID auto_File_Lib_vcl GLOBALFILEGID gid_File_Lib_Oox
GLOBALPATCHFILEGID gid_File_Txt_Patchfiles GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
SPELLCHECKERFILE spellchecker_selection.txt SPELLCHECKERFILE spellchecker_selection.txt
OOODOWNLOADNAME 1 OOODOWNLOADNAME 1
@@ -120,7 +120,7 @@ LibreOffice_Dev
PACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@ PACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
PACKAGEREVISION {buildid} PACKAGEREVISION {buildid}
LICENSENAME LGPL LICENSENAME LGPL
GLOBALFILEGID auto_File_Lib_vcl GLOBALFILEGID gid_File_Lib_Oox
GLOBALPATCHFILEGID gid_File_Txt_Patchfiles GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
SPELLCHECKERFILE spellchecker_selection.txt SPELLCHECKERFILE spellchecker_selection.txt
OOODOWNLOADNAME 1 OOODOWNLOADNAME 1

4
solenv/bin/modules/installer/profiles.pm
View File

@@ -84,9 +84,9 @@ sub add_profile_into_filelist
my %profile = (); my %profile = ();
# Taking the base data from the "auto_File_Lib_vcl" # Taking the base data from the "gid_File_Lib_Oox"
my $vclgid = "auto_File_Lib_vcl"; my $vclgid = "gid_File_Lib_Oox";
if ( $allvariables->{'GLOBALFILEGID'} ) { $vclgid = $allvariables->{'GLOBALFILEGID'}; } if ( $allvariables->{'GLOBALFILEGID'} ) { $vclgid = $allvariables->{'GLOBALFILEGID'}; }
my ($vclfile) = grep {$_->{gid} eq $vclgid} @{$filesarrayref}; my ($vclfile) = grep {$_->{gid} eq $vclgid} @{$filesarrayref};
if (! defined $vclfile) { if (! defined $vclfile) {