[ooo-build-commit] .: patches/dev300

[Fridrich Strba]

 patches/dev300/desktop-infilter-option.diff |    2 +-
 patches/dev300/python-win32-buildfix.diff   |    8 ++------
 2 files changed, 3 insertions(+), 7 deletions(-)

New commits:
commit e5bd7c0c3bf1f7b56399e6d1017d872c94da8e35
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Thu Jul 29 12:10:38 2010 +0200

    Massage again to apply on NovellWin32 build and fix python build crash

diff --git a/patches/dev300/desktop-infilter-option.diff b/patches/dev300/desktop-infilter-option.diff
index 22391c9..c4cf07b 100644
--- a/patches/dev300/desktop-infilter-option.diff
+++ b/patches/dev300/desktop-infilter-option.diff
@@ -11,7 +11,7 @@
 --- desktop/source/app/cmdlineargs.cxx	2010-07-22 15:52:08.000000000 +0530
 +++ desktop/source/app/cmdlineargs.cxx	2010-07-22 16:26:35.000000000 +0530
 @@ -532,6 +532,11 @@ sal_Bool CommandLineArgs::InterpretComma
-         AddStringListParam_Impl( CMD_STRINGPARAM_SPLASHPIPE, aArgStr.Copy( 13 ) );
+         SetBoolParam_Impl( CMD_BOOLPARAM_HELPMATH, sal_True );
          return sal_True;
      }
 +    else if ( aArgStr.Copy(0, 10).EqualsIgnoreCaseAscii( "-infilter=" ))
diff --git a/patches/dev300/python-win32-buildfix.diff b/patches/dev300/python-win32-buildfix.diff
index 24246c4..0c17fe1 100644
--- a/patches/dev300/python-win32-buildfix.diff
+++ b/patches/dev300/python-win32-buildfix.diff
@@ -1,4 +1,3 @@
-diff --git a/python/Python-2.6.1.patch b/python/Python-2.6.1.patch
 --- python/Python-2.6.1.patch
 +++ python/Python-2.6.1.patch
 @@ -120,6 +120,180 @@
@@ -182,7 +181,6 @@ diff --git a/python/Python-2.6.1.patch b/python/Python-2.6.1.patch
  --- misc/Python-2.6.1/Lib/test/test_threading.py.bak	2009-03-12 07:59:17.000000000 +0000
  +++ misc/build/Python-2.6.1/Lib/test/test_threading.py	2009-03-12 10:48:04.000000000 +0000
  @@ -382,7 +382,7 @@
-diff --git a/python/Python-ssl.patch b/python/Python-ssl.patch
 --- python/Python-ssl.patch
 +++ python/Python-ssl.patch
 @@ -208,3 +208,165 @@
@@ -351,7 +349,6 @@ diff --git a/python/Python-ssl.patch b/python/Python-ssl.patch
 + if __name__=='__main__':
 +-    main()
 ++    sys.exit(0)
-diff --git a/python/makefile.mk b/python/makefile.mk
 --- python/makefile.mk
 +++ python/makefile.mk
 @@ -113,16 +113,20 @@
@@ -372,14 +369,13 @@ diff --git a/python/makefile.mk b/python/makefile.mk
  # ensures that certain *.pyc files are generated which would otherwise be created on
  # solver during registration in insetoo_native
 -.IF "$(SYSBASE)" != ""
- BUILD_ACTION=$(COMPATH)$/vcpackages$/vcbuild.exe -useenv pcbuild.sln "Release|Win32"
+-BUILD_ACTION=$(COMPATH)$/vcpackages$/vcbuild.exe -useenv pcbuild.sln "Release|Win32"
 -.ELSE
--BUILD_ACTION=$(COMPATH)$/vcpackages$/vcbuild.exe pcbuild.sln "Release|Win32"
+ BUILD_ACTION=$(COMPATH)$/vcpackages$/vcbuild.exe pcbuild.sln "Release|Win32"
 -.ENDIF # "$(SYSBASE)" != ""
  .ENDIF
  .ENDIF
  
-diff --git a/python/prj/d.lst b/python/prj/d.lst
 --- python/prj/d.lst
 +++ python/prj/d.lst
 @@ -104,6 +104,48 @@