[ooo-build-commit] 4 commits - patches/dev300

[Tor Lillqvist]

 patches/dev300/extensions_configure.diff |    8 +++++
 patches/dev300/win32-cygwin-1.7.diff     |   47 +++++++++++++++++++++++++++++--
 2 files changed, 53 insertions(+), 2 deletions(-)

New commits:
commit d12db8d879d41b6e46eaee0aa7b19ea4d5ae21d2
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Sep 23 15:41:22 2009 +0300

    Also define WITHOUT_EXTENSION_PDFIMPORT if we don't want that

diff --git a/patches/dev300/extensions_configure.diff b/patches/dev300/extensions_configure.diff
index 2e77681..01dcabd 100644
--- a/patches/dev300/extensions_configure.diff
+++ b/patches/dev300/extensions_configure.diff
@@ -47,6 +47,14 @@
  fi
  AC_SUBST(ENABLE_PRESENTER_SCREEN)
  
+@@ -5430,6 +5440,7 @@
+ else
+    AC_MSG_RESULT([no])
+    ENABLE_PDFIMPORT=NO
++   SCPDEFS="$SCPDEFS -DWITHOUT_EXTENSION_PDFIMPORT"
+ fi
+ AC_SUBST(ENABLE_PDFIMPORT)
+ AC_SUBST(SYSTEM_POPPLER)
 @@ -5472,6 +5475,7 @@
  else
    AC_MSG_RESULT([no])
commit 8eef57f63dd184701249f5766d29106954ae6250
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Sep 23 15:36:35 2009 +0300

    Handle Cygwin 1.7 ".exe" append feature in renaming
    
    The rename() system call in Cygwin 1.7 silently appends a .exe to
    the destination file name if the file being renamed is executable
    and the name doesn't already end in .exe. This hurts OOo's use of
    filenames like soffice.bin.

diff --git a/patches/dev300/win32-cygwin-1.7.diff b/patches/dev300/win32-cygwin-1.7.diff
index 3e08b6f..e959e8a 100644
--- a/patches/dev300/win32-cygwin-1.7.diff
+++ b/patches/dev300/win32-cygwin-1.7.diff
@@ -14,8 +14,22 @@
  
  ($gui		= lc($ENV{GUI})) 		|| die "Can't determine 'GUI'. Please set environment.\n";
  $tempcounter        = 0;
-
-
+@@ -840,6 +840,15 @@
+             sleep $try;
+             $try ++;
+             $success = rename($temp_file, $to);
++            # handle Cygwin crack: when renaming soffice.bin.2900-1253705626
++            # to soffice.bin, Cygwin 1.7 silently appends an .exe
++            # giving soffice.bin.exe.
++            if ( $success &&
++                 $^O eq 'cygwin' && 
++                 -f $to.".exe" )
++            {
++                rename ($to.".exe", $to);
++            }
+         }
+         if ( $success ) {
+             # handle special packaging of *.dylib files for Mac OS X
 --- packimages/pack/makefile.mk
 +++ packimages/pack/makefile.mk
 @@ -91,7 +91,7 @@
commit 3660b2a6dfe454463e734ec4fd359695aebdaec5
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Sep 23 13:09:24 2009 +0300

    Workaround for what seems to be a bug in recent cygpath

diff --git a/patches/dev300/win32-cygwin-1.7.diff b/patches/dev300/win32-cygwin-1.7.diff
index 0eb6726..3e08b6f 100644
--- a/patches/dev300/win32-cygwin-1.7.diff
+++ b/patches/dev300/win32-cygwin-1.7.diff
@@ -27,3 +27,21 @@
  .IF "$(GUI)"=="UNX"
      chmod -R g+w $(MISC)$/classic
  .ENDIF
+--- solenv/bin/modules/installer/control.pm
++++ solenv/bin/modules/installer/control.pm
+@@ -91,9 +91,14 @@
+     
+     if( $^O =~ /cygwin/i )
+     {	# When using cygwin's perl the PATH variable is POSIX style and ...
+-        $pathvariable = qx{cygpath -mp "$pathvariable"} ;
++        my $temparrayref = installer::converter::convert_stringlist_into_array_without_newline(\$pathvariable, $local_pathseparator);
++        foreach $i (0..$#$temparrayref) {
++            $$temparrayref[$i] = qx{cygpath -m "$$temparrayref[$i]"};
++            chomp($$temparrayref[$i]);
++        }
+         # has to be converted to DOS style for further use.
+         $local_pathseparator = ';';
++        $pathvariable = join($local_pathseparator, @$temparrayref);
+     }
+     my $patharrayref = installer::converter::convert_stringlist_into_array(\$pathvariable, $local_pathseparator);
+ 
commit c6d55230e735083017b2fae07e063dcd2e632592
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Sep 23 11:46:47 2009 +0300

    Explicitly pass -d to gunzip to avoid potential Cygwin issues
    
    Occasionally the Cygwin gunzip doesn't seem to recognize itself, so
    explicitly tell it to decompress.

diff --git a/patches/dev300/win32-cygwin-1.7.diff b/patches/dev300/win32-cygwin-1.7.diff
index 6074a69..0eb6726 100644
--- a/patches/dev300/win32-cygwin-1.7.diff
+++ b/patches/dev300/win32-cygwin-1.7.diff
@@ -16,3 +16,14 @@
  $tempcounter        = 0;
 
 
+--- packimages/pack/makefile.mk
++++ packimages/pack/makefile.mk
+@@ -91,7 +91,7 @@
+ 
+ # unpack the classic icon set
+ $(MISC)$/classic.flag : $(CLASSIC_TARBALL)
+-    cd $(MISC) && gunzip -c $(CLASSIC_TARBALL) | ( tar -xf - ) && $(TOUCH) $(@:f)
++    cd $(MISC) && gunzip -d -c $(CLASSIC_TARBALL) | ( tar -xf - ) && $(TOUCH) $(@:f)
+ .IF "$(GUI)"=="UNX"
+     chmod -R g+w $(MISC)$/classic
+ .ENDIF