applied_patches/0550-win32-cygwin-1.7.diff

   1 --- solenv/bin/deliver.pl
   2 +++ solenv/bin/deliver.pl
   3 @@ -113,9 +113,11 @@
   4
   5  if ($^O ne 'cygwin') {              # iz59477 - cygwin needes a dot "." at the end of filenames to disable
   6    $maybedot     = '';               # some .exe transformation magic.
   7 -} else {
   8 +} elsif ( `uname -r` lt '1.7') {    # but not in cygwin 1.7 it seems
   9    $maybedot     = '.';
  10 -}
  11 +} else {
  12 +  $maybedot     = '';
  13 +}
  14
  15  ($gui          = lc($ENV{GUI}))                || die "Can't determine 'GUI'. Please set environment.\n";
  16  $tempcounter        = 0;
  17 @@ -840,6 +840,15 @@
  18              sleep $try;
  19              $try ++;
  20              $success = rename($temp_file, $to);
  21 +            # handle Cygwin crack: when renaming soffice.bin.2900-1253705626
  22 +            # to soffice.bin, Cygwin 1.7 silently appends an .exe
  23 +            # giving soffice.bin.exe.
  24 +            if ( $success &&
  25 +                 $^O eq 'cygwin' &&
  26 +                 -f $to.".exe" )
  27 +            {
  28 +                $success = rename ($to.".exe", $to);
  29 +            }
  30          }
  31          if ( $success ) {
  32              # handle special packaging of *.dylib files for Mac OS X
  33 --- packimages/pack/makefile.mk
  34 +++ packimages/pack/makefile.mk
  35 @@ -91,7 +91,7 @@
  36
  37  # unpack the classic icon set
  38  $(MISC)$/classic.flag : $(CLASSIC_TARBALL)
  39 -    cd $(MISC) && gunzip -c $(CLASSIC_TARBALL) | ( tar -xf - ) && $(TOUCH) $(@:f)
  40 +    cd $(MISC) && gunzip -d -c $(CLASSIC_TARBALL) | ( tar -xf - ) && $(TOUCH) $(@:f)
  41  .IF "$(GUI)"=="UNX"
  42      chmod -R g+w $(MISC)$/classic
  43  .ENDIF
  44 --- solenv/bin/modules/installer/control.pm
  45 +++ solenv/bin/modules/installer/control.pm
  46 @@ -91,9 +91,14 @@
  47
  48      if( $^O =~ /cygwin/i )
  49      {  # When using cygwin's perl the PATH variable is POSIX style and ...
  50 -        $pathvariable = qx{cygpath -mp "$pathvariable"} ;
  51 +        my $temparrayref = installer::converter::convert_stringlist_into_array_without_newline(\$pathvariable, $local_pathseparator);
  52 +        foreach $i (0..$#$temparrayref) {
  53 +            $$temparrayref[$i] = qx{cygpath -m "$$temparrayref[$i]"};
  54 +            chomp($$temparrayref[$i]);
  55 +        }
  56          # has to be converted to DOS style for further use.
  57          $local_pathseparator = ';';
  58 +        $pathvariable = join($local_pathseparator, @$temparrayref);
  59      }
  60      my $patharrayref = installer::converter::convert_stringlist_into_array(\$pathvariable, $local_pathseparator);
  61