ooo-build r14347 - in trunk: . patches/dev300

From: jholesovsky svn gnome org
To: svn-commits-list gnome org
Subject: ooo-build r14347 - in trunk: . patches/dev300
Date: Mon, 20 Oct 2008 11:51:24 +0000 (UTC)
Author: jholesovsky
Date: Mon Oct 20 11:51:24 2008
New Revision: 14347
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14347&view=rev

Log:
        * patches/dev300/mingw-buildfix-cppunit.diff,
          patches/dev300/mingw-buildfix-fpicker.diff,
          patches/dev300/mingw-buildfix-libxslt.diff,
          patches/dev300/mingw-buildfix-openssl.diff,
          patches/dev300/mingw-buildfix-solenv.diff,
          patches/dev300/mingw-buildfix-sal.diff,
          patches/dev300/mingw-buildfix-testshl2.diff: Trivial build fixes.

        * patches/dev300/mingw-buildfix-odma.diff: Build fix for odma - not
          up-stream.

        * patches/dev300/mingw-cpp-increase-include-limit.diff: More allowed
          -I's in OOo's cpp [for scp2].

        * patches/dev300/mingw-avoid-ms-assembler.diff: Don't use MS assembler
          for MinGW.

        * patches/dev300/mingw-do-not-interfere-with-cygwin.diff: Make MinGW
          in Cygwin actually work.

        * patches/dev300/mingw-thread-wait-instead-of-sleep.diff: Sleep using
          osl::Thread::wait().

        * patches/dev300/mingw-build-without-stlport-setup_native.diff,
          patches/dev300/mingw-build-without-stlport-shell.diff,
          patches/dev300/mingw-build-without-stlport-soltools.diff,
          patches/dev300/mingw-build-without-stlport-stlport.diff: Make it
          build --without-stlport.

	* patches/dev300/apply: Apply the changes.


Added:
   trunk/patches/dev300/mingw-avoid-ms-assembler.diff
   trunk/patches/dev300/mingw-build-without-stlport-setup_native.diff
   trunk/patches/dev300/mingw-build-without-stlport-shell.diff
   trunk/patches/dev300/mingw-build-without-stlport-soltools.diff
   trunk/patches/dev300/mingw-build-without-stlport-stlport.diff
   trunk/patches/dev300/mingw-buildfix-cppunit.diff
   trunk/patches/dev300/mingw-buildfix-fpicker.diff
   trunk/patches/dev300/mingw-buildfix-libxslt.diff
   trunk/patches/dev300/mingw-buildfix-odma.diff
   trunk/patches/dev300/mingw-buildfix-openssl.diff
   trunk/patches/dev300/mingw-buildfix-sal.diff
   trunk/patches/dev300/mingw-buildfix-solenv.diff
   trunk/patches/dev300/mingw-buildfix-testshl2.diff
   trunk/patches/dev300/mingw-cpp-increase-include-limit.diff
   trunk/patches/dev300/mingw-do-not-interfere-with-cygwin.diff
   trunk/patches/dev300/mingw-thread-wait-instead-of-sleep.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Mon Oct 20 11:51:24 2008
@@ -31,7 +31,8 @@
 Experimental: VBAUntested, ArkOnlyExperimental, \
 	      UnUsedButNotYetRemovedFromSVN, WebDAVUpstream, \
 	      PostgreSQL, SELinux, VOSremoval, Glib2, \
-	      UnitBootstrap, RadioButtons, UnstableLibwpd, WWInProgress, KDE4
+	      UnitBootstrap, RadioButtons, UnstableLibwpd, WWInProgress, \
+	      KDE4, MinGW
 DebianLooseSections: DebianBaseNoHelpContent, DebianBaseSystemJFreeReport, \
 	             DebianBaseSystemApacheCommons, DebianBaseSystemLucene
 # Optional sections
@@ -2706,6 +2707,41 @@
 instset-macos-langpacks.diff, i#64937, cloph
 sal-disable-backtrace.diff, thorsten
 
+
+[ MinGW ]
+SectionOwner => jholesov
+
+# trivial build fixes
+mingw-buildfix-cppunit.diff, i#95190, jholesov
+mingw-buildfix-fpicker.diff, i#95190, jholesov
+mingw-buildfix-libxslt.diff, i#95190, jholesov
+mingw-buildfix-openssl.diff, i#95190, jholesov
+mingw-buildfix-solenv.diff, i#95190, jholesov
+mingw-buildfix-sal.diff, i#95190, jholesov
+mingw-buildfix-testshl2.diff, i#95190, jholesov
+
+# build fix for odma - not up-stream
+mingw-buildfix-odma.diff, jholesov
+
+# more alloved -I's in OOo's cpp [for scp2]
+mingw-cpp-increase-include-limit.diff, i#95193, jholesov
+
+# don't use MS assembler for MinGW
+mingw-avoid-ms-assembler.diff, i#95194, jholesov
+
+# make MinGW in Cygwin actually work
+mingw-do-not-interfere-with-cygwin.diff, i#95198, jholesov
+
+# sleep using osl::Thread::wait()
+mingw-thread-wait-instead-of-sleep.diff, i#95200, jholesov
+
+# make it build --without-stlport
+mingw-build-without-stlport-setup_native.diff, i#95203, jholesov
+mingw-build-without-stlport-shell.diff, i#95203, jholesov
+mingw-build-without-stlport-soltools.diff, i#95203, jholesov
+mingw-build-without-stlport-stlport.diff, i#95203, jholesov
+
+
 [ Fuzz ]
 # Fuzzing work n#228555
 crash-sot.diff, i#94845, michael

Added: trunk/patches/dev300/mingw-avoid-ms-assembler.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/mingw-avoid-ms-assembler.diff	Mon Oct 20 11:51:24 2008
@@ -0,0 +1,147 @@
+diff --git basic/source/runtime/makefile.mk basic/source/runtime/makefile.mk
+index 4f354ad..fdec029 100644
+--- basic/source/runtime/makefile.mk
++++ basic/source/runtime/makefile.mk
+@@ -61,10 +61,14 @@ SLOFILES=	\
+ SLOFILES+=	$(SLO)$/win.obj
+ .ENDIF
+ 
+-.IF "$(GUI)$(CPU)" == "WNTI"
++.IF "$(GUI)$(COM)$(CPU)" == "WNTMSCI"
+ SLOFILES+=	$(SLO)$/wnt.obj
+ .ENDIF
+ 
++.IF "$(GUI)$(COM)$(CPU)" == "WNTGCCI"
++SLOFILES+=	$(SLO)$/wnt-mingw.obj
++.ENDIF
++
+ .IF "$(GUI)$(CPU)" == "OS2I"
+ #FIXME SLOFILES+= $(SLO)$/os2.obj
+ .ENDIF
+@@ -80,3 +84,10 @@ EXCEPTIONSFILES=$(SLO)$/step0.obj	\
+ 
+ .INCLUDE :  target.mk
+ 
++$(SLO)$/%.obj: %.s
++#kendy: Cut'n'paste from bridges/source/cpp_uno/mingw_intel/makefile.mk
++#cmc: Ideally --noexecstack would be in operations, but with #i51385# pyuno
++#remote bridgeing breaks
++#    $(CC) -Wa,--noexecstack -c -o $(SLO)$/$(@:b).o $<
++    $(CC) -c -o $(SLO)$/$(@:b).obj $<
++    touch $@
+diff --git basic/source/runtime/wnt-mingw.s basic/source/runtime/wnt-mingw.s
+new file mode 100644
+index 0000000..b42c527
+--- /dev/null
++++ basic/source/runtime/wnt-mingw.s
+@@ -0,0 +1,97 @@
++#*************************************************************************
++#
++# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++# 
++# Copyright 2008 by Sun Microsystems, Inc.
++#
++# OpenOffice.org - a multi-platform office productivity suite
++#
++# $RCSfile: wnt.asm,v $
++#
++# $Revision: 1.4 $
++#
++# This file is part of OpenOffice.org.
++#
++# OpenOffice.org is free software: you can redistribute it and/or modify
++# it under the terms of the GNU Lesser General Public License version 3
++# only, as published by the Free Software Foundation.
++#
++# OpenOffice.org is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY# without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU Lesser General Public License version 3 for more details
++# (a copy is included in the LICENSE file that accompanied this code).
++#
++# You should have received a copy of the GNU Lesser General Public License
++# version 3 along with OpenOffice.org.  If not, see
++# <http://www.openoffice.org/license.html>
++# for a copy of the LGPLv3 License.
++#
++#*************************************************************************
++
++#    Anmerkungen
++#        Direktaufruf von C- und PASCAL-Routinen, Windows und OS/2
++#
++# Inhalt:
++# type = CallXXX (far *pProc, char *pStack, short nStack)
++#
++# Kopie des Basic-Stacks (nStack Bytes) auf den C-Stack
++# und Aufruf der Prozedur.
++
++		.intel_syntax
++		#.386
++
++#_TEXT		SEGMENT	DWORD PUBLIC 'CODE' USE32
++
++		#ASSUME 	CS:_TEXT
++
++.globl		_CallINT
++.globl		_CallLNG
++.globl		_CallDBL
++.globl		_CallSTR
++.globl		_CallFIX
++
++_CallINT:
++_CallLNG:
++_CallDBL:
++_CallSTR:
++
++_CallFIX:	PUSH	EBP
++		MOV	EBP,ESP
++		PUSH	ESI
++		PUSH	EDI
++
++		PUSH	ECX
++		PUSH	EDX
++
++		MOV	DX,DS
++		MOVZX	EAX,WORD PTR [EBP+16] # EAX == nStack
++		SUB	ESP,EAX       # Stack um nStack Bytes vergroessern
++		MOV	EDI,ESP
++		MOV	AX,SS
++		MOV	ES,AX	      # ES:EDI = Startadresse des fuer
++				      # Parameter reservierten Stackbereichs
++		MOV	ESI,[EBP+12]  # DS:ESI == pStack
++
++		MOVZX	ECX,WORD PTR [EBP+16] # ECX == nStack
++		SHR	ECX,1
++		CLD
++		JCXZ	$1
++	REP	MOVSW		      # Stack uebernehmen
++$1:		MOV	DS,DX
++		CALL	DWORD PTR [EBP+8]	# Aufruf der Prozedur
++		# CLI # unter NT nicht erlaubt (privileged instruction)
++		MOV	ESP,EBP
++		SUB	ESP,16	      # wegen gepushter Register
++				      # (ESI, EDI)
++		# STI
++		POP	EDX
++		POP	ECX
++		POP	EDI
++		POP	ESI
++		POP	EBP
++		RET	12
++
++#_TEXT		ENDS
++
++		#END
+diff --git config_office/configure.in config_office/configure.in
+index 37be0fb..f8a7d81 100644
+--- config_office/configure.in
++++ config_office/configure.in
+@@ -5101,7 +5101,7 @@ AC_SUBST(CYGWIN_PATH)
+ dnl ***************************************
+ dnl testing ml.exe assembler path
+ dnl ***************************************
+-if test "$_os" = "WINNT"; then
++if test "$_os" = "WINNT" -a "$WITH_MINGWIN" != "yes"; then
+   AC_MSG_CHECKING([ml.exe assembler path])
+   if test -n "$with_asm_home"; then
+     with_asm_home=`cygpath -u "$with_asm_home"`

Added: trunk/patches/dev300/mingw-build-without-stlport-setup_native.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/mingw-build-without-stlport-setup_native.diff	Mon Oct 20 11:51:24 2008
@@ -0,0 +1,268 @@
+diff --git setup_native/source/win32/customactions/languagepacks/makefile.mk setup_native/source/win32/customactions/languagepacks/makefile.mk
+index 6e999e2..5e82525 100644
+--- setup_native/source/win32/customactions/languagepacks/makefile.mk
++++ setup_native/source/win32/customactions/languagepacks/makefile.mk
+@@ -44,7 +44,9 @@ MINGW_NODLL=YES
+ 
+ .INCLUDE : settings.mk
+ 
++.IF "$(USE_SYSTEM_STL)" != "YES"
+ CFLAGS+=-D_STLP_USE_STATIC_LIB
++.ENDIF
+ 
+ #Disable precompiled header
+ CDEFS+=-Dnot_used_define_to_disable_pch
+@@ -60,8 +62,11 @@ SLOFILES =	$(SLO)$/lngpckinsthelper.obj \
+ 
+ STDSHL+=	\
+ 	$(ADVAPI32LIB)\
+-	$(MSILIB)\
+-	$(LIBSTLPORTST)								
++	$(MSILIB)
++
++.IF "$(USE_SYSTEM_STL)" != "YES"
++STDSHL+=$(LIBSTLPORTST)								
++.ENDIF
+ 
+ SHL1OBJS = $(SLOFILES)               \
+     $(SLO)$/seterror.obj
+diff --git setup_native/source/win32/customactions/patch/makefile.mk setup_native/source/win32/customactions/patch/makefile.mk
+index 974ad3f..911da23 100755
+--- setup_native/source/win32/customactions/patch/makefile.mk
++++ setup_native/source/win32/customactions/patch/makefile.mk
+@@ -43,7 +43,9 @@ MINGW_NODLL=YES
+ 
+ .INCLUDE : settings.mk
+ 
++.IF "$(USE_SYSTEM_STL)" != "YES"
+ CFLAGS+=-D_STLP_USE_STATIC_LIB
++.ENDIF
+ 
+ #Disable precompiled header
+ CDEFS+=-Dnot_used_define_to_disable_pch
+@@ -60,9 +62,12 @@ SLOFILES = \
+ STDSHL += \
+ 	$(ADVAPI32LIB)\
+ 	$(MSILIB)\
+-	$(LIBSTLPORTST) \
+         $(SHELL32LIB)								
+ 
++.IF "$(USE_SYSTEM_STL)" != "YES"
++STDSHL += $(LIBSTLPORTST)
++.ENDIF
++
+ .IF "$(COM)"=="GCC"
+ STDSHL+=	\
+ 	$(KERNEL32LIB)\
+diff --git setup_native/source/win32/customactions/quickstarter/makefile.mk setup_native/source/win32/customactions/quickstarter/makefile.mk
+index 5fa7b03..2063b17 100644
+--- setup_native/source/win32/customactions/quickstarter/makefile.mk
++++ setup_native/source/win32/customactions/quickstarter/makefile.mk
+@@ -46,7 +46,10 @@ MINGW_NODLL=YES
+ 
+ .INCLUDE : settings.mk
+ 
++.IF "$(USE_SYSTEM_STL)" != "YES"
+ CFLAGS+=-D_STLP_USE_STATIC_LIB
++.ENDIF
++
+ UWINAPILIB=
+ 
+ # --- Files --------------------------------------------------------
+@@ -56,8 +59,11 @@ UWINAPILIB=
+ STDSHL += \
+ 	$(ADVAPI32LIB)\
+ 	$(SHELL32LIB)\
+-	$(MSILIB)\
+-	$(LIBSTLPORTST)								
++	$(MSILIB)
++
++.IF "$(USE_SYSTEM_STL)" != "YES"
++STDSHL += $(LIBSTLPORTST)								
++.ENDIF
+ 
+ .IF "$(COM)"=="GCC"
+ STDSHL+=	\
+diff --git setup_native/source/win32/customactions/reg4allmsdoc/makefile.mk setup_native/source/win32/customactions/reg4allmsdoc/makefile.mk
+index fdebb13..482cdf4 100644
+--- setup_native/source/win32/customactions/reg4allmsdoc/makefile.mk
++++ setup_native/source/win32/customactions/reg4allmsdoc/makefile.mk
+@@ -42,7 +42,10 @@ USE_DEFFILE=TRUE
+ 
+ .INCLUDE : settings.mk
+ 
+-CFLAGS+=-DUNICODE -D_UNICODE -D_STLP_USE_STATIC_LIB
++CFLAGS+=-DUNICODE -D_UNICODE
++.IF "$(USE_SYSTEM_STL)" != "YES"
++CFLAGS+=-D_STLP_USE_STATIC_LIB
++.ENDIF
+ 
+ # --- Files --------------------------------------------------------
+ 
+@@ -57,8 +60,11 @@ SHL1STDLIBS=	$(KERNEL32LIB)\
+ 				$(ADVAPI32LIB)\
+ 				$(SHELL32LIB)\
+ 				$(MSILIB)\
+-				$(SHLWAPILIB)\
+-				$(LIBSTLPORTST)								
++				$(SHLWAPILIB)
++
++.IF "$(USE_SYSTEM_STL)" != "YES"
++SHL1STDLIBS+=$(LIBSTLPORTST)								
++.ENDIF
+ 
+ SHL1LIBS = $(SLB)$/$(TARGET).lib 
+ 
+diff --git setup_native/source/win32/customactions/reg4msdoc/makefile.mk setup_native/source/win32/customactions/reg4msdoc/makefile.mk
+index 2daaca5..c3d6b42 100644
+--- setup_native/source/win32/customactions/reg4msdoc/makefile.mk
++++ setup_native/source/win32/customactions/reg4msdoc/makefile.mk
+@@ -43,7 +43,10 @@ MINGW_NODLL=YES
+ 
+ .INCLUDE : settings.mk
+ 
+-CFLAGS+=-DUNICODE -D_UNICODE -D_STLP_USE_STATIC_LIB
++CFLAGS+=-DUNICODE -D_UNICODE
++.IF "$(USE_SYSTEM_STL)" != "YES"
++CFLAGS+=-D_STLP_USE_STATIC_LIB
++.ENDIF
+ 
+ # --- Files --------------------------------------------------------
+ 
+@@ -70,8 +73,11 @@ SHL1STDLIBS=	$(KERNEL32LIB)\
+ 				$(ADVAPI32LIB)\
+ 				$(SHELL32LIB)\
+ 				$(MSILIB)\
+-				$(SHLWAPILIB)\
+-				$(LIBSTLPORTST)								
++				$(SHLWAPILIB)
++
++.IF "$(USE_SYSTEM_STL)" != "YES"
++SHL1STDLIBS+=$(LIBSTLPORTST)								
++.ENDIF
+ 
+ SHL1LIBS = $(SLB)$/$(TARGET).lib 
+ 
+diff --git setup_native/source/win32/customactions/relnotes/makefile.mk setup_native/source/win32/customactions/relnotes/makefile.mk
+index 4bea6ce..fef2912 100644
+--- setup_native/source/win32/customactions/relnotes/makefile.mk
++++ setup_native/source/win32/customactions/relnotes/makefile.mk
+@@ -44,7 +44,11 @@ MINGW_NODLL=YES
+ 
+ .INCLUDE : settings.mk
+ 
+-CDEFS+=-DUNICODE -D_STLP_USE_STATIC_LIB
++CDEFS+=-DUNICODE
++.IF "$(USE_SYSTEM_STL)" != "YES"
++CDEFS+=-D_STLP_USE_STATIC_LIB
++.ENDIF
++
+ UWINAPILIB=
+ 
+ # --- Files --------------------------------------------------------
+@@ -56,8 +60,11 @@ SLOFILES =	$(SLO)$/relnotes.obj
+ STDSHL+=	\
+ 	$(ADVAPI32LIB)\
+ 	$(SHELL32LIB)\
+-	$(MSILIB)\
+-	$(LIBSTLPORTST)								
++	$(MSILIB)
++
++.IF "$(USE_SYSTEM_STL)" != "YES"
++STDSHL+=$(LIBSTLPORTST)								
++.ENDIF
+ 
+ SHL1LIBS = $(SLB)$/$(TARGET).lib 
+ 
+diff --git setup_native/source/win32/customactions/sellang/makefile.mk setup_native/source/win32/customactions/sellang/makefile.mk
+index 2b414a6..6a874ac 100644
+--- setup_native/source/win32/customactions/sellang/makefile.mk
++++ setup_native/source/win32/customactions/sellang/makefile.mk
+@@ -42,7 +42,9 @@ USE_DEFFILE=TRUE
+ 
+ .INCLUDE : settings.mk
+ 
++.IF "$(USE_SYSTEM_STL)" != "YES"
+ CFLAGS+=-D_STLP_USE_STATIC_LIB
++.ENDIF
+ 
+ # --- Files --------------------------------------------------------
+ 
+@@ -51,12 +53,15 @@ UWINAPILIB=
+ SLOFILES = \
+ 	$(SLO)$/sellang.obj
+ 
+-SHL1STDLIBS=	kernel32.lib\
+-				user32.lib\
+-				advapi32.lib\
+-				shell32.lib\
+-				msi.lib\
+-				$(LIBSTLPORTST)								
++SHL1STDLIBS=	$(KERNEL32LIB)\
++				$(USER32LIB)\
++				$(ADVAPI32LIB)\
++				$(SHELL32LIB)\
++				$(MSILIB)
++
++.IF "$(USE_SYSTEM_STL)" != "YES"
++SHL1STDLIBS+=$(LIBSTLPORTST)								
++.ENDIF
+ 
+ SHL1LIBS = $(SLB)$/$(TARGET).lib 
+ 
+diff --git setup_native/source/win32/customactions/shellextensions/makefile.mk setup_native/source/win32/customactions/shellextensions/makefile.mk
+index 3c4887f..c41f8fd 100644
+--- setup_native/source/win32/customactions/shellextensions/makefile.mk
++++ setup_native/source/win32/customactions/shellextensions/makefile.mk
+@@ -43,7 +43,9 @@ MINGW_NODLL=YES
+ 
+ .INCLUDE : settings.mk
+ 
++.IF "$(USE_SYSTEM_STL)" != "YES"
+ CFLAGS+=-D_STLP_USE_STATIC_LIB
++.ENDIF
+ 
+ #Disable precompiled header
+ CDEFS+=-Dnot_used_define_to_disable_pch
+@@ -71,9 +73,12 @@ SLOFILES = \
+ STDSHL += \
+ 	$(ADVAPI32LIB)\
+ 	$(MSILIB)\
+-	$(LIBSTLPORTST)\
+         $(SHELL32LIB)								
+ 
++.IF "$(USE_SYSTEM_STL)" != "YES"
++STDSHL += $(LIBSTLPORTST)
++.ENDIF
++
+ .IF "$(COM)"=="GCC"
+ STDSHL+=	\
+ 	$(KERNEL32LIB)\
+diff --git setup_native/source/win32/customactions/tools/makefile.mk setup_native/source/win32/customactions/tools/makefile.mk
+index f247f0f..ee972b1 100644
+--- setup_native/source/win32/customactions/tools/makefile.mk
++++ setup_native/source/win32/customactions/tools/makefile.mk
+@@ -44,7 +44,9 @@ MINGW_NODLL=YES
+ 
+ .INCLUDE : settings.mk
+ 
++.IF "$(USE_SYSTEM_STL)" != "YES"
+ CFLAGS+=-D_STLP_USE_STATIC_LIB
++.ENDIF
+ 
+ # --- Files --------------------------------------------------------
+ 
+@@ -59,8 +61,11 @@ SHL1OBJS = $(SLOFILES)
+ 
+ STDSHL+=	\
+ 	$(ADVAPI32LIB)\
+-	$(MSILIB)\
+-	$(LIBSTLPORTST)								
++	$(MSILIB)
++
++.IF "$(USE_SYSTEM_STL)" != "YES"
++STDSHL+=$(LIBSTLPORTST)								
++.ENDIF
+ 
+ #SHL1LIBS = $(SLB)$/$(TARGET).lib 
+ 

Added: trunk/patches/dev300/mingw-build-without-stlport-shell.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/mingw-build-without-stlport-shell.diff	Mon Oct 20 11:51:24 2008
@@ -0,0 +1,84 @@
+diff --git shell/inc/internal/thumbviewer.hxx shell/inc/internal/thumbviewer.hxx
+index 0028307..8cb9be3 100644
+--- shell/inc/internal/thumbviewer.hxx
++++ shell/inc/internal/thumbviewer.hxx
+@@ -37,6 +37,11 @@
+ #endif
+ #include <objidl.h>
+ #include <shlobj.h>
++#ifdef __MINGW32__
++#include <algorithm>
++using std::min;
++using std::max;
++#endif
+ #include <gdiplus.h>
+ #if defined _MSC_VER
+ #pragma warning(pop)
+diff --git shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx
+index 9cba529..f9ea776 100644
+--- shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx
++++ shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx
+@@ -470,7 +470,7 @@ SCODE STDMETHODCALLTYPE COooFilter::GetText(ULONG * pcwcBuffer, WCHAR * awcBuffe
+             return FILTER_E_NO_MORE_TEXT;
+         }
+         // Copy UNICODE characters in chunk buffer to output UNICODE buffer
+-        ULONG ulToCopy = min( *pcwcBuffer, m_ulUnicodeBufferLen - m_ulUnicodeCharsRead );
++        ULONG ulToCopy = std::min( *pcwcBuffer, m_ulUnicodeBufferLen - m_ulUnicodeCharsRead );
+         ZeroMemory(awcBuffer, sizeof(awcBuffer));    
+         wmemcpy( awcBuffer, m_pwsBuffer.c_str() + m_ulUnicodeCharsRead, ulToCopy );
+         m_ulUnicodeCharsRead += ulToCopy;
+diff --git shell/source/win32/shlxthandler/util/iso8601_converter.cxx shell/source/win32/shlxthandler/util/iso8601_converter.cxx
+index e5cb981..836d9e7 100644
+--- shell/source/win32/shlxthandler/util/iso8601_converter.cxx
++++ shell/source/win32/shlxthandler/util/iso8601_converter.cxx
+@@ -149,17 +149,35 @@ std::wstring iso8601_duration_to_local_duration(const std::wstring& iso8601durat
+         hours = buff;
+     }
+        
+-    std::wostringstream oss;
+-
+ #if defined(_MSC_VER) && defined(_M_X64)        
++    std::wostringstream oss;
+     oss << std::setw(2) << std::setfill(wchar_t('0')) << hours   << L":" <<
+            std::setw(2) << std::setfill(wchar_t('0')) << minutes << L":" << 
+            std::setw(2) << std::setfill(wchar_t('0')) << seconds;
++    return oss.str();
++#elif defined( __MINGW32__ )
++#define ADD_AS_PREFILLED( st, out ) \
++    if ( st.length() == 0 ) \
++        out += L"00"; \
++    else if ( st.length() == 1 ) \
++        out += L"0"; \
++    out += st;
++
++    std::wstring result;
++    ADD_AS_PREFILLED( hours, result )
++    result += L":";
++    ADD_AS_PREFILLED( minutes, result )
++    result += L":";
++    ADD_AS_PREFILLED( seconds, result )
++
++    return result;
++#undef ADD_AS_PREFILLED
+ #else
++    std::wostringstream oss;
+     oss << std::setw(2) << std::setfill('0') << hours   << L":" <<
+            std::setw(2) << std::setfill('0') << minutes << L":" << 
+            std::setw(2) << std::setfill('0') << seconds;
+-#endif    
+     return oss.str();
++#endif    
+ }
+ 
+diff --git shell/source/win32/simplemail/senddoc.cxx shell/source/win32/simplemail/senddoc.cxx
+index 937c139..5671d85 100644
+--- shell/source/win32/simplemail/senddoc.cxx
++++ shell/source/win32/simplemail/senddoc.cxx
+@@ -50,6 +50,7 @@
+ #include <iostream>
+ #include <vector>
+ #include <sstream>
++#include <stdexcept>
+ 
+ #if OSL_DEBUG_LEVEL > 2
+     void dumpParameter();

Added: trunk/patches/dev300/mingw-build-without-stlport-soltools.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/mingw-build-without-stlport-soltools.diff	Mon Oct 20 11:51:24 2008
@@ -0,0 +1,22 @@
+diff --git soltools/mkdepend/collectdircontent.cxx soltools/mkdepend/collectdircontent.cxx
+index 39fc2ec..4bcf1a5 100755
+--- soltools/mkdepend/collectdircontent.cxx
++++ soltools/mkdepend/collectdircontent.cxx
+@@ -26,7 +26,7 @@ void IncludesCollection::add_to_collection(const string& dirPath) {
+     };
+     do {
+         string winFileName(FindFileData.cFileName);
+-        transform(winFileName.begin(), winFileName.end(), winFileName.begin(), tolower);
++        transform(winFileName.begin(), winFileName.end(), winFileName.begin(), ::tolower);
+         dirContent.insert(winFileName);
+     } while (FindNextFile(hFind, &FindFileData));
+ #else
+@@ -47,7 +47,7 @@ void IncludesCollection::add_to_collection(const string& dirPath) {
+ 
+ bool IncludesCollection::exists(string filePath) {
+ #if defined( WNT )
+-    transform(filePath.begin(), filePath.end(), filePath.begin(), tolower);
++    transform(filePath.begin(), filePath.end(), filePath.begin(), ::tolower);
+ #endif // defined( WNT )
+     PathFilePair dirFile = split_path(filePath);
+     string dirPath = dirFile.first;

Added: trunk/patches/dev300/mingw-build-without-stlport-stlport.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/mingw-build-without-stlport-stlport.diff	Mon Oct 20 11:51:24 2008
@@ -0,0 +1,51 @@
+diff --git stlport/systemstl/vector stlport/systemstl/vector
+index 035160f..e60829d 100644
+--- stlport/systemstl/vector
++++ stlport/systemstl/vector
+@@ -33,7 +33,11 @@
+ 
+ #ifdef GCC
+ 
+-#include <ext/../vector>
++#ifdef __MINGW32__
++#  include <c++/vector>
++#else
++#  include <ext/../vector>
++#endif
+ 
+ namespace std
+ {
+diff --git stlport/systemstl/functional stlport/systemstl/functional
+index 063e79d..46dc1df 100644
+--- stlport/systemstl/functional
++++ stlport/systemstl/functional
+@@ -32,7 +32,11 @@
+ #define SYSTEM_STL_FUNCTIONAL
+ 
+ #ifdef GCC
+-#include <ext/../functional>
++#ifdef __MINGW32__
++#  include <c++/functional>
++#else
++#  include <ext/../functional>
++#endif
+ #include <ext/functional>
+ 
+ namespace std
+diff --git stlport/systemstl/numeric stlport/systemstl/numeric
+index 8095edc..bec887a 100644
+--- stlport/systemstl/numeric
++++ stlport/systemstl/numeric
+@@ -33,7 +33,11 @@
+ 
+ #ifdef GCC
+ #include <functional>
+-#include <ext/../numeric>
++#ifdef __MINGW32__
++#  include <c++/numeric>
++#else
++#  include <ext/../numeric>
++#endif
+ #include <ext/numeric>
+ 
+ namespace std

Added: trunk/patches/dev300/mingw-buildfix-cppunit.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/mingw-buildfix-cppunit.diff	Mon Oct 20 11:51:24 2008
@@ -0,0 +1,19 @@
+diff --git cppunit/source/win32/makefile.mk cppunit/source/win32/makefile.mk
+index 66b766c..bbf3278 100644
+--- cppunit/source/win32/makefile.mk
++++ cppunit/source/win32/makefile.mk
+@@ -52,12 +52,12 @@ LIB1OBJFILES= \
+ 
+ .IF "$(GUI)"=="WNT" 
+ .IF "$(COM)"=="GCC"
+-LIB2ARCHIV=$(LB)$/lib$(TARGET)$(DLLPOSTFIX).a
++LIB1ARCHIV=$(LB)$/lib$(TARGET)$(DLLPOSTFIX).a
+ .ENDIF
+ .ENDIF
+ 
+ .IF "$(GUI)" == "UNX"
+-LIB2ARCHIV=$(LB)$/lib$(TARGET)$(DLLPOSTFIX).a
++LIB1ARCHIV=$(LB)$/lib$(TARGET)$(DLLPOSTFIX).a
+ .ENDIF
+ 
+ # --- Targets ------------------------------------------------------

Added: trunk/patches/dev300/mingw-buildfix-fpicker.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/mingw-buildfix-fpicker.diff	Mon Oct 20 11:51:24 2008
@@ -0,0 +1,16 @@
+diff --git fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
+index f3b6754..f6846fa 100644
+--- fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
++++ fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
+@@ -547,7 +547,11 @@ void VistaFilePickerImpl::impl_sta_setFiltersOnDialog()
+     aLock.clear();
+     // <- SYNCHRONIZED
+ 
++#ifdef __MINGW32__
++	iDialog->QueryInterface(IID_IFileDialog, (void**)(&iCustomize));
++#else
+ 	iDialog.query(&iCustomize);
++#endif
+ 
+ 	COMDLG_FILTERSPEC	*pFilt = &lFilters[0];
+     iDialog->SetFileTypes(lFilters.size(), pFilt/*&lFilters[0]*/);

Added: trunk/patches/dev300/mingw-buildfix-libxslt.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/mingw-buildfix-libxslt.diff	Mon Oct 20 11:51:24 2008
@@ -0,0 +1,22 @@
+diff --git libxslt/makefile.mk libxslt/makefile.mk
+index 3b0c17e..4fb9b9a 100644
+--- libxslt/makefile.mk
++++ libxslt/makefile.mk
+@@ -59,7 +59,7 @@ PATCH_FILE_NAME=$(TARFILE_NAME).patch
+ .IF "$(COM)"=="GCC"
+ CONFIGURE_DIR=
+ CONFIGURE_ACTION=.$/configure
+-CONFIGURE_FLAGS=--enable-ipv6=no --without-crypto --without-python --enable-static=no --with-sax1=yes --build=i586-pc-mingw32 --host=i586-pc-mingw32 CFLAGS="$(xslt_CFLAGS) -D_MT" LDFLAGS="$(xslt_LDFLAGS) -no-undefined -L$(ILIB:s/;/ -L/)" LIBS="-lmingwthrd"  LIBXML2LIB=$(LIBXML2LIB) ZLIB3RDLIB=$(ZLIB3RDLIB) OBJDUMP="$(WRAPCMD) objdump"
++CONFIGURE_FLAGS=--enable-ipv6=no --without-crypto --without-python --enable-static=no --with-sax1=yes --build=i586-pc-mingw32 --host=i586-pc-mingw32 CFLAGS="$(xslt_CFLAGS) -D_MT" LDFLAGS="$(xslt_LDFLAGS) -no-undefined -L$(ILIB:s/;/ -L/)" LIBS="-lmingwthrd"  LIBXML2LIB=$(LIBXML2LIB) OBJDUMP="$(WRAPCMD) objdump"
+ BUILD_ACTION=chmod 777 xslt-config && $(GNUMAKE)
+ BUILD_FLAGS+= -j$(EXTMAXPROCESS)
+ BUILD_DIR=$(CONFIGURE_DIR)
+@@ -119,7 +119,7 @@ OUT2BIN+=xslt-config
+ .IF "$(COM)"=="GCC"
+ OUT2BIN+=libxslt$/.libs$/*.dll
+ OUT2BIN+=libexslt$/.libs$/*.dll
+-OUT2BIN+=xsltproc$/.libs$/*.exe*
++OUT2BIN+=xsltproc$/*.exe*
+ OUT2BIN+=xslt-config
+ .ELSE
+ OUT2LIB+=win32$/bin.msvc$/*.lib

Added: trunk/patches/dev300/mingw-buildfix-odma.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/mingw-buildfix-odma.diff	Mon Oct 20 11:51:24 2008
@@ -0,0 +1,64 @@
+diff --git solenv/inc/libs.mk solenv/inc/libs.mk
+index ec0767d..489cc52 100644
+--- solenv/inc/libs.mk
++++ solenv/inc/libs.mk
+@@ -32,8 +32,12 @@ LIBSMKREV!:="$$Revision: 1.138.4.1 $$"
+ 
+ .IF ("$(GUI)"=="UNX" || "$(COM)"=="GCC") && "$(GUI)"!="OS2"
+ 
++.IF "$(OS)$(COM)"=="WNTGCC"
++ODMA_LIB_LIB=-lodma_lib
++.ELSE
+ # No ODMA on UNX
+ ODMA_LIB_LIB= 
++.ENDIF
+ 
+ #
+ #externe libs in plattform.mk
+diff --git ucb/prj/d.lst ucb/prj/d.lst
+index 7b15e5b..35ba14c 100644
+--- ucb/prj/d.lst
++++ ucb/prj/d.lst
+@@ -25,6 +25,7 @@
+ ..\%__SRC%\misc\ucp*.sym %_DEST%\bin%_EXT%\ucp*.sym
+ 
+ ..\%__SRC%\slb\odma_lib.lib %_DEST%\lib%_EXT%\odma_lib.lib
++..\%__SRC%\lib\libodma_lib.* %_DEST%\lib%_EXT%\libodma_lib.*
+ ..\source\ucp\odma\odma.h %_DEST%\inc%_EXT%\odma.h
+ ..\source\ucp\odma\odma_lib.hxx %_DEST%\inc%_EXT%\odma_lib.hxx
+ 
+diff --git ucb/source/ucp/odma/makefile.mk ucb/source/ucp/odma/makefile.mk
+index dfe6cdf..de54c50 100644
+--- ucb/source/ucp/odma/makefile.mk
++++ ucb/source/ucp/odma/makefile.mk
+@@ -100,6 +100,7 @@ DEF2DES=UCB ODMA URL converter
+ SLO3FILES=$(SLO)$/odma_lib.obj
+ 
+ LIB3TARGET=$(SLB)$/odma_lib.lib
++LIB3ARCHIV=$(LB)$/libodma_lib.a
+ LIB3OBJFILES=$(SLO3FILES)
+ 
+ # --- Targets ----------------------------------------------------------
+diff --git ucb/source/ucp/odma/odma_main.cxx ucb/source/ucp/odma/odma_main.cxx
+index 6224d5b..15092af 100644
+--- ucb/source/ucp/odma/odma_main.cxx
++++ ucb/source/ucp/odma/odma_main.cxx
+@@ -44,9 +44,9 @@
+ */
+ 
+ #if (defined UNX) || (defined OS2)
+-void main( int argc, char * argv[] )
++int main( int argc, char * argv[] )
+ #else
+-void _cdecl main( int argc, char * argv[] )
++int _cdecl main( int argc, char * argv[] )
+ #endif
+ {
+ 	static ::rtl::OUString sProcess(RTL_CONSTASCII_USTRINGPARAM(SOFFICE));
+@@ -90,5 +90,6 @@ void _cdecl main( int argc, char * argv[] )
+ 		delete [] ustrArgumentList;
+ 		delete [] pArguments;
+ 	}
++	return 0;
+ }
+ 

Added: trunk/patches/dev300/mingw-buildfix-openssl.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/mingw-buildfix-openssl.diff	Mon Oct 20 11:51:24 2008
@@ -0,0 +1,63 @@
+diff --git openssl/makefile.mk openssl/makefile.mk
+index f76b998..b8120ed 100644
+--- openssl/makefile.mk
++++ openssl/makefile.mk
+@@ -106,14 +106,14 @@ OUT2INC += include/openssl/*
+ PATCH_FILE_NAME=opensslmingw.patch
+ .IF "$(USE_MINGW)" == "cygwin"
+ CONFIGURE_ACTION=$(PERL) configure
+-CONFIGURE_FLAGS=mingw shared 
++CONFIGURE_FLAGS=shared mingw
+ INSTALL_ACTION=mv libcrypto.a libcrypto_static.a && mv libcrypto.dll.a libcrypto.a && mv libssl.a libssl_static.a && mv libssl.dll.a libssl.a
+ OUT2LIB = libcrypto_static.*
+ OUT2LIB += libssl_static.*
+ OUT2LIB += libcrypto.*
+ OUT2LIB += libssl.*
+-OUT2BIN = ssleay32.dll
+-OUT2BIN += libeay32.dll
++OUT2BIN = ssleay32*.dll
++OUT2BIN += cryptoeay32*.dll
+ .ELSE
+ CONFIGURE_ACTION=
+ BUILD_ACTION=cmd /c "ms\mingw32"
+diff --git openssl/opensslmingw.patch openssl/opensslmingw.patch
+index 32c1105..1ae70c0 100755
+--- openssl/opensslmingw.patch
++++ openssl/opensslmingw.patch
+@@ -35,6 +35,23 @@
+   	$(LINK_SO_O)
+   link_a.cygwin:
+   	@ $(CALC_VERSIONS); \
++***************
++*** 264,270 ****
++  	SHLIB_SOVER=-$(LIBVERSION); \
++  	ALLSYMSFLAGS='-Wl,--whole-archive'; \
++  	NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
++! 	SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared $$base -Wl,-Bsymbolic -Wl,--out-implib,lib$(LIBNAME).dll.a"; \
++  	[ -f apps/$$SHLIB$$SHLIB_SUFFIX ] && rm apps/$$SHLIB$$SHLIB_SUFFIX; \
++  	[ -f test/$$SHLIB$$SHLIB_SUFFIX ] && rm test/$$SHLIB$$SHLIB_SUFFIX; \
++  	$(LINK_SO_A) || exit 1; \
++--- 264,270 ----
++  	SHLIB_SOVER=-$(LIBVERSION); \
++  	ALLSYMSFLAGS='-Wl,--whole-archive'; \
++  	NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
++! 	SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared $$base -Wl,-Bsymbolic -Wl,--export-all-symbols -Wl,--out-implib,lib$(LIBNAME).dll.a"; \
++  	[ -f apps/$$SHLIB$$SHLIB_SUFFIX ] && rm apps/$$SHLIB$$SHLIB_SUFFIX; \
++  	[ -f test/$$SHLIB$$SHLIB_SUFFIX ] && rm test/$$SHLIB$$SHLIB_SUFFIX; \
++  	$(LINK_SO_A) || exit 1; \
+ *** misc/openssl-0.9.8g/ms/mingw32.bat	Fri May  5 22:19:33 2006
+ --- misc/build/openssl-0.9.8g/ms/mingw32.bat	Mon Feb  4 20:11:50 2008
+ ***************
+diff --git openssl/prj/d.lst openssl/prj/d.lst
+index 227e211..bd7bc14 100644
+--- openssl/prj/d.lst
++++ openssl/prj/d.lst
+@@ -4,6 +4,8 @@ mkdir: %_DEST%\inc%_EXT%\external\openssl
+ ..\%__SRC%\inc\*.h %_DEST%\inc%_EXT%\external\openssl
+ ..\%__SRC%\lib\ssleay32.lib %_DEST%\lib%_EXT%\ssleay32.lib
+ ..\%__SRC%\bin\ssleay32.dll %_DEST%\bin%_EXT%\ssleay32.dll
++..\%__SRC%\bin\cryptoeay32-0.9.8.dll %_DEST%\bin%_EXT%\cryptoeay32.dll
++..\%__SRC%\bin\ssleay32-0.9.8.dll %_DEST%\bin%_EXT%\ssleay32.dll
+ ..\%__SRC%\lib\libeay32.lib %_DEST%\lib%_EXT%\libeay32.lib
+ ..\%__SRC%\bin\libeay32.dll %_DEST%\bin%_EXT%\libeay32.dll
+ ..\%__SRC%\lib\libcrypto.a %_DEST%\lib%_EXT%\libcrypto.a

Added: trunk/patches/dev300/mingw-buildfix-sal.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/mingw-buildfix-sal.diff	Mon Oct 20 11:51:24 2008
@@ -0,0 +1,29 @@
+diff --git sal/util/makefile.mk sal/util/makefile.mk
+index a8212fc..3614a63 100644
+--- sal/util/makefile.mk
++++ sal/util/makefile.mk
+@@ -97,7 +97,12 @@ SHL1VERSIONMAP=	$(TARGET).map
+ SHL1RPATH=URELIB
+ 
+ .IF "$(GUI)"=="WNT"
++
++.IF "$(COM)"=="GCC"
++UWINAPILIB=     -luwinapi
++.ELSE
+ UWINAPILIB=     $(LB)$/uwinapi.lib
++.ENDIF
+ 
+ SHL1STDLIBS=	\
+ 				$(UWINAPILIB)\
+@@ -169,11 +174,7 @@ SHL1OBJS= \
+ .ENDIF # UNX
+ .ENDIF # lincinc
+ 
+-.IF "$(GUI)"=="WNT"
+-SHL1DEPN=   $(UWINAPILIB)
+-.ELSE
+ SHL1DEPN=
+-.ENDIF
+ SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
+ 
+ DEF1NAME= $(SHL1TARGET)

Added: trunk/patches/dev300/mingw-buildfix-solenv.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/mingw-buildfix-solenv.diff	Mon Oct 20 11:51:24 2008
@@ -0,0 +1,15 @@
+diff --git solenv/inc/wntgcci6.mk solenv/inc/wntgcci6.mk
+index 1bff6c8..61cf1db 100644
+--- solenv/inc/wntgcci6.mk
++++ solenv/inc/wntgcci6.mk
+@@ -107,7 +107,9 @@ MODULES_WITH_WARNINGS := \
+ STATIC= -static
+ DYNAMIC= -dynamic
+ 
+-LINK*=$(CC)
++LINK*=$(CXX)
++LINKC*=$(CC)
++
+ CYGLIB=$(LIB:s/;/ -L/)
+ LINKFLAGS=-nostdlib -Wl,--enable-stdcall-fixup,--enable-runtime-pseudo-reloc -L$(CYGLIB)
+ .IF "$(USE_MINGW)"=="cygwin"

Added: trunk/patches/dev300/mingw-buildfix-testshl2.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/mingw-buildfix-testshl2.diff	Mon Oct 20 11:51:24 2008
@@ -0,0 +1,41 @@
+diff --git testshl2/source/makefile.mk testshl2/source/makefile.mk
+index 0686e02..d2e8d4b 100644
+--- testshl2/source/makefile.mk
++++ testshl2/source/makefile.mk
+@@ -74,17 +74,20 @@ APP1STDLIBS=$(SALLIB)
+ # 	$(SOLARLIBDIR)$/c5t_no_regallfkt.lib \
+ # 	$(SOLARLIBDIR)$/c5t_testresult.lib
+ 
+-.IF "$(GUI)" == "WNT" || "$(GUI)" == "OS2"
++.IF "$(GUI)$(COM)" == "WNTMSC" || "$(GUI)" == "OS2"
+ APP1LIBS= \
+ 	$(SOLARLIBDIR)$/c5t_no_regallfkt.lib \
+ 	$(SOLARLIBDIR)$/c5t_testresult.lib
+ APP1LIBS += $(SOLARLIBDIR)$/c5t_winstuff.lib
+ .ENDIF
+ 
+-.IF "$(GUI)" == "UNX"
++.IF "$(GUI)" == "UNX" || "$(GUI)$(COM)" == "WNTGCC"
+ APP1STDLIBS+= \
+ 	$(SOLARLIBDIR)$/libc5t_testresult$(DLLPOSTFIX).a \
+ 	$(SOLARLIBDIR)$/libc5t_no_regallfkt$(DLLPOSTFIX).a
++.IF "$(GUI)$(COM)" == "WNTGCC"
++APP1STDLIBS += $(SOLARLIBDIR)$/libc5t_winstuff$(DLLPOSTFIX).a
++.ENDIF
+ .ENDIF
+ 
+ #
+@@ -107,8 +110,13 @@ APP3DEPN=
+ APP3LIBS= 
+ 
+ .IF "$(GUI)"=="WNT" 
++.IF "$(COM)"=="MSC"
+ APP3LIBS += $(SOLARLIBDIR)$/c5t_winstuff.lib
+ .ENDIF
++.IF "$(COM)"=="GCC"
++APP3STDLIBS += $(SOLARLIBDIR)$/libc5t_winstuff$(DLLPOSTFIX).a
++.ENDIF
++.ENDIF
+ 
+ 
+ # --- Targets ------------------------------------------------------

Added: trunk/patches/dev300/mingw-cpp-increase-include-limit.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/mingw-cpp-increase-include-limit.diff	Mon Oct 20 11:51:24 2008
@@ -0,0 +1,13 @@
+diff --git soltools/cpp/cpp.h soltools/cpp/cpp.h
+index e444168..6acadbb 100644
+--- soltools/cpp/cpp.h
++++ soltools/cpp/cpp.h
+@@ -3,7 +3,7 @@
+ #define	INS			32768	/* input buffer								*/
+ #define	OBS			8092    /* outbut buffer							*/
+ #define	NARG		32      /* Max number arguments to a macro			*/
+-#define	NINCLUDE	32      /* Max number of include directories (-I)	*/
++#define	NINCLUDE	48      /* Max number of include directories (-I)	*/
+ #define	NIF			64		/* depth of nesting of #if					*/
+ #define	NINC		32		/* depth of nesting of #include				*/
+ 

Added: trunk/patches/dev300/mingw-do-not-interfere-with-cygwin.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/mingw-do-not-interfere-with-cygwin.diff	Mon Oct 20 11:51:24 2008
@@ -0,0 +1,23 @@
+# Makes the MinGW build in Cygwin not interfering with the Cygwin itself.
+diff --git config_office/set_soenv.in config_office/set_soenv.in
+index 967e9f7..a4d2086 100644
+--- config_office/set_soenv.in
++++ config_office/set_soenv.in
+@@ -1175,8 +1175,7 @@ if ($platform =~ m/cygwin|os2/)
+                         $wps.$JAVA_HOME.$LIB;
+       if ( $USE_MINGW eq "cygwin" )
+       {  $ILIB    .= $wps.PathFormat($USR.$LIB.$ds."mingw").
+-                     $wps.PathFormat($USR.$LIB.$ds."w32api").
+-                     $wps.PathFormat($USR.$LIB);
++                     $wps.PathFormat($USR.$LIB.$ds."w32api");
+       }
+       else
+       {  $ILIB       .= $wps.$COMPATH.$LIB;
+@@ -1553,6 +1552,7 @@ elsif ($platform =~ m/cygwin/)
+    {  $SOLARINC       .= $I.'$SOLARVER'.$ds.'$INPATH'.$INC.$ds."external".$ds."mingw".$ds."include";
+      if ( $USE_MINGW eq "cygwin" )
+      {  $SOLARINC    .= $I.PathFormat($USR.$ds."include".$ds."mingw".$ds."include").
++                        $I.PathFormat($USR.$ds."include".$ds."mingw").
+                         $I.PathFormat($USR.$ds."include".$ds."w32api").
+                         $I.PathFormat($USR.$ds."include"); }
+      else

Added: trunk/patches/dev300/mingw-thread-wait-instead-of-sleep.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/mingw-thread-wait-instead-of-sleep.diff	Mon Oct 20 11:51:24 2008
@@ -0,0 +1,100 @@
+diff --git transex3/source/xmlparse.cxx transex3/source/xmlparse.cxx
+index 3b9bc34..58d1e6e 100644
+--- transex3/source/xmlparse.cxx
++++ transex3/source/xmlparse.cxx
+@@ -32,14 +32,14 @@
+ #include "precompiled_transex3.hxx"
+ #include <iterator> /* std::iterator*/
+ 
+-
+ #include <stdio.h>
+ #include <sal/alloca.h>
+ 
+ #include "xmlparse.hxx"
+ #include <fstream>
+ #include <iostream>
+-#include "osl/mutex.hxx"
++#include <osl/mutex.hxx>
++#include <osl/thread.hxx>
+ 
+ using namespace std;
+ using namespace osl;
+@@ -278,11 +278,11 @@ BOOL XMLFile::Write( ByteString &aFilename )
+             if( !aFStream )		// From time to time the stream can not be opened the first time on NFS volumes, 
+ 			{					// I wasn't able to track this down. I think this is an NFS issue .....
+                 //cerr << "ERROR: - helpex - Can't write to tempfile " << aFilename.GetBuffer() << " No#" << x << "\n";
+-#ifdef UNX                
+-                sleep( 3 );
+-#else
+-                Sleep( 3 );
+-#endif
++                TimeValue aTime;
++                aTime.Seconds = 3;
++                aTime.Nanosec = 0;
++
++                osl::Thread::wait( aTime );
+             }
+             else
+             {
+diff --git xmlhelp/source/com/sun/star/help/HelpCompiler.cxx xmlhelp/source/com/sun/star/help/HelpCompiler.cxx
+index 38804e7..7802dc0 100644
+--- xmlhelp/source/com/sun/star/help/HelpCompiler.cxx
++++ xmlhelp/source/com/sun/star/help/HelpCompiler.cxx
+@@ -37,6 +37,16 @@
+ #include <libxslt/xsltInternals.h>
+ #include <libxslt/transform.h>
+ #include <libxslt/xsltutils.h>
++#include <osl/thread.hxx>
++
++static void impl_sleep( sal_uInt32 nSec )
++{
++    TimeValue aTime;
++    aTime.Seconds = nSec;
++    aTime.Nanosec = 0;
++
++    osl::Thread::wait( aTime );
++}
+ 
+ HelpCompiler::HelpCompiler(StreamTable &in_streamTable, const fs::path &in_inputFile, 
+     const fs::path &in_src, const fs::path &in_resEmbStylesheet, 
+@@ -58,12 +68,8 @@ xmlDocPtr HelpCompiler::getSourceDocument(const fs::path &filePath)
+ 	{
+ 		res = xmlParseFile(filePath.native_file_string().c_str());
+         if( !res ){
+-#ifdef UNX
+-            sleep( 3 );
+-#else
+-            Sleep( 3 );
+-#endif
+-		    res = xmlParseFile(filePath.native_file_string().c_str());
++            impl_sleep( 3 );
++            res = xmlParseFile(filePath.native_file_string().c_str());
+         }
+ 	}
+ 	else
+@@ -87,11 +93,7 @@ xmlDocPtr HelpCompiler::getSourceDocument(const fs::path &filePath)
+ 		xmlDocPtr doc = xmlParseFile(filePath.native_file_string().c_str());
+ 		if( !doc )
+         {
+-#ifdef UNX
+-            sleep( 3 );
+-#else
+-            Sleep( 3 );
+-#endif
++            impl_sleep( 3 );
+             doc = xmlParseFile(filePath.native_file_string().c_str());
+         }
+ 
+@@ -412,11 +414,7 @@ bool HelpCompiler::compile( void ) throw( HelpProcessingException )
+     // resolve the dom
+     if (!docResolvedOrg)
+     {
+-#ifdef UNX
+-        sleep( 3 );
+-#else  
+-        Sleep( 3 );
+-#endif
++        impl_sleep( 3 );
+         docResolvedOrg = getSourceDocument(inputFile);
+         if( !docResolvedOrg )
+         {
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]