[ooo-build-commit] 3 commits - configure.in patches/dev300

[Tor Lillqvist]

 configure.in                            |    2 +-
 patches/dev300/apply                    |    3 +--
 patches/dev300/win32-invalid-names.diff |   14 ++++++++------
 3 files changed, 10 insertions(+), 9 deletions(-)

New commits:
commit e782b53678d4d74553d8e3756b50de9103abb1eb
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri Sep 11 17:36:46 2009 +0300

    Remove a now incorrect FIXME comment

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 0ec57a8..e8e2830 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -503,7 +503,6 @@ localize-pl-cygwin-paths.diff, tml
 # (directories with trailing spaces or periods) because some SMB
 # servers like Netware (and Samba, if mangled names = No) do serve
 # such directories if they exist on the server's host system.
-# FIXME: doesn't apply against dev300-m58.
 win32-invalid-names.diff, n#277603, tml
 
 [ Fixes ]
commit ddfbb193c02d391f5f2b13c80a21701a4df9d57e
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri Sep 11 17:35:38 2009 +0300

    Adapt win32-invalid-names.diff to dev300-m58

diff --git a/patches/dev300/win32-invalid-names.diff b/patches/dev300/win32-invalid-names.diff
index 4ce8840..019d4ba 100644
--- a/patches/dev300/win32-invalid-names.diff
+++ b/patches/dev300/win32-invalid-names.diff
@@ -1,14 +1,16 @@
---- sal/osl/w32/file.cxx	2006-12-01 17:56:16.000000000 +0000
-+++ sal/osl/w32/file.cxx	2007-06-08 10:30:26.828125000 +0000
-@@ -175,6 +175,7 @@ using namespace osl;
+--- sal/osl/w32/file_url.h
++++ sal/osl/w32/file_url.h
+@@ -175,6 +175,7 @@
  #define VALIDATEPATH_ALLOW_ELLIPSE			0x0002
  #define VALIDATEPATH_ALLOW_RELATIVE			0x0004
  #define VALIDATEPATH_ALLOW_UNC				0x0008
 +#define VALIDATEPATH_ALLOW_INVALID_SPACE_AND_PERIOD 0x0010
  
- #define WSTR_SYSTEM_ROOT_PATH				L"\\\\.\\"
- 
-@@ -1108,9 +1109,10 @@ namespace /* private */
+ DWORD IsValidFilePath (
+     rtl_uString *  path,
+--- sal/osl/w32/file_url.cxx
++++ sal/osl/w32/file_url.cxx
+@@ -1108,9 +1109,10 @@
  			    case '.':
  				    if ( dwFlags & VALIDATEPATH_ALLOW_ELLIPSE )
  				    {
commit aa3fd7e2969a03e3c780025c05e253f8a7c8158a
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri Sep 11 17:35:12 2009 +0300

    Switch to dev300-m58

diff --git a/configure.in b/configure.in
index 052062a..23cef7f 100644
--- a/configure.in
+++ b/configure.in
@@ -3,7 +3,7 @@ AC_PREREQ(2.51)
 AC_CONFIG_SRCDIR(bin/build-ooo)
 AC_PREFIX_DEFAULT(/usr)
 
-DEFAULT_TAG=dev300-m57
+DEFAULT_TAG=dev300-m58
 # For the upstream packages it is like:
 # DEFAULT_TAG=OOO310_m1
 
diff --git a/patches/dev300/apply b/patches/dev300/apply
index d606969..0ec57a8 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -8,7 +8,7 @@
 PATCHPATH=.:../evo2:../vba:../mono:../64bit:../cairo:../gstreamer:../ooxml:../postgresql:../emf+:../unittesting:../lwp
 
 # might be space separated list to support more MWS
-OLDEST_SUPPORTED=dev300-m57
+OLDEST_SUPPORTED=dev300-m58
 
 # -------- Functional sub-sets --------
 Common : PreprocessPatches, BuildBits, TemporaryHacks, FixesNotForUpstream, \