package/office/openoffice/portable.patch

   1 # --- T2-COPYRIGHT-NOTE-BEGIN ---
   2 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
   3 #
   4 # T2 SDE: package/.../openoffice-org/portable.patch
   5 # Copyright (C) 2010 The T2 SDE Project
   6 #
   7 # More information can be found in the files COPYING and README.
   8 #
   9 # This patch file is dual-licensed. It is available under the license the
  10 # patched project is licensed under, as long as it is an OpenSource license
  11 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  12 # of the GNU General Public License as published by the Free Software
  13 # Foundation; either version 2 of the License, or (at your option) any later
  14 # version.
  15 # --- T2-COPYRIGHT-NOTE-END ---
  16
  17 --- OOO320_m12/solenv/bin/make_installer.pl.orig        2010-03-12 10:52:17.982909051 +0000
  18 +++ OOO320_m12/solenv/bin/make_installer.pl     2010-03-12 10:55:19.806910741 +0000
  19 @@ -1371,7 +1371,7 @@
  20                         # try it again later.
  21                         ####################################################
  22
  23 -                       if (( $installer::globals::patch ) || ( $installer::globals::languagepack ) || ( $installer::globals::packageformat eq "native" ) || ( $installer::globals::packageformat eq "osx" )) { $allvariableshashref->{'POOLPRODUCT'} = 0; }
  24 +                       if (( $installer::globals::patch ) || ( $installer::globals::languagepack ) || ( $installer::globals::packageformat eq "native" ) || ( $installer::globals::packageformat eq "portable" ) || ( $installer::globals::packageformat eq "osx" )) { $allvariableshashref->{'POOLPRODUCT'} = 0; }
  25
  26                         if ( $allvariableshashref->{'POOLPRODUCT'} )
  27                         {
  28 --- OOO320_m12/solenv/bin/modules/installer/control.pm.orig     2010-03-12 15:36:08.268404990 +0000
  29 +++ OOO320_m12/solenv/bin/modules/installer/control.pm  2010-03-12 15:37:06.718906243 +0000
  30 @@ -715,6 +715,7 @@
  31         if ( $installer::globals::patch ) {     $installer::globals::addsystemintegration = 0; }
  32         if ( $installer::globals::languagepack ) { $installer::globals::addsystemintegration = 0; }
  33         if ( $installer::globals::packageformat eq "native" ) { $installer::globals::addsystemintegration = 0; }
  34 +       if ( $installer::globals::packageformat eq "portable" ) { $installer::globals::addsystemintegration = 0; }
  35
  36         my $infoline = "Value of \$installer::globals::addsystemintegration: $installer::globals::addsystemintegration\n";
  37         push( @installer::globals::globallogfileinfo, $infoline);