[ooo-build-commit] patches/dev300

[Tor Lillqvist]

 patches/dev300/apply                 |    3 +++
 patches/dev300/win32-cygwin-1.7.diff |   18 ++++++++++++++++++
 2 files changed, 21 insertions(+)

New commits:
commit ce72e005b2594335d0bb71fc8ebaceb849343ac9
Author: unknown <tlillqvist at novell.com>
Date:   Tue Sep 22 19:31:40 2009 +0300

    Fix a problem in deliver.pl on Cygwin 1.7
    
    * patches/dev300/win32-cygwin-1.7.diff: New patch. Don't use
      a hack from i#59477 on Cygwin 1.7 or later in deliver.pl.
    
    * patches/dev300/apply: Add it to Fixes.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index fb2d7c0..ce55ccb 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3028,6 +3028,9 @@ sw-insert-pagebreak-in-numbered-paragraph.diff, n#396648, Amelia Wang
 # and in the Start Menu on Windows
 win32-tooltips.diff, tml
 
+# In Cygwin 1.7 the trailing dot hack from i#59477 is harmful
+win32-cygwin-1.7.diff, i#59477, tml
+
 [ Fixes ]
 # fix problem with calling private and protected members in layout code
 sfx2-privateprotectedpublic.diff
diff --git a/patches/dev300/win32-cygwin-1.7.diff b/patches/dev300/win32-cygwin-1.7.diff
new file mode 100644
index 0000000..6074a69
--- /dev/null
+++ b/patches/dev300/win32-cygwin-1.7.diff
@@ -0,0 +1,18 @@
+--- solenv/bin/deliver.pl
++++ solenv/bin/deliver.pl
+@@ -113,9 +113,11 @@
+ 
+ if ($^O ne 'cygwin') {              # iz59477 - cygwin needes a dot "." at the end of filenames to disable
+   $maybedot     = '';               # some .exe transformation magic.
+-} else {
++} elsif ( `uname -r` lt '1.7') {    # but not in cygwin 1.7 it seems
+   $maybedot     = '.';
+-}
++} else {
++  $maybedot     = '';
++}
+ 
+ ($gui		= lc($ENV{GUI})) 		|| die "Can't determine 'GUI'. Please set environment.\n";
+ $tempcounter        = 0;
+
+