[Libreoffice-commits] .: patches/dev300
Michael Meeks
michael at kemper.freedesktop.org
Tue Nov 15 09:45:46 PST 2011
patches/dev300/apply | 64
patches/dev300/crosswin32-bridges-mingw.diff | 276
patches/dev300/crosswin32-connectivity-mingw.diff | 51
patches/dev300/crosswin32-cppuhelper-mingw.diff | 64
patches/dev300/crosswin32-dbaccess-mingw.diff | 50
patches/dev300/crosswin32-desktop-mingw.diff | 136
patches/dev300/crosswin32-embeddedobj-mingw.diff | 246
patches/dev300/crosswin32-extensions-mingw.diff | 26
patches/dev300/crosswin32-external-mingwheaders.diff | 61
patches/dev300/crosswin32-fpicker-mingw.diff | 277
patches/dev300/crosswin32-helpcontent2-mingw.diff | 18
patches/dev300/crosswin32-i18npool-cross.diff | 99
patches/dev300/crosswin32-i18npool-mingw.diff | 16
patches/dev300/crosswin32-icc-cross.diff | 16
patches/dev300/crosswin32-instsetoo_native-mingw.diff | 11
patches/dev300/crosswin32-odk-cross.diff | 23
patches/dev300/crosswin32-postprocess-mingw.diff | 26
patches/dev300/crosswin32-pyuno-mingw.diff | 31
patches/dev300/crosswin32-sal-mingw-c.diff | 230
patches/dev300/crosswin32-sal-mingw.diff | 109
patches/dev300/crosswin32-sccomp-mingw.diff | 23
patches/dev300/crosswin32-scp2-mingw.diff | 274
patches/dev300/crosswin32-setup_native-mingw.diff | 18
patches/dev300/crosswin32-shell-mingw.diff | 327
patches/dev300/crosswin32-solenv-mingw-installer.diff | 58
patches/dev300/crosswin32-solenv-mingw.diff | 1069
patches/dev300/crosswin32-store-core.diff | 4118 ---
patches/dev300/crosswin32-store-registry.diff | 174
patches/dev300/crosswin32-svx-mingw.diff | 24
patches/dev300/crosswin32-sysui-mingw.diff | 10
patches/dev300/crosswin32-ugly-hacks.diff |20791 -----------------
patches/dev300/crosswin32-unotools-mingw.diff | 10
patches/dev300/crosswin32-vcl-mingw.diff | 425
patches/dev300/liberation_making_fix.diff | 11
patches/dev300/liberation_packaging_fix.diff | 36
patches/dev300/mingw-buildfix-odma.diff | 64
patches/dev300/mingw-cpp-increase-include-limit.diff | 13
patches/dev300/mingw-thread-wait-instead-of-sleep.diff | 100
38 files changed, 2 insertions(+), 29373 deletions(-)
New commits:
commit f48bbcd7564369ed287bef5416174e7f6e98160b
Author: Michael Meeks <michael.meeks at suse.com>
Date: Tue Nov 15 17:45:38 2011 +0000
Kill obsolete crosswin32, mingw, and liberation bundling patches
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 8fea623..84f5b74 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -19,12 +19,9 @@ Win32Common : Common, Win32Only, CliMonoCommon, CliComponent
Experimental: VBAUntested, ArkOnlyExperimental, \
UnUsedButNotYetRemovedFromGit, WebDAV, \
PostgreSQL, RadioButtons, WWInProgress, \
- KDE4Experimental, MinGW, \
- CrossWin32Patches, AutoLayout, \
+ KDE4Experimental, AutoLayout, \
Speed, GSoC2010, Toolbars, Win32Packaging
DebianLooseSections: DebianBaseNoHelpContent
-# Optional sections
-Optional : LiberationFontsOnWindows
# optional section for NLPSolver extension
NLPSolver : NLPSolverBits
#Localize
@@ -84,8 +81,7 @@ Win32 : Win32Common
# translate.org.za
translate-org-za-linux: translate-org-za-common, LinuxCommon, Common
translate-org-za-win32: translate-org-za-common, Win32Common, Common
-NovellLikeWin32: Win32Common, NovellOnly, MultilanguageWin32Only, \
- LiberationFontsOnWindows
+NovellLikeWin32: Win32Common, NovellOnly, MultilanguageWin32Only
# Novell
NovellWin32: NovellLikeWin32, NovellOnlyWin32, MultilanguageWin32Only, NovellWin32WritingAids, Win32Packaging
NovellWin32ISO: NovellLikeWin32, NovellOnlyWin32, MultilanguageWin32Only, NovellWin32WritingAids
@@ -107,8 +103,6 @@ OxygenOfficeLinux: OxygenOfficeLinuxCommon, OxygenOfficePalettes, OxygenOfficeDe
OxygenOfficeWindows: OxygenOfficeWin32Common, OxygenOfficePalettes, OxygenOfficeDefaultSettings, OxygenOfficeExtras, OxygenOfficeWin32Only
# Plain build; just with base build fixes
PlainLinux: PlainBuildFixes
-# Experimental crosscompile support
-CrossWin32 : CrossWin32Patches
# Generic Patch-less builds
Raw: RawCommon RawPatches
# LibreOffice
@@ -573,14 +567,7 @@ SectionOwner => arekm
# fix for macro browser crash
sfx2-badscript.diff, i#67976
-[ LiberationFontsOnWindows ]
-
-# Use Liberation fonts on Windows, too
-liberation_packaging_fix.diff, kami
-#liberation_making_fix.diff, kami
-
[ Win32Only ]
-
# 2 more makefiles in sysui are seriously broken #35628
# parallel-python-makefile_mk.diff # looks to be upstream
@@ -1294,18 +1281,6 @@ sw-do-not-capture-surround-through-objs-patch.diff, n#367341, i#18732, flr
# need to be fixed in Pootle; sent mail to l10n at es.libreoffice.org
# sc-autofilter-l10n-es.diff, i#103840, pmladek
-
-[ MinGW ]
-# build fix for odma - not up-stream
-mingw-buildfix-odma.diff, jholesov
-
-# more allowed -I's in OOo's cpp [for scp2]
-mingw-cpp-increase-include-limit.diff, i#95193, jholesov
-
-# sleep using osl::Thread::wait()
-mingw-thread-wait-instead-of-sleep.diff, i#95200, jholesov
-
-
[ OOXMLExport ]
# hack to ignore writerfilter when odf-converter is present
odf-converter-ignore-writerfilter.diff, n#348471, n#502173, jholesov
@@ -1345,41 +1320,6 @@ mysqlcppconn-mysqlclient-SONAME.diff
# link dynamically with liblpsolve55.so
system-lpsolve-rpath.diff, rengelha
-[ CrossWin32Patches ]
-# Experimental patches to crosscompile OOo for Win32
-crosswin32-connectivity-mingw.diff
-crosswin32-cppuhelper-mingw.diff
-crosswin32-dbaccess-mingw.diff
-crosswin32-desktop-mingw.diff
-crosswin32-embeddedobj-mingw.diff
-crosswin32-extensions-mingw.diff
-crosswin32-external-mingwheaders.diff
-crosswin32-fpicker-mingw.diff
-#crosswin32-helpcontent2-mingw.diff
-#crosswin32-i18npool-cross.diff
-crosswin32-i18npool-mingw.diff
-#crosswin32-icc-cross.diff
-crosswin32-instsetoo_native-mingw.diff
-#crosswin32-odk-cross.diff
-crosswin32-postprocess-mingw.diff
-#crosswin32-pyuno-mingw.diff
-crosswin32-sal-mingw-c.diff
-crosswin32-sal-mingw.diff
-crosswin32-sccomp-mingw.diff
-#crosswin32-scp2-mingw.diff
-crosswin32-setup_native-mingw.diff
-#crosswin32-shell-mingw.diff
-#crosswin32-solenv-mingw-installer.diff
-#crosswin32-solenv-mingw.diff
-#crosswin32-store-core.diff
-crosswin32-store-registry.diff
-#crosswin32-svx-mingw.diff
-crosswin32-sysui-mingw.diff
-crosswin32-unotools-mingw.diff
-#crosswin32-vcl-mingw.diff
-# things to fix later
-#crosswin32-ugly-hacks.diff
-
[ Speed ]
# don't throw unnecessary exceptions in sfx2
speed-sfx2-dont-throw-too-much.diff, i#107512, jholesov
diff --git a/patches/dev300/crosswin32-bridges-mingw.diff b/patches/dev300/crosswin32-bridges-mingw.diff
deleted file mode 100644
index 50514fb..0000000
--- a/patches/dev300/crosswin32-bridges-mingw.diff
+++ /dev/null
@@ -1,276 +0,0 @@
---- bridges/source/cpp_uno/mingw_intel/except.cxx.orig 2009-06-28 16:52:19.000000000 +0200
-+++ bridges/source/cpp_uno/mingw_intel/except.cxx 2009-06-28 16:56:26.000000000 +0200
-@@ -32,5 +32,6 @@
- #include "precompiled_bridges.hxx"
-
- #include <stdio.h>
-+#include <string.h>
- #include <cxxabi.h>
- #include <hash_map>
-
---- bridges/source/cpp_uno/mingw_intel/call.s.orig 2009-06-28 16:58:39.000000000 +0200
-+++ bridges/source/cpp_uno/mingw_intel/call.s 2009-06-29 13:08:00.000000000 +0200
-@@ -1,14 +1,11 @@
- .text
-
- .globl _privateSnippetExecutorGeneral
-- .type _privateSnippetExecutorGeneral, at function
-+ .def _privateSnippetExecutorGeneral; .scl 2; .type 32; .endef
- _privateSnippetExecutorGeneral:
--.LFBg:
- movl %esp,%ecx
- pushl %ebp # proper stack frame needed for exception handling
--.LCFIg0:
- movl %esp,%ebp
--.LCFIg1:
- subl $0x4,%esp # 32bit returnValue
- pushl %esp # 32bit &returnValue
- pushl %ecx # 32bit pCallStack
-@@ -18,18 +15,13 @@
- movl 16(%esp),%eax # 32bit returnValue
- leave
- ret
--.LFEg:
-- .size _privateSnippetExecutorGeneral,.-_privateSnippetExecutorGeneral
-
- .globl _privateSnippetExecutorVoid
-- .type _privateSnippetExecutorVoid, at function
-+ .def _privateSnippetExecutorVoid; .scl 2; .type 32; .endef
- _privateSnippetExecutorVoid:
--.LFBv:
- movl %esp,%ecx
- pushl %ebp # proper stack frame needed for exception handling
--.LCFIv0:
- movl %esp,%ebp
--.LCFIv1:
- pushl $0 # 32bit null pointer (returnValue not used)
- pushl %ecx # 32bit pCallStack
- pushl %edx # 32bit nVtableOffset
-@@ -37,18 +29,13 @@
- call _cpp_vtable_call
- leave
- ret
--.LFEv:
-- .size _privateSnippetExecutorVoid,.-_privateSnippetExecutorVoid
-
- .globl _privateSnippetExecutorHyper
-- .type _privateSnippetExecutorHyper, at function
-+ .def _privateSnippetExecutorHyper; .scl 2; .type 32; .endef
- _privateSnippetExecutorHyper:
--.LFBh:
- movl %esp,%ecx
- pushl %ebp # proper stack frame needed for exception handling
--.LCFIh0:
- movl %esp,%ebp
--.LCFIh1:
- subl $0x8,%esp # 64bit returnValue
- pushl %esp # 32bit &returnValue
- pushl %ecx # 32bit pCallStack
-@@ -59,18 +46,13 @@
- movl 20(%esp),%edx # 64bit returnValue, upper half
- leave
- ret
--.LFEh:
-- .size _privateSnippetExecutorHyper,.-_privateSnippetExecutorHyper
-
- .globl _privateSnippetExecutorFloat
-- .type _privateSnippetExecutorFloat, at function
-+ .def _privateSnippetExecutorFloat; .scl 2; .type 32; .endef
- _privateSnippetExecutorFloat:
--.LFBf:
- movl %esp,%ecx
- pushl %ebp # proper stack frame needed for exception handling
--.LCFIf0:
- movl %esp,%ebp
--.LCFIf1:
- subl $0x4,%esp # 32bit returnValue
- pushl %esp # 32bit &returnValue
- pushl %ecx # 32bit pCallStack
-@@ -80,18 +62,13 @@
- flds 16(%esp) # 32bit returnValue
- leave
- ret
--.LFEf:
-- .size _privateSnippetExecutorFloat,.-_privateSnippetExecutorFloat
-
- .globl _privateSnippetExecutorDouble
-- .type _privateSnippetExecutorDouble, at function
-+ .def _privateSnippetExecutorDouble; .scl 2; .type 32; .endef
- _privateSnippetExecutorDouble:
--.LFBd:
- movl %esp,%ecx
- pushl %ebp # proper stack frame needed for exception handling
--.LCFId0:
- movl %esp,%ebp
--.LCFId1:
- subl $0x8,%esp # 64bit returnValue
- pushl %esp # 32bit &returnValue
- pushl %ecx # 32bit pCallStack
-@@ -101,18 +78,13 @@
- fldl 16(%esp) # 64bit returnValue
- leave
- ret
--.LFEd:
-- .size _privateSnippetExecutorDouble,.-_privateSnippetExecutorDouble
-
- .globl _privateSnippetExecutorClass
-- .type _privateSnippetExecutorClass, at function
-+ .def _privateSnippetExecutorClass; .scl 2; .type 32; .endef
- _privateSnippetExecutorClass:
--.LFBc:
- movl %esp,%ecx
- pushl %ebp # proper stack frame needed for exception handling
--.LCFIc0:
- movl %esp,%ebp
--.LCFIc1:
- subl $0x4,%esp # 32bit returnValue
- pushl %esp # 32bit &returnValue
- pushl %ecx # 32bit pCallStack
-@@ -122,147 +94,3 @@
- movl 16(%esp),%eax # 32bit returnValue
- leave
- ret $4
--.LFEc:
-- .size _privateSnippetExecutorClass,.-_privateSnippetExecutorClass
--
-- .section .eh_frame,"a", at progbits
--.Lframe1:
-- .long .LECIE1-.LSCIE1 # length
--.LSCIE1:
-- .long 0 # CIE_ID
-- .byte 1 # version
-- .string "zR" # augmentation
-- .uleb128 1 # code_alignment_factor
-- .sleb128 -4 # data_alignment_factor
-- .byte 8 # return_address_register
-- .uleb128 1 # augmentation size 1:
-- .byte 0x1B # FDE Encoding (pcrel sdata4)
-- # initial_instructions:
-- .byte 0x0C # DW_CFA_def_cfa %esp, 4
-- .uleb128 4
-- .uleb128 4
-- .byte 0x88 # DW_CFA_offset ret, 1
-- .uleb128 1
-- .align 4
--.LECIE1:
--.LSFDEg:
-- .long .LEFDEg-.LASFDEg # length
--.LASFDEg:
-- .long .LASFDEg-.Lframe1 # CIE_pointer
-- .long .LFBg-. # initial_location
-- .long .LFEg-.LFBg # address_range
-- .uleb128 0 # augmentation size 0
-- # instructions:
-- .byte 0x04 # DW_CFA_advance_loc4
-- .long .LCFIg0-.LFBg
-- .byte 0x0E # DW_CFA_def_cfa_offset 8
-- .uleb128 8
-- .byte 0x85 # DW_CFA_offset %ebp, 2
-- .uleb128 2
-- .byte 0x04 # DW_CFA_advance_loc4
-- .long .LCFIg1-.LCFIg0
-- .byte 0x0D # DW_CFA_def_cfa_register %ebp
-- .uleb128 5
-- .align 4
--.LEFDEg:
--.LSFDEv:
-- .long .LEFDEv-.LASFDEv # length
--.LASFDEv:
-- .long .LASFDEv-.Lframe1 # CIE_pointer
-- .long .LFBv-. # initial_location
-- .long .LFEv-.LFBv # address_range
-- .uleb128 0 # augmentation size 0
-- # instructions:
-- .byte 0x04 # DW_CFA_advance_loc4
-- .long .LCFIv0-.LFBv
-- .byte 0x0E # DW_CFA_def_cfa_offset 8
-- .uleb128 8
-- .byte 0x85 # DW_CFA_offset %ebp, 2
-- .uleb128 2
-- .byte 0x04 # DW_CFA_advance_loc4
-- .long .LCFIv1-.LCFIv0
-- .byte 0x0D # DW_CFA_def_cfa_register %ebp
-- .uleb128 5
-- .align 4
--.LEFDEv:
--.LSFDEh:
-- .long .LEFDEh-.LASFDEh # length
--.LASFDEh:
-- .long .LASFDEh-.Lframe1 # CIE_pointer
-- .long .LFBh-. # initial_location
-- .long .LFEh-.LFBh # address_range
-- .uleb128 0 # augmentation size 0
-- # instructions:
-- .byte 0x04 # DW_CFA_advance_loc4
-- .long .LCFIh0-.LFBh
-- .byte 0x0E # DW_CFA_def_cfa_offset 8
-- .uleb128 8
-- .byte 0x85 # DW_CFA_offset %ebp, 2
-- .uleb128 2
-- .byte 0x04 # DW_CFA_advance_loc4
-- .long .LCFIh1-.LCFIh0
-- .byte 0x0D # DW_CFA_def_cfa_register %ebp
-- .uleb128 5
-- .align 4
--.LEFDEh:
--.LSFDEf:
-- .long .LEFDEf-.LASFDEf # length
--.LASFDEf:
-- .long .LASFDEf-.Lframe1 # CIE_pointer
-- .long .LFBf-. # initial_location
-- .long .LFEf-.LFBf # address_range
-- .uleb128 0 # augmentation size 0
-- # instructions:
-- .byte 0x04 # DW_CFA_advance_loc4
-- .long .LCFIf0-.LFBf
-- .byte 0x0E # DW_CFA_def_cfa_offset 8
-- .uleb128 8
-- .byte 0x85 # DW_CFA_offset %ebp, 2
-- .uleb128 2
-- .byte 0x04 # DW_CFA_advance_loc4
-- .long .LCFIf1-.LCFIf0
-- .byte 0x0D # DW_CFA_def_cfa_register %ebp
-- .uleb128 5
-- .align 4
--.LEFDEf:
--.LSFDEd:
-- .long .LEFDEd-.LASFDEd # length
--.LASFDEd:
-- .long .LASFDEd-.Lframe1 # CIE_pointer
-- .long .LFBd-. # initial_location
-- .long .LFEd-.LFBd # address_range
-- .uleb128 0 # augmentation size 0
-- # instructions:
-- .byte 0x04 # DW_CFA_advance_loc4
-- .long .LCFId0-.LFBd
-- .byte 0x0E # DW_CFA_def_cfa_offset 8
-- .uleb128 8
-- .byte 0x85 # DW_CFA_offset %ebp, 2
-- .uleb128 2
-- .byte 0x04 # DW_CFA_advance_loc4
-- .long .LCFId1-.LCFId0
-- .byte 0x0D # DW_CFA_def_cfa_register %ebp
-- .uleb128 5
-- .align 4
--.LEFDEd:
--.LSFDEc:
-- .long .LEFDEc-.LASFDEc # length
--.LASFDEc:
-- .long .LASFDEc-.Lframe1 # CIE_pointer
-- .long .LFBc-. # initial_location
-- .long .LFEc-.LFBc # address_range
-- .uleb128 0 # augmentation size 0
-- # instructions:
-- .byte 0x04 # DW_CFA_advance_loc4
-- .long .LCFIc0-.LFBc
-- .byte 0x0E # DW_CFA_def_cfa_offset 8
-- .uleb128 8
-- .byte 0x85 # DW_CFA_offset %ebp, 2
-- .uleb128 2
-- .byte 0x04 # DW_CFA_advance_loc4
-- .long .LCFIc1-.LCFIc0
-- .byte 0x0D # DW_CFA_def_cfa_register %ebp
-- .uleb128 5
-- .align 4
--.LEFDEc:
-- .section .note.GNU-stack,"", at progbits
diff --git a/patches/dev300/crosswin32-connectivity-mingw.diff b/patches/dev300/crosswin32-connectivity-mingw.diff
deleted file mode 100644
index 0538af2..0000000
--- a/patches/dev300/crosswin32-connectivity-mingw.diff
+++ /dev/null
@@ -1,51 +0,0 @@
---- connectivity/source/inc/odbc/OFunctiondefs.hxx.~1.17.~ 2008-04-10 13:43:33.000000000 +0200
-+++ connectivity/source/inc/odbc/OFunctiondefs.hxx 2008-10-31 15:24:26.000000000 +0100
-@@ -32,7 +32,14 @@
- #ifndef _CONNECTIVITY_OFUNCTIONDEFS_HXX_
- #define _CONNECTIVITY_OFUNCTIONDEFS_HXX_
-
--#if defined(WIN) || defined(WNT)
-+#if defined(__MINGW32__)
-+
-+#include <windows.h>
-+#define SDB_ODBC_CHAR SQLCHAR
-+#include <odbcinst.h>
-+#include <sqlext.h>
-+
-+#elif defined(WIN) || defined(WNT)
-
- #ifdef _MSC_VER
- #pragma warning(push)
---- connectivity/source/inc/adabas/BDriver.hxx.~1.13.~ 2008-04-10 12:43:47.000000000 +0200
-+++ connectivity/source/inc/adabas/BDriver.hxx 2008-10-31 15:24:26.000000000 +0100
-@@ -31,6 +31,8 @@
- #ifndef _CONNECTIVITY_ADABAS_BDRIVER_HXX_
- #define _CONNECTIVITY_ADABAS_BDRIVER_HXX_
-
-+#include <sal/types.h>
-+
- #include <com/sun/star/sdbc/XDriver.hpp>
- #include <com/sun/star/sdbcx/XDataDefinitionSupplier.hpp>
- #include <com/sun/star/sdbcx/XTablesSupplier.hpp>
---- connectivity/source/inc/TResultSetHelper.hxx.~1.3.~ 2008-04-10 12:39:57.000000000 +0200
-+++ connectivity/source/inc/TResultSetHelper.hxx 2008-10-31 15:24:26.000000000 +0100
-@@ -33,6 +33,9 @@
-
- #include <sal/types.h>
-
-+#undef ABSOLUTE
-+#undef RELATIVE
-+
- namespace connectivity
- {
- class SAL_NO_VTABLE IResultSetHelper
---- connectivity/inc/connectivity/sdbcx/VDescriptor.hxx.~1.11.~ 2008-04-10 09:43:29.000000000 +0200
-+++ connectivity/inc/connectivity/sdbcx/VDescriptor.hxx 2008-10-31 15:24:26.000000000 +0100
-@@ -32,6 +32,7 @@
- #define _CONNECTIVITY_SDBCX_DESCRIPTOR_HXX_
-
- #include <comphelper/propertycontainer.hxx>
-+#undef OPTIONAL
- #include <com/sun/star/beans/PropertyAttribute.hpp>
- #include <com/sun/star/lang/XServiceInfo.hpp>
- #include <cppuhelper/typeprovider.hxx>
diff --git a/patches/dev300/crosswin32-cppuhelper-mingw.diff b/patches/dev300/crosswin32-cppuhelper-mingw.diff
deleted file mode 100644
index 59768df..0000000
--- a/patches/dev300/crosswin32-cppuhelper-mingw.diff
+++ /dev/null
@@ -1,64 +0,0 @@
---- cppuhelper/source/shlib.cxx.pristine 2009-04-08 13:32:45.090439917 +0200
-+++ cppuhelper/source/shlib.cxx 2009-04-08 16:20:54.526067518 +0200
-@@ -100,7 +100,14 @@ static const ::std::vector< OUString > *
- if (FileBase::getFileURLFromSystemPath(aStr, aFileUrl)
- != FileBase::E_None)
- {
-- OSL_ASSERT(false);
-+#if OSL_DEBUG_LEVEL > 1
-+ out( "*** getFileURLFromSystemPath failed for: " );
-+ out( aStr );
-+#endif
-+#ifdef __MINGW32__
-+ continue;
-+#endif /* __MINGW32__ */
-+ OSL_ASSERT(false);
- }
- s_v.push_back( aFileUrl );
- } while( nIndex != -1 );
-@@ -172,6 +179,8 @@ static bool checkAccessPath( OUString *
- #endif
- }
-
-+ OUString aBaseDirPlusFileColonSlashSlash
-+ = OUString::createFromAscii ("file://") + aBaseDir;
- if (0 == aAbs.indexOf( aBaseDir ) && // still part of it?
- aBaseDir.getLength() < aAbs.getLength() &&
- (aBaseDir[ aBaseDir.getLength() -1 ] == (sal_Unicode)'/' ||
-@@ -186,6 +195,19 @@ static bool checkAccessPath( OUString *
- return true;
- }
- #if OSL_DEBUG_LEVEL > 1
-+ else if (0 == aAbs.indexOf( aBaseDirPlusFileColonSlashSlash ) && // still part of it?
-+ aBaseDirPlusFileColonSlashSlash.getLength() < aAbs.getLength() &&
-+ (aBaseDirPlusFileColonSlashSlash[ aBaseDirPlusFileColonSlashSlash.getLength() -1 ] == (sal_Unicode)'/' ||
-+ // dir boundary
-+ aAbs[ aBaseDirPlusFileColonSlashSlash.getLength() ] == (sal_Unicode)'/'))
-+ {
-+#if OSL_DEBUG_LEVEL > 1
-+ out( ": ok [adding file://].\n" );
-+#endif
-+ // load from absolute path
-+ *pComp = aAbs;
-+ return true;
-+ }
- else
- {
- out( "\" ...does not match given path \"" );
---- cppuhelper/source/bootstrap.cxx.pristine 2009-04-08 15:48:48.595676127 +0200
-+++ cppuhelper/source/bootstrap.cxx 2009-04-08 15:48:22.621940816 +0200
-@@ -354,12 +354,14 @@ Reference< registry::XSimpleRegistry > n
- }
- catch(registry::InvalidRegistryException & invalidRegistryException)
- {
-+#ifndef __MINGW32__
- if (! optional)
- {
- // if a registry was explicitly given, the exception shall fly
- if( ! bFallenBack )
- throw;
- }
-+#endif /* __MINGW32__ */
-
- (void) invalidRegistryException;
- #if OSL_DEBUG_LEVEL > 1
diff --git a/patches/dev300/crosswin32-dbaccess-mingw.diff b/patches/dev300/crosswin32-dbaccess-mingw.diff
deleted file mode 100644
index ab4939f..0000000
--- a/patches/dev300/crosswin32-dbaccess-mingw.diff
+++ /dev/null
@@ -1,50 +0,0 @@
---- dbaccess/source/ui/dlg/makefile.mk.pristine 2008-04-10 16:59:00.000000000 +0200
-+++ dbaccess/source/ui/dlg/makefile.mk 2009-02-16 15:51:44.000000000 +0100
-@@ -131,7 +131,7 @@ SLOFILES= \
- $(SLO)$/dlgsize.obj \
- $(SLO)$/dlgattr.obj
-
--.IF "$(WINDOWS_VISTA_PSDK)"!="" && "$(PROF_EDITION)"==""
-+.IF ("$(WINDOWS_VISTA_PSDK)"!="" && "$(PROF_EDITION)"=="") || "$(TARGET_OS)" == "MinGW"
- DISABLE_ADO=TRUE
- .ENDIF # "$(WINDOWS_VISTA_PSDK)"!="" && "$(PROF_EDITION)"==""
-
---- dbaccess/source/ui/dlg/odbcconfig.cxx.~2~ 2008-11-05 10:14:38.000000000 +0100
-+++ dbaccess/source/ui/dlg/odbcconfig.cxx 2008-11-04 17:22:07.000000000 +0100
-@@ -31,6 +31,15 @@
- // MARKER(update_precomp.py): autogen include statement, do not remove
- #include "precompiled_dbaccess.hxx"
-
-+#ifdef __MINGW32__
-+#define Rectangle W32_Rectangle
-+#include <windows.h>
-+#define SDB_ODBC_CHAR SQLCHAR
-+#include <odbcinst.h>
-+#include <sqlext.h>
-+#undef Yield
-+#endif /* __MINGW32__ */
-+
- #ifndef _DBAUI_ODBC_CONFIG_HXX_
- #include "odbcconfig.hxx"
- #endif
-@@ -52,6 +61,9 @@
- #ifndef _TOOLS_DEBUG_HXX
- #include <tools/debug.hxx>
- #endif
-+#ifdef __MINGW32__
-+#undef Rectangle
-+#endif /* __MINGW32__ */
- #ifndef _SV_SVAPP_HXX
- #include <vcl/svapp.hxx>
- #endif
---- dbaccess/source/ui/dlg/ConnectionHelper.cxx.~1.19.~ 2008-05-05 17:56:49.000000000 +0200
-+++ dbaccess/source/ui/dlg/ConnectionHelper.cxx 2009-02-16 21:37:10.000000000 +0100
-@@ -149,7 +149,7 @@
- #ifndef _SFX_DOCFILT_HACK_HXX
- #include <sfx2/docfilt.hxx>
- #endif
--#if !defined(WINDOWS_VISTA_PSDK) && (defined(WIN) || defined(WNT))
-+#if !defined(WINDOWS_VISTA_PSDK) && !defined(__MINGW32__) && (defined(WIN) || defined(WNT))
- #define _ADO_DATALINK_BROWSE_
- #endif
-
diff --git a/patches/dev300/crosswin32-desktop-mingw.diff b/patches/dev300/crosswin32-desktop-mingw.diff
deleted file mode 100644
index f312bff..0000000
--- a/patches/dev300/crosswin32-desktop-mingw.diff
+++ /dev/null
@@ -1,136 +0,0 @@
---- desktop/win32/source/setup/setup_w.cxx.~1.5.~ 2008-04-11 06:50:30.000000000 +0200
-+++ desktop/win32/source/setup/setup_w.cxx 2008-11-05 15:53:43.000000000 +0100
-@@ -34,5 +34,9 @@
- #define UNICODE 1
- #define _UNICODE 1
-
-+#ifdef __MINGW32__
-+#define _ttempnam(a, b) (TCHAR*)tempnam ((char*)a, (char*)b)
-+#endif
-+
- #include "setup.cpp"
-
---- desktop/win32/source/setup/setup_a.cxx.~1.5.~ 2008-04-11 06:49:31.000000000 +0200
-+++ desktop/win32/source/setup/setup_a.cxx 2008-11-05 15:52:36.000000000 +0100
-@@ -31,4 +31,8 @@
- // MARKER(update_precomp.py): autogen include statement, do not remove
- #include "precompiled_desktop.hxx"
-
-+#ifdef __MINGW32__
-+#define _ttempnam tempnam
-+#endif
-+
- #include "setup.cpp"
---- desktop/win32/source/setup/rcheader.txt.~1.6.~ 2008-01-15 14:33:41.000000000 +0100
-+++ desktop/win32/source/setup/rcheader.txt 2008-11-05 15:16:00.000000000 +0100
-@@ -7,7 +7,7 @@
- #define CB_ADDSTRING (WM_USER+3)
- #define IDC_STATIC (-1)
- #endif
--#include "resource.h"
-+#include "Resource.h"
-
- /////////////////////////////////////////////////////////////////////////////
- //
---- desktop/win32/source/setup/setup.cpp.~1.15.12.1.~ 2008-09-03 15:00:32.000000000 +0200
-+++ desktop/win32/source/setup/setup.cpp 2008-11-05 15:52:16.000000000 +0100
-@@ -49,7 +49,7 @@
-
- #include "setup.hxx"
-
--#include "resource.h"
-+#include "Resource.h"
-
- //--------------------------------------------------------------------------
-
---- desktop/win32/source/setup/makefile.mk.~1.12.~ 2008-04-11 06:48:48.000000000 +0200
-+++ desktop/win32/source/setup/makefile.mk 2008-11-05 15:19:13.000000000 +0100
-@@ -91,5 +91,9 @@
- .INCLUDE : target.mk
-
- $(RCFILES) : $(ULFDIR)$/setup.ulf makefile.mk rcfooter.txt rcheader.txt rctmpl.txt
-+.IF "$(CROSS_COMPILING)" == "yes"
-+ $(WRAPCMD) wine $(SOLARBINDIR)/lngconvex.exe -ulf $(ULFDIR)$/setup.ulf -rc $(RCFILES) -rct rctmpl.txt -rch rcheader.txt -rcf rcfooter.txt
-+.ELSE
- $(LNGCONVEX) -ulf $(ULFDIR)$/setup.ulf -rc $(RCFILES) -rct rctmpl.txt -rch rcheader.txt -rcf rcfooter.txt
-+.ENDIF
-
---- /dev/null 2009-04-14 12:16:08.000000000 +0200
-+++ desktop/win32/source/setup/strsafe.h 2009-07-15 16:53:22.000000000 +0200
-@@ -0,0 +1,45 @@
-+//http://baseutils.googlecode.com/svn/trunk/str_strsafe.h
-+
-+/* Written by Krzysztof Kowalczyk (http://blog.kowalczyk.info)
-+ The author disclaims copyright to this source code. */
-+#ifndef __STR_STRSAFE_H
-+#define __STR_STRSAFE_H
-+
-+/* When using MSVC, use <strsafe.h>, emulate it on other compiler (e.g. mingw) */
-+
-+#define DISABLE_STRSAFE
-+#ifndef DISABLE_STRSAFE
-+ #include <strsafe.h>
-+#else
-+ #include <stdio.h>
-+ #include <string.h>
-+ #include <windows.h>
-+ #define STRSAFE_E_INSUFFICIENT_BUFFER -1
-+ #define _vsnprintf_s(p,s,z,f,a) vsnprintf(p,s,f,a)
-+
-+#ifndef min
-+ #define min(a,b) ((a)<(b)?(a):(b))
-+#endif
-+
-+ /* WARNING: the return values of these two pairs of functions aren't
-+ compatible. The strsafe functions return an error code and the standard C
-+ functions return a character count */
-+ #define StringCchVPrintfA vsnprintf
-+ #define StringCchVPrintfW vsnprintf
-+ #define StringCchVPrintf vsnprintf
-+
-+ #define StringCchPrintfA(str, n, format, ...) snprintf ((char*)str, n, (char const*)format, __VA_ARGS__)
-+ #define StringCchPrintfW(str, n, format, ...) snprintf ((char*)str, n, (char const*)format, __VA_ARGS__)
-+ #define StringCchPrintf(str, n, format, ...) snprintf ((char*)str, n, (char const*)format, __VA_ARGS__)
-+
-+ #define StringCchCopy(dest, n, src) strncpy ((char*)dest, (char const*)src, n)
-+ #define StringCchCopyN(dest, n1, src, n2) strncpy ((char*)dest, (char const*)src, min (n1, n2))
-+ #define StringCchCat(dest, n, src) strncat ((char*)dest, (char const*)src, n)
-+
-+ #define STRSAFE_MAX_CCH 0x7FFFFFFF
-+
-+ #define _stricmp strcasecmp
-+ #define _strnicmp strncasecmp
-+#endif
-+
-+#endif
-
---- desktop/source/pkgchk/unopkg/makefile.mk.~1.17.~ 2008-07-22 19:16:08.000000000 +0200
-+++ desktop/source/pkgchk/unopkg/makefile.mk 2008-11-05 14:58:45.000000000 +0100
-@@ -55,7 +55,7 @@ APP1STDLIBS = $(SALLIB) $(UNOPKGAPPLIB)
- APP1DEPN = $(SHL1TARGETN)
- APP1NOSAL = TRUE
- APP1RPATH = BRAND
--.IF "$(OS)" == "WNT"
-+.IF "$(TARGET_OS)" == "WNT"
- APP1ICON = $(SOLARRESDIR)$/icons/so9_main_app.ico
- APP1LINKRES = $(MISC)$/$(TARGET)1.res
- .ENDIF
-@@ -66,7 +66,7 @@ APP2STDLIBS = $(SALLIB) $(UNOPKGAPPLIB)
- APP2DEPN = $(SHL1TARGETN)
- APP2NOSAL = TRUE
- APP2RPATH = BRAND
--.IF "$(OS)" == "WNT"
-+.IF "$(TARGET_OS)" == "WNT"
- APP2ICON = $(SOLARRESDIR)$/icons/ooo3_main_app.ico
- APP2LINKRES = $(MISC)$/$(TARGET)2.res
- .ENDIF
---- desktop/source/deployment/misc/dp_misc.cxx.pristine 2009-04-06 12:16:26.807994125 +0200
-+++ desktop/source/deployment/misc/dp_misc.cxx 2009-04-06 12:16:33.664089092 +0200
-@@ -55,6 +55,6 @@
- #define UNICODE
- #define _UNICODE
- #define WIN32_LEAN_AND_MEAN
--#include <Windows.h>
-+#include <windows.h>
- //#include "tools/postwin.h"
- #endif
diff --git a/patches/dev300/crosswin32-embeddedobj-mingw.diff b/patches/dev300/crosswin32-embeddedobj-mingw.diff
deleted file mode 100644
index 6aa88cf..0000000
--- a/patches/dev300/crosswin32-embeddedobj-mingw.diff
+++ /dev/null
@@ -1,246 +0,0 @@
---- embeddedobj/source/msole/olepersist.cxx.~1.39.~ 2008-07-22 16:39:36.000000000 +0200
-+++ embeddedobj/source/msole/olepersist.cxx 2008-11-03 15:52:02.000000000 +0100
-@@ -176,7 +176,7 @@ sal_Bool KillFile_Impl( const ::rtl::OUS
-
- return aResult;
- }
--#ifdef WNT
-+#if defined (WNT) && !defined (__CROSS__)
- ::rtl::OUString GetNewFilledTempFile_Impl( const uno::Reference< embed::XOptimizedStorage >& xParentStorage, const ::rtl::OUString& aEntryName, const uno::Reference< lang::XMultiServiceFactory >& xFactory )
- throw( io::IOException, uno::RuntimeException )
- {
-@@ -229,7 +229,7 @@ void LetCommonStoragePassBeUsed_Impl( co
- xPropSet->setPropertyValue( ::rtl::OUString::createFromAscii( "UseCommonStoragePasswordEncryption" ),
- uno::makeAny( (sal_Bool)sal_True ) );
- }
--#ifdef WNT
-+#if defined (WNT) && !defined (__CROSS__)
- //------------------------------------------------------
- void VerbExecutionController::StartControlExecution()
- {
-@@ -818,7 +818,7 @@ uno::Reference< io::XStream > OleEmbedde
- m_aTempURL = ::rtl::OUString();
- }
-
--#ifdef WNT
-+#if defined (WNT) && !defined (__CROSS__)
- // retry to create the component after recovering
- GetRidOfComponent();
-
-@@ -889,7 +889,7 @@ void OleEmbeddedObject::SwitchOwnPersist
- SwitchOwnPersistence( xNewParentStorage, xNewOwnStream, aNewName );
- }
-
--#ifdef WNT
-+#if defined (WNT) && !defined (__CROSS__)
- //----------------------------------------------
- sal_Bool OleEmbeddedObject::SaveObject_Impl()
- {
-@@ -1215,7 +1215,7 @@ void OleEmbeddedObject::StoreToLocation_
-
- sal_Bool bStoreLoaded = sal_False;
- if ( m_nObjectState == embed::EmbedStates::LOADED
--#ifdef WNT
-+#if defined (WNT) && !defined (__CROSS__)
- // if the object was NOT modified after storing it can be just copied
- // as if it was in loaded state
- || ( m_pOleComponent && !m_pOleComponent->IsDirty() )
-@@ -1255,7 +1255,7 @@ void OleEmbeddedObject::StoreToLocation_
- bVisReplIsStored = HasVisReplInStream();
- bStoreLoaded = sal_True;
- }
--#ifdef WNT
-+#if defined (WNT) && !defined (__CROSS__)
- else if ( m_pOleComponent )
- {
- xTargetStream =
-@@ -1457,7 +1457,7 @@ void SAL_CALL OleEmbeddedObject::setPers
- if ( lArguments[nInd].Name.equalsAscii( "ReadOnly" ) )
- lArguments[nInd].Value >>= m_bReadOnly;
-
--#ifdef WNT
-+#if defined (WNT) && !defined (__CROSS__)
- sal_Int32 nStorageMode = m_bReadOnly ? embed::ElementModes::READ : embed::ElementModes::READWRITE;
- #endif
-
-@@ -1467,7 +1467,7 @@ void SAL_CALL OleEmbeddedObject::setPers
- if ( lObjArgs[nInd].Name.equalsAscii( "StoreVisualReplacement" ) )
- lObjArgs[nInd].Value >>= m_bStoreVisRepl;
-
--#ifdef WNT
-+#if defined (WNT) && !defined (__CROSS__)
- if ( nEntryConnectionMode == embed::EntryInitModes::DEFAULT_INIT )
- {
- if ( m_bFromClipboard )
-@@ -1864,7 +1864,7 @@ void SAL_CALL OleEmbeddedObject::storeOw
-
- sal_Bool bStoreLoaded = sal_True;
-
--#ifdef WNT
-+#if defined (WNT) && !defined (__CROSS__)
- if ( m_nObjectState != embed::EmbedStates::LOADED && m_pOleComponent && m_pOleComponent->IsDirty() )
- {
- bStoreLoaded = sal_False;
-@@ -2078,7 +2078,7 @@ void SAL_CALL OleEmbeddedObject::breakLi
- uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
-
-
--#ifdef WNT
-+#if defined (WNT) && !defined (__CROSS__)
- if ( m_pOleComponent )
- {
- // TODO: create an object based on the link
---- embeddedobj/source/msole/oleembed.cxx.~1.24.~ 2008-07-22 16:39:09.000000000 +0200
-+++ embeddedobj/source/msole/oleembed.cxx 2008-11-03 15:52:51.000000000 +0100
-@@ -63,7 +63,7 @@
-
- using namespace ::com::sun::star;
-
--#ifdef WNT
-+#if defined (WNT) && !defined (__CROSS__)
- //----------------------------------------------
- void OleEmbeddedObject::SwitchComponentToRunningState_Impl()
- {
-@@ -478,7 +478,7 @@ void SAL_CALL OleEmbeddedObject::changeS
- if ( m_nObjectState == nNewState )
- return;
-
--#ifdef WNT
-+#if defined (WNT) && !defined (__CROSS__)
- if ( m_pOleComponent )
- {
- if ( m_nTargetState != -1 )
-@@ -631,7 +631,7 @@ uno::Sequence< sal_Int32 > SAL_CALL OleE
- throw embed::WrongStateException( ::rtl::OUString::createFromAscii( "The object has no persistence!\n" ),
- uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
-
--#ifdef WNT
-+#if defined (WNT) && !defined (__CROSS__)
- if ( m_pOleComponent )
- {
- if ( m_nObjectState == embed::EmbedStates::LOADED )
-@@ -705,7 +705,7 @@ void SAL_CALL OleEmbeddedObject::doVerb(
- throw embed::WrongStateException( ::rtl::OUString::createFromAscii( "The object has no persistence!\n" ),
- uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
-
--#ifdef WNT
-+#if defined (WNT) && !defined (__CROSS__)
- if ( m_pOleComponent )
- {
- sal_Int32 nOldState = m_nObjectState;
-@@ -822,7 +822,7 @@ uno::Sequence< embed::VerbDescriptor > S
- if ( m_nObjectState == -1 )
- throw embed::WrongStateException( ::rtl::OUString::createFromAscii( "The object has no persistence!\n" ),
- uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
--#ifdef WNT
-+#if defined (WNT) && !defined (__CROSS__)
- if ( m_pOleComponent )
- {
- // registry could be used in this case
-@@ -987,7 +987,7 @@ sal_Int64 SAL_CALL OleEmbeddedObject::ge
-
- sal_Int64 nResult = 0;
-
--#ifdef WNT
-+#if defined (WNT) && !defined (__CROSS__)
- if ( m_bGotStatus && m_nStatusAspect == nAspect )
- nResult = m_nStatus;
- else if ( m_pOleComponent )
---- embeddedobj/source/msole/makefile.mk.~1.15.~ 2008-04-11 06:59:23.000000000 +0200
-+++ embeddedobj/source/msole/makefile.mk 2008-11-01 14:30:00.000000000 +0100
-@@ -74,7 +74,7 @@ EXCEPTIONSFILES= \
- $(SLO)$/olemisc.obj\
- $(SLO)$/ownview.obj
-
--.IF "$(GUI)"=="WNT"
-+.IF "$(GUI)"=="WNT" && "$(CROSS_COMPILING)" == "no"
-
- SLOFILES += \
- $(SLO)$/graphconvert.obj\
-@@ -90,7 +90,7 @@ EXCEPTIONSFILES += \
- $(SLO)$/xdialogcreator.obj\
- $(SLO)$/advisesink.obj
-
--.ENDIF
-+.ENDIF # "$(GUI)"=="WNT" && "$(CROSS_COMPILING)"
-
- SHL1OBJS= $(SLOFILES)
-
---- embeddedobj/source/msole/olemisc.cxx.~1.28.~ 2008-07-22 16:39:22.000000000 +0200
-+++ embeddedobj/source/msole/olemisc.cxx 2008-11-03 15:53:24.000000000 +0100
-@@ -112,7 +112,7 @@ OleEmbeddedObject::OleEmbeddedObject( co
- , m_bTriedConversion( sal_False )
- {
- }
--#ifdef WNT
-+#if defined (WNT) && !defined (__CROSS__)
- //------------------------------------------------------
- // this constructor let object be initialized from clipboard
- OleEmbeddedObject::OleEmbeddedObject( const uno::Reference< lang::XMultiServiceFactory >& xFactory )
-@@ -188,7 +188,7 @@ void OleEmbeddedObject::MakeEventListene
- }
- }
- }
--#ifdef WNT
-+#if defined (WNT) && !defined (__CROSS__)
- //----------------------------------------------
- void OleEmbeddedObject::StateChangeNotification_Impl( sal_Bool bBeforeChange, sal_Int32 nOldState, sal_Int32 nNewState )
- {
-@@ -233,7 +233,7 @@ void OleEmbeddedObject::StateChangeNotif
- //------------------------------------------------------
- void OleEmbeddedObject::GetRidOfComponent()
- {
--#ifdef WNT
-+#if defined (WNT) && !defined (__CROSS__)
- if ( m_pOleComponent )
- {
- if ( m_nObjectState != -1 && m_nObjectState != embed::EmbedStates::LOADED )
---- embeddedobj/source/msole/oleregister.cxx.~1.6.~ 2008-04-11 07:01:19.000000000 +0200
-+++ embeddedobj/source/msole/oleregister.cxx 2008-11-03 15:52:36.000000000 +0100
-@@ -65,7 +65,7 @@ void * SAL_CALL component_getFactory( co
- OleEmbeddedObjectFactory::impl_staticCreateSelfInstance,
- OleEmbeddedObjectFactory::impl_staticGetSupportedServiceNames() );
- }
--#ifdef WNT
-+#if defined (WNT) && !defined (__CROSS__)
- // the following service makes sence only on windows
- else if ( aImplName.equals( MSOLEDialogObjectCreator::impl_staticGetImplementationName() ) )
- {
-@@ -102,7 +102,7 @@ sal_Bool SAL_CALL component_writeInfo( v
- for( sal_Int32 ind = 0; ind < rServices.getLength(); ind++ )
- xNewKey->createKey( rServices.getConstArray()[ind] );
-
--#ifdef WNT
-+#if defined (WNT) && !defined (__CROSS__)
- // the following service makes sence only on windows
- xNewKey = xKey->createKey( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) +
- MSOLEDialogObjectCreator::impl_staticGetImplementationName() +
---- embeddedobj/source/msole/olevisual.cxx.~1.22.~ 2008-07-22 16:39:49.000000000 +0200
-+++ embeddedobj/source/msole/olevisual.cxx 2008-11-03 15:53:07.000000000 +0100
-@@ -120,7 +120,7 @@ void SAL_CALL OleEmbeddedObject::setVisu
- throw embed::WrongStateException( ::rtl::OUString::createFromAscii( "The object is not loaded!\n" ),
- uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
-
--#ifdef WNT
-+#if defined (WNT) && !defined (__CROSS__)
- // RECOMPOSE_ON_RESIZE misc flag means that the object has to be switched to running state on resize.
- // SetExtent() is called only for objects that require it,
- // it should not be called for MSWord documents to workaround problem i49369
-@@ -202,7 +202,7 @@ awt::Size SAL_CALL OleEmbeddedObject::ge
-
- awt::Size aResult;
-
--#ifdef WNT
-+#if defined (WNT) && !defined (__CROSS__)
- // TODO/LATER: Support different aspects
- if ( m_pOleComponent && !m_bHasSizeToSet && nAspect == embed::Aspects::MSOLE_CONTENT )
- {
-@@ -365,7 +365,7 @@ embed::VisualRepresentation SAL_CALL Ole
- {
- return GetVisualRepresentationInNativeFormat_Impl( m_xCachedVisualRepresentation );
- }
--#ifdef WNT
-+#if defined (WNT) && !defined (__CROSS__)
- else if ( m_pOleComponent )
- {
- try
diff --git a/patches/dev300/crosswin32-extensions-mingw.diff b/patches/dev300/crosswin32-extensions-mingw.diff
deleted file mode 100644
index e803e89..0000000
--- a/patches/dev300/crosswin32-extensions-mingw.diff
+++ /dev/null
@@ -1,26 +0,0 @@
---- extensions/source/nsplugin/source/nsplugin.rc.orig 2009-07-22 10:12:29.000000000 +0200
-+++ extensions/source/nsplugin/source/nsplugin.rc 2009-07-22 10:12:29.000000000 +0200
-@@ -27,7 +27,7 @@
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
--#define ADDITIONAL_VERINFO1 value "FileExtents", "sdc|sds|sda|sdd|sdp|smf|vor|sgl|sdw|sxc|stc|sxd|std|sxi|sti|sxm|sxw|sxg|stw|odt|ott|odm|oth|ods|ots|odg|otg|odp|otp|odf\0"\
-- value "FileOpenName", "StarCalc 3.0 - 5.0|StarChart 3.0 - 5.0|StarDraw 3.0 - 5.0|StarImpress 3.0 - 5.0|StarImpress-packed 3.0 - 5.0|StarMath 3.0 - 5.0|StarWriter Template 3.0 - 5.0|StarWriter Global 3.0 - 5.0|StarWriter 3.0 - 5.0|StarOffice 6.0/7 Spreadsheet|StarOffice 6.0/7 Spreadsheet Template|StarOffice 6.0/7 Drawing|StarOffice 6.0/7 Drawing Template|StarOffice 6.0/7 Presentation|StarOffice 6.0/7 Presentation Template|StarOffice 6.0/7 Formula|StarOffice 6.0/7 Text Document|StarOffice 6.0/7 Master Document|StarOffice 6.0/7 Text Document Template|OpenDocument Text|OpenDocument Text Template|OpenDocument Master Document|HTML Document Template|OpenDocument Spreadsheet|OpenDocument Spreadsheet Template|OpenDocument Drawing|OpenDocument Drawing Template|OpenDocument Presentation|OpenDocument Presentation Template|OpenDocument Formula\0"
--#define ADDITIONAL_VERINFO2 value "FileDescription", "StarOffice/StarSuite Plug-in handles all its documents" value "ProductName", "StarOffice/StarSuite Plug-in" value "MIMEType", "application/vnd.stardivision.calc|application/vnd.stardivision.chart|application/vnd.stardivision.draw|application/vnd.stardivision.impress|application/vnd.stardivision.impress-packed|application/vnd.stardivision.math|application/vnd.stardivision.writer|application/vnd.stardivision.writer-global|application/vnd.staroffice.writer|application/vnd.sun.xml.calc|application/vnd.sun.xml.calc.template|application/vnd.sun.xml.draw|application/vnd.sun.xml.draw.template|"
-+#define ADDITIONAL_VERINFO1 VALUE "FileExtents", "sdc|sds|sda|sdd|sdp|smf|vor|sgl|sdw|sxc|stc|sxd|std|sxi|sti|sxm|sxw|sxg|stw|odt|ott|odm|oth|ods|ots|odg|otg|odp|otp|odf\0"\
-+ VALUE "FileOpenName", "StarCalc 3.0 - 5.0|StarChart 3.0 - 5.0|StarDraw 3.0 - 5.0|StarImpress 3.0 - 5.0|StarImpress-packed 3.0 - 5.0|StarMath 3.0 - 5.0|StarWriter Template 3.0 - 5.0|StarWriter Global 3.0 - 5.0|StarWriter 3.0 - 5.0|StarOffice 6.0/7 Spreadsheet|StarOffice 6.0/7 Spreadsheet Template|StarOffice 6.0/7 Drawing|StarOffice 6.0/7 Drawing Template|StarOffice 6.0/7 Presentation|StarOffice 6.0/7 Presentation Template|StarOffice 6.0/7 Formula|StarOffice 6.0/7 Text Document|StarOffice 6.0/7 Master Document|StarOffice 6.0/7 Text Document Template|OpenDocument Text|OpenDocument Text Template|OpenDocument Master Document|HTML Document Template|OpenDocument Spreadsheet|OpenDocument Spreadsheet Template|OpenDocument Drawing|OpenDocument Drawing Template|OpenDocument Presentation|OpenDocument Presentation Template|OpenDocument Formula\0"
-+#define ADDITIONAL_VERINFO2 VALUE "FileDescription", "StarOffice/StarSuite Plug-in handles all its documents" VALUE "ProductName", "StarOffice/StarSuite Plug-in" VALUE "MIMEType", "application/vnd.stardivision.calc|application/vnd.stardivision.chart|application/vnd.stardivision.draw|application/vnd.stardivision.impress|application/vnd.stardivision.impress-packed|application/vnd.stardivision.math|application/vnd.stardivision.writer|application/vnd.stardivision.writer-global|application/vnd.staroffice.writer|application/vnd.sun.xml.calc|application/vnd.sun.xml.calc.template|application/vnd.sun.xml.draw|application/vnd.sun.xml.draw.template|"
- #define ADDITIONAL_VERINFO3 "application/vnd.sun.xml.impress|application/vnd.sun.xml.impress.template|application/vnd.sun.xml.math|application/vnd.sun.xml.writer|application/vnd.sun.xml.writer.global|application/vnd.sun.xml.writer.template|application/vnd.oasis.opendocument.text|application/vnd.oasis.opendocument.text-template|application/vnd.oasis.opendocument.text-master|application/vnd.oasis.opendocument.text-web|application/vnd.oasis.opendocument.spreadsheet|application/vnd.oasis.opendocument.spreadsheet-template|application/vnd.oasis.opendocument.graphics|application/vnd.oasis.opendocument.graphics-template|application/vnd.oasis.opendocument.presentation|application/vnd.oasis.opendocument.presentation-template|application/vnd.oasis.opendocument.formula\0"
---- extensions/source/nsplugin/source/nsplugin_oo.rc.orig 2009-07-22 10:12:29.000000000 +0200
-+++ extensions/source/nsplugin/source/nsplugin_oo.rc 2009-07-22 10:12:29.000000000 +0200
-@@ -27,7 +27,7 @@
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
--#define ADDITIONAL_VERINFO1 value "FileExtents", "sdc|sds|sda|sdd|sdp|smf|vor|sgl|sdw|sxc|stc|sxd|std|sxi|sti|sxm|sxw|sxg|stw|odt|ott|odm|oth|ods|ots|odg|otg|odp|otp|odf\0"\
-- value "FileOpenName", "StarCalc 3.0 - 5.0|StarChart 3.0 - 5.0|StarDraw 3.0 - 5.0|StarImpress 3.0 - 5.0|StarImpress-packed 3.0 - 5.0|StarMath 3.0 - 5.0|StarWriter Template 3.0 - 5.0|StarWriter Global 3.0 - 5.0|StarWriter 3.0 - 5.0|StarOffice 6.0/7 Spreadsheet|StarOffice 6.0/7 Spreadsheet Template|StarOffice 6.0/7 Drawing|StarOffice 6.0/7 Drawing Template|StarOffice 6.0/7 Presentation|StarOffice 6.0/7 Presentation Template|StarOffice 6.0/7 Formula|StarOffice 6.0/7 Text Document|StarOffice 6.0/7 Master Document|StarOffice 6.0/7 Text Document Template|OpenDocument Text|OpenDocument Text Template|OpenDocument Master Document|HTML Document Template|OpenDocument Spreadsheet|OpenDocument Spreadsheet Template|OpenDocument Drawing|OpenDocument Drawing Template|OpenDocument Presentation|OpenDocument Presentation Template|OpenDocument Formula\0"
--#define ADDITIONAL_VERINFO2 value "FileDescription", "OpenOffice.org Plug-in handles all its documents" value "ProductName", "OpenOffice.org Plug-in" value "MIMEType", "application/vnd.stardivision.calc|application/vnd.stardivision.chart|application/vnd.stardivision.draw|application/vnd.stardivision.impress|application/vnd.stardivision.impress-packed|application/vnd.stardivision.math|application/vnd.stardivision.writer|application/vnd.stardivision.writer-global|application/vnd.staroffice.writer|application/vnd.sun.xml.calc|application/vnd.sun.xml.calc.template|application/vnd.sun.xml.draw|application/vnd.sun.xml.draw.template|"
-+#define ADDITIONAL_VERINFO1 VALUE "FileExtents", "sdc|sds|sda|sdd|sdp|smf|vor|sgl|sdw|sxc|stc|sxd|std|sxi|sti|sxm|sxw|sxg|stw|odt|ott|odm|oth|ods|ots|odg|otg|odp|otp|odf\0"\
-+ VALUE "FileOpenName", "StarCalc 3.0 - 5.0|StarChart 3.0 - 5.0|StarDraw 3.0 - 5.0|StarImpress 3.0 - 5.0|StarImpress-packed 3.0 - 5.0|StarMath 3.0 - 5.0|StarWriter Template 3.0 - 5.0|StarWriter Global 3.0 - 5.0|StarWriter 3.0 - 5.0|StarOffice 6.0/7 Spreadsheet|StarOffice 6.0/7 Spreadsheet Template|StarOffice 6.0/7 Drawing|StarOffice 6.0/7 Drawing Template|StarOffice 6.0/7 Presentation|StarOffice 6.0/7 Presentation Template|StarOffice 6.0/7 Formula|StarOffice 6.0/7 Text Document|StarOffice 6.0/7 Master Document|StarOffice 6.0/7 Text Document Template|OpenDocument Text|OpenDocument Text Template|OpenDocument Master Document|HTML Document Template|OpenDocument Spreadsheet|OpenDocument Spreadsheet Template|OpenDocument Drawing|OpenDocument Drawing Template|OpenDocument Presentation|OpenDocument Presentation Template|OpenDocument Formula\0"
-+#define ADDITIONAL_VERINFO2 VALUE "FileDescription", "OpenOffice.org Plug-in handles all its documents" VALUE "ProductName", "OpenOffice.org Plug-in" VALUE "MIMEType", "application/vnd.stardivision.calc|application/vnd.stardivision.chart|application/vnd.stardivision.draw|application/vnd.stardivision.impress|application/vnd.stardivision.impress-packed|application/vnd.stardivision.math|application/vnd.stardivision.writer|application/vnd.stardivision.writer-global|application/vnd.staroffice.writer|application/vnd.sun.xml.calc|application/vnd.sun.xml.calc.template|application/vnd.sun.xml.draw|application/vnd.sun.xml.draw.template|"
- #define ADDITIONAL_VERINFO3 "application/vnd.sun.xml.impress|application/vnd.sun.xml.impress.template|application/vnd.sun.xml.math|application/vnd.sun.xml.writer|application/vnd.sun.xml.writer.global|application/vnd.sun.xml.writer.template|application/vnd.oasis.opendocument.text|application/vnd.oasis.opendocument.text-template|application/vnd.oasis.opendocument.text-master|application/vnd.oasis.opendocument.text-web|application/vnd.oasis.opendocument.spreadsheet|application/vnd.oasis.opendocument.spreadsheet-template|application/vnd.oasis.opendocument.graphics|application/vnd.oasis.opendocument.graphics-template|application/vnd.oasis.opendocument.presentation|application/vnd.oasis.opendocument.presentation-template|application/vnd.oasis.opendocument.formula\0"
diff --git a/patches/dev300/crosswin32-external-mingwheaders.diff b/patches/dev300/crosswin32-external-mingwheaders.diff
deleted file mode 100644
index fdf88c6..0000000
--- a/patches/dev300/crosswin32-external-mingwheaders.diff
+++ /dev/null
@@ -1,61 +0,0 @@
---- external/mingwheaders/makefile.mk 2009-12-03 15:56:23.000000000 +0100
-+++ external/mingwheaders/makefile.mk 2009-12-03 15:58:17.000000000 +0100
-@@ -35,17 +35,22 @@
-
- .INCLUDE : settings.mk
-
--.IF "$(OS)$(COM)" == "WNTGCC"
-+.IF "$(OS)$(COM)" == "WNTGCC" && "$(CROSS_COMPILING)" != "yes"
-
- # Cygwin and MinGW use different directories for the W32API headers
- .IF "$(USE_MINGW)" == "cygwin"
- MINGW_INCLUDE_DIR=$/usr$/include/mingw/
- MINGW_W32API_INCLUDE_DIR=$/usr$/include/w32api/
- MINGW_W32API_LIB_DIR=$/usr$/include/w32api/
--.ELSE
-+.ELIF "$(CROSS_COMPILING)" == "no"
- MINGW_INCLUDE_DIR=$(COMPATH)$/include/
- MINGW_W32API_INCLUDE_DIR=$(COMPATH)$/include/
- MINGW_W32API_LIB_DIR=$(COMPATH)$/lib/
-+.ELSE # "$(CROSS_COMPILING)" == "yes"
-+MINGW_INCLUDE_DIR=$(COMPATH)/../../include/
-+MINGW_W32API_INCLUDE_DIR=$(COMPATH)/../../include/
-+MINGW_W32API_LIB_DIR=$(COMPATH)/../../lib/
-+PSDK_HOME=$(COMPATH)/../..
- .ENDIF
-
- SYS_INCLUDE_DIR=$(MINGW_INCLUDE_DIR)$/sys/
-@@ -174,8 +179,10 @@
- $(COPY) $(FILES_TO_COPY_FROM_MINGW:^$(MINGW_INCLUDE_DIR)) $(MISC)$/mingw$/include
- $(COPY) $(FILES_TO_COPY_FROM_W32API:^$(MINGW_W32API_INCLUDE_DIR)) $(MISC)$/mingw$/include
- $(COPY) $(FILES_TO_COPY_FROM_SYS:^$(SYS_INCLUDE_DIR)) $(MISC)$/mingw$/include$/sys
-- $(COPY) $(FILES_TO_COPY_FROM_PSDK:^$(PSDK_INCLUDE_DIR)) $(MISC)$/mingw$/include
-+ $(COPY) $(FILES_TO_COPY_FROM_PSDK:^$(PSDK_INCLUDE_DIR)) $(MISC)$/mingw$/include || :
-+.IF "$(DIRECTXSDK_HOME)" != ""
- $(COPY) $(FILES_TO_COPY_FROM_DIRECTXSDK:^$(DIRECTXSDK_INCLUDE_DIR)) $(MISC)$/mingw$/include
-+.ENDIF # "$(DIRECTXSDK_HOME)" != ""
- $(TOUCH) $(MISC)$/mingwheader_copy
-
- .IF "$(DISABLE_ATL)"==""
-@@ -191,16 +198,16 @@
- .ELSE
- $(COPY) $(COMPATH)$/lib/libmsvcrt.a $(LB)$/libmsvcrt_orig.a
- .ENDIF
-- cd $(LB) && ar -x libmsvcrt_orig.a ofmt_stub.o
-- ar -d $(LB)$/libmsvcrt_orig.a ofmt_stub.o
-- nm -g --defined-only $(LB)$/libmsvcrt_orig.a > $(MISC)$/msvcrt.nm
-+ cd $(LB) && $(AR) -x libmsvcrt_orig.a ofmt_stub.o
-+ $(AR) -d $(LB)$/libmsvcrt_orig.a ofmt_stub.o
-+ $(NM) -g --defined-only $(LB)$/libmsvcrt_orig.a > $(MISC)$/msvcrt.nm
- echo EXPORTS > $(MISC)$/msvcrt.def
- sed -ne 's/.* T _//p' $(MISC)$/msvcrt.nm | sort >> $(MISC)$/msvcrt.def
- -sed -ne 's/.* I __imp__//p' $(MISC)$/msvcrt.nm | sort | diff - $(MISC)$/msvcrt.def | \
- sed -ne 's/^< \(.*\)$/\1 DATA/p' > $(MISC)$/msvcrtdata.def
- cat $(MISC)$/msvcrtdata.def >> $(MISC)$/msvcrt.def
-- dlltool --dllname msvcrt.dll --input-def=$(MISC)$/msvcrt.def --kill-at --output-lib=$(LB)$/libmsvcrt.a
-- cd $(LB) && ar -rs libmsvcrt.a ofmt_stub.o
-+ $(DLLTOOL) --dllname msvcrt.dll --input-def=$(MISC)$/msvcrt.def --kill-at --output-lib=$(LB)$/libmsvcrt.a
-+ cd $(LB) && $(AR) -rs libmsvcrt.a ofmt_stub.o
-
- clean:
- -$(RM) $(MISC)$/mingw$/include$/*.h
diff --git a/patches/dev300/crosswin32-fpicker-mingw.diff b/patches/dev300/crosswin32-fpicker-mingw.diff
deleted file mode 100644
index f34c493..0000000
--- a/patches/dev300/crosswin32-fpicker-mingw.diff
+++ /dev/null
@@ -1,277 +0,0 @@
---- fpicker/source/win32/folderpicker/MtaFop.hxx.pristine 2008-10-29 21:13:36.000000000 +0100
-+++ fpicker/source/win32/folderpicker/MtaFop.hxx 2008-10-31 17:44:49.000000000 +0100
-@@ -48,7 +48,7 @@
- #if defined _MSC_VER
- #pragma warning(pop)
- #endif
--#include "..\misc\WinImplHelper.hxx"
-+#include "../misc/WinImplHelper.hxx"
-
- //----------------------------------------------------------------
- // a simple helper class used to provide a buffer for different
---- fpicker/source/win32/folderpicker/makefile.mk.pristine 2008-10-31 17:41:41.000000000 +0100
-+++ fpicker/source/win32/folderpicker/makefile.mk 2008-10-31 17:44:49.000000000 +0100
-@@ -45,9 +45,9 @@ COMP1TYPELIST=$(TARGET)
- # enable rtti
- CFLAGS+=-GR
-
--SLOFILES=$(SLO)$/fopentry.obj\
-- $(SLO)$/folderpicker.obj\
-- $(SLO)$/WinFopImpl.obj\
-+SLOFILES=$(SLO)$/Fopentry.obj\
-+ $(SLO)$/FolderPicker.obj\
-+ $(SLO)$/WinFOPImpl.obj\
- $(SLO)$/MtaFop.obj
-
- # --- Targets ------------------------------------------------------
---- fpicker/source/win32/folderpicker/Fopentry.cxx.pristine 2008-10-31 17:41:41.000000000 +0100
-+++ fpicker/source/win32/folderpicker/Fopentry.cxx 2008-10-31 17:44:49.000000000 +0100
-@@ -39,7 +39,7 @@
- #include <osl/diagnose.h>
-
- #ifndef _FILEPICKER_HXX_
--#include "folderpicker.hxx"
-+#include "FolderPicker.hxx"
- #endif
-
- #ifndef _FPSERVICEINFO_HXX_
---- fpicker/source/win32/folderpicker/workbench/Test_fops.cxx.pristine 2008-10-29 21:13:36.000000000 +0100
-+++ fpicker/source/win32/folderpicker/workbench/Test_fops.cxx 2008-10-31 17:44:49.000000000 +0100
-@@ -62,7 +62,7 @@
- #include <stdio.h>
-
- #ifndef _FPSERVICEINFO_HXX_
--#include "..\FOPServiceInfo.hxx"
-+#include "../FOPServiceInfo.hxx"
- #endif
-
- #include <osl/file.hxx>
---- fpicker/source/win32/folderpicker/FolderPicker.cxx.pristine 2008-10-31 17:41:41.000000000 +0100
-+++ fpicker/source/win32/folderpicker/FolderPicker.cxx 2008-10-31 17:44:49.000000000 +0100
-@@ -37,7 +37,7 @@
- #include <osl/diagnose.h>
-
- #ifndef _FOLDERPICKER_HXX_
--#include "folderpicker.hxx"
-+#include "FolderPicker.hxx"
- #endif
- #include <com/sun/star/lang/DisposedException.hpp>
- #include "WinFOPImpl.hxx"
---- fpicker/source/win32/folderpicker/MtaFop.cxx.pristine 2008-10-29 21:13:36.000000000 +0100
-+++ fpicker/source/win32/folderpicker/MtaFop.cxx 2008-10-31 17:44:49.000000000 +0100
-@@ -36,7 +36,7 @@
- #include "MtaFop.hxx"
- #include <wchar.h>
- #include <process.h>
--#include "..\misc\resourceprovider.hxx"
-+#include "../misc/resourceprovider.hxx"
-
- #include <systools/win32/comtools.hxx>
-
---- fpicker/source/win32/filepicker/FilePicker.cxx.pristine 2008-10-29 21:13:36.000000000 +0100
-+++ fpicker/source/win32/filepicker/FilePicker.cxx 2008-10-31 18:47:21.000000000 +0100
-@@ -41,12 +41,12 @@
- #include <osl/diagnose.h>
-
- #ifndef _FILEPICKER_HXX_
--#include "filepicker.hxx"
-+#include "FilePicker.hxx"
- #endif
- #include "WinFileOpenImpl.hxx"
-
- #include "FPServiceInfo.hxx"
--#include "..\misc\WinImplHelper.hxx"
-+#include "../misc/WinImplHelper.hxx"
- #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
- #include "filepickereventnotification.hxx"
-
---- fpicker/source/win32/filepicker/VistaFilePicker.cxx.pristine 2008-10-29 21:13:36.000000000 +0100
-+++ fpicker/source/win32/filepicker/VistaFilePicker.cxx 2008-10-31 17:44:49.000000000 +0100
-@@ -41,7 +41,7 @@
-
- #include "VistaFilePicker.hxx"
- #include "WinFileOpenImpl.hxx"
--#include "..\misc\WinImplHelper.hxx"
-+#include "../misc/WinImplHelper.hxx"
- #include "shared.hxx"
-
- #include <com/sun/star/lang/DisposedException.hpp>
---- fpicker/source/win32/filepicker/controlaccess.cxx.pristine 2008-10-29 21:13:36.000000000 +0100
-+++ fpicker/source/win32/filepicker/controlaccess.cxx 2008-10-31 17:44:49.000000000 +0100
-@@ -38,7 +38,7 @@
- #include <tchar.h>
- #include <osl/diagnose.h>
- #include "controlaccess.hxx"
--#include "..\misc\WinImplHelper.hxx"
-+#include "../misc/WinImplHelper.hxx"
-
- //------------------------------------------------------------
- // we are using a table based algorithm to dispatch control
---- fpicker/source/win32/filepicker/WinFileOpenImpl.hxx.pristine 2008-10-29 21:13:36.000000000 +0100
-+++ fpicker/source/win32/filepicker/WinFileOpenImpl.hxx 2008-10-31 17:44:49.000000000 +0100
-@@ -47,7 +47,7 @@
- #include "helppopupwindow.hxx"
- #include "customcontrol.hxx"
- #include "customcontrolfactory.hxx"
--#include "..\misc\resourceprovider.hxx"
-+#include "../misc/resourceprovider.hxx"
-
- #include <utility>
- #include <memory>
---- fpicker/source/win32/filepicker/comptr.hxx.pristine 2008-10-31 17:41:41.000000000 +0100
-+++ fpicker/source/win32/filepicker/comptr.hxx 2008-10-31 17:44:49.000000000 +0100
-@@ -33,7 +33,9 @@
-
- #include <sal/types.h>
- #include <osl/diagnose.h>
-+#ifndef __MINGW32__
- #include <shobjidl.h>
-+#endif /* __MINGW32__ */
-
- template< class T_INTERFACE ,
- REFIID P_IID = IID_NULL ,
---- fpicker/source/win32/filepicker/WinFileOpenImpl.cxx.pristine 2008-10-29 21:13:36.000000000 +0100
-+++ fpicker/source/win32/filepicker/WinFileOpenImpl.cxx 2008-10-31 18:47:42.000000000 +0100
-@@ -44,11 +44,11 @@
- #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
- #include <com/sun/star/ui/dialogs/CommonFilePickerElementIds.hpp>
- #include <com/sun/star/ui/dialogs/FilePreviewImageFormats.hpp>
--#include <com/sun/star/ui/dialogs/ListBoxControlActions.hpp>
--#include "..\misc\WinImplHelper.hxx"
-+#include <com/sun/star/ui/dialogs/ListboxControlActions.hpp>
-+#include "../misc/WinImplHelper.hxx"
-
- #ifndef _FILEPICKER_HXX_
--#include "filepicker.hxx"
-+#include "FilePicker.hxx"
- #endif
- #include "controlaccess.hxx"
- #include <rtl/ustrbuf.hxx>
---- fpicker/source/win32/filepicker/workbench/Test_fps.cxx.pristine 2008-10-29 21:13:36.000000000 +0100
-+++ fpicker/source/win32/filepicker/workbench/Test_fps.cxx 2008-10-31 17:44:49.000000000 +0100
-@@ -70,7 +70,7 @@
- #include <stdio.h>
- #include <windows.h>
-
--#include "..\FPServiceInfo.hxx"
-+#include "../FPServiceInfo.hxx"
-
- //
- // namesapces
---- fpicker/source/win32/filepicker/filepickerstate.cxx.pristine 2008-10-29 21:13:36.000000000 +0100
-+++ fpicker/source/win32/filepicker/filepickerstate.cxx 2008-10-31 18:47:58.000000000 +0100
-@@ -39,7 +39,7 @@
- #include "controlaccess.hxx"
- #include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
- #include <com/sun/star/ui/dialogs/CommonFilePickerElementIds.hpp>
--#include <com/sun/star/ui/dialogs/ListBoxControlActions.hpp>
-+#include <com/sun/star/ui/dialogs/ListboxControlActions.hpp>
- #include <com/sun/star/ui/dialogs/ControlActions.hpp>
- #include "controlcommandrequest.hxx"
- #include "controlcommandresult.hxx"
-@@ -49,7 +49,7 @@
- #include "FileOpenDlg.hxx"
-
- #include <memory>
--#include "..\misc\WinImplHelper.hxx"
-+#include "../misc/WinImplHelper.hxx"
- //---------------------------------------------
- //
- //---------------------------------------------
---- fpicker/source/win32/filepicker/getfilenamewrapper.cxx.pristine 2008-10-31 17:41:41.000000000 +0100
-+++ fpicker/source/win32/filepicker/getfilenamewrapper.cxx 2008-10-31 17:44:49.000000000 +0100
-@@ -48,6 +48,10 @@
- #pragma warning(pop)
- #endif
-
-+#ifdef __MINGW32__
-+#include <ole2.h>
-+#endif /* __MINGW32__ */
-+
- namespace /* private */
- {
-
---- fpicker/source/win32/filepicker/vistatypes.h.pristine 2008-10-31 17:41:41.000000000 +0100
-+++ fpicker/source/win32/filepicker/vistatypes.h 2008-10-31 17:44:49.000000000 +0100
-@@ -36,7 +36,9 @@
- //-----------------------------------------------------------------------------
-
- #include "comptr.hxx"
-+#ifndef __MINGW32__
- #include <shobjidl.h>
-+#endif /* __MINGW32__ */
-
- //-----------------------------------------------------------------------------
- // namespace
---- fpicker/source/win32/filepicker/Fps.rc.orig 2009-07-06 16:22:12.000000000 +0200
-+++ fpicker/source/win32/filepicker/Fps.rc 2009-07-06 16:22:22.000000000 +0200
-@@ -379,45 +379,45 @@
-
- 1000 DLGINIT
- BEGIN
-- 107, 0x403, 15, 0
--0x7453, 0x7261, 0x7257, 0x7469, 0x7265, 0x3520, 0x322e, "\000"
-- 107, 0x403, 15, 0
--0x7453, 0x7261, 0x7257, 0x7469, 0x7265, 0x3420, 0x302e, "\000"
-- 107, 0x403, 15, 0
--0x7453, 0x7261, 0x7257, 0x7469, 0x7265, 0x3320, 0x302e, "\000"
-+ 107, 0x403, 15, 0,
-+0x7453, 0x7261, 0x7257, 0x7469, 0x7265, 0x3520, 0x322e, "\000",
-+ 107, 0x403, 15, 0,
-+0x7453, 0x7261, 0x7257, 0x7469, 0x7265, 0x3420, 0x302e, "\000",
-+ 107, 0x403, 15, 0,
-+0x7453, 0x7261, 0x7257, 0x7469, 0x7265, 0x3320, 0x302e, "\000",
- 0
- END
-
- 1001 DLGINIT
- BEGIN
-- 107, 0x403, 15, 0
--0x7453, 0x7261, 0x7257, 0x7469, 0x7265, 0x3520, 0x322e, "\000"
-- 107, 0x403, 15, 0
--0x7453, 0x7261, 0x7257, 0x7469, 0x7265, 0x3420, 0x302e, "\000"
-- 107, 0x403, 15, 0
--0x7453, 0x7261, 0x7257, 0x7469, 0x7265, 0x3320, 0x302e, "\000"
-+ 107, 0x403, 15, 0,
-+0x7453, 0x7261, 0x7257, 0x7469, 0x7265, 0x3520, 0x322e, "\000",
-+ 107, 0x403, 15, 0,
-+0x7453, 0x7261, 0x7257, 0x7469, 0x7265, 0x3420, 0x302e, "\000",
-+ 107, 0x403, 15, 0,
-+0x7453, 0x7261, 0x7257, 0x7469, 0x7265, 0x3320, 0x302e, "\000",
- 0
- END
-
- 3000 DLGINIT
- BEGIN
-- 108, 0x403, 15, 0
--0x7453, 0x7261, 0x7257, 0x7469, 0x7265, 0x3520, 0x322e, "\000"
-- 108, 0x403, 15, 0
--0x7453, 0x7261, 0x7257, 0x7469, 0x7265, 0x3420, 0x302e, "\000"
-- 108, 0x403, 15, 0
--0x7453, 0x7261, 0x7257, 0x7469, 0x7265, 0x3320, 0x302e, "\000"
-+ 108, 0x403, 15, 0,
-+0x7453, 0x7261, 0x7257, 0x7469, 0x7265, 0x3520, 0x322e, "\000",
-+ 108, 0x403, 15, 0,
-+0x7453, 0x7261, 0x7257, 0x7469, 0x7265, 0x3420, 0x302e, "\000",
-+ 108, 0x403, 15, 0,
-+0x7453, 0x7261, 0x7257, 0x7469, 0x7265, 0x3320, 0x302e, "\000",
- 0
- END
-
- 3001 DLGINIT
- BEGIN
-- 108, 0x403, 15, 0
--0x7453, 0x7261, 0x7257, 0x7469, 0x7265, 0x3520, 0x322e, "\000"
-- 108, 0x403, 15, 0
--0x7453, 0x7261, 0x7257, 0x7469, 0x7265, 0x3420, 0x302e, "\000"
-- 108, 0x403, 15, 0
--0x7453, 0x7261, 0x7257, 0x7469, 0x7265, 0x3320, 0x302e, "\000"
-+ 108, 0x403, 15, 0,
-+0x7453, 0x7261, 0x7257, 0x7469, 0x7265, 0x3520, 0x322e, "\000",
-+ 108, 0x403, 15, 0,
-+0x7453, 0x7261, 0x7257, 0x7469, 0x7265, 0x3420, 0x302e, "\000",
-+ 108, 0x403, 15, 0,
-+0x7453, 0x7261, 0x7257, 0x7469, 0x7265, 0x3320, 0x302e, "\000",
- 0
- END
-
diff --git a/patches/dev300/crosswin32-helpcontent2-mingw.diff b/patches/dev300/crosswin32-helpcontent2-mingw.diff
deleted file mode 100644
index 066f5e1..0000000
--- a/patches/dev300/crosswin32-helpcontent2-mingw.diff
+++ /dev/null
@@ -1,18 +0,0 @@
---- helpcontent2/util/target.pmk.pristine 2009-04-22 11:13:36.202219858 +0200
-+++ helpcontent2/util/target.pmk 2009-04-22 11:15:17.262216225 +0200
-@@ -38,8 +38,14 @@ ALLTAR : $(LINKALLTARGETS)
- JAVA_LIBRARY_PATH= -Djava.library.path=$(SOLARSHAREDBIN)
- .ENDIF
-
-+.IF "$(CROSS_COMPILING)" == "no"
-+HELPLINKER=HelpLinker
-+.ELSE # "$(CROSS_COMPILING)" == "yes"
-+HELPLINKER=wine $(SOLARBINDIR)/HelpLinker.exe
-+.ENDIF # "$(CROSS_COMPILING)" == "yes"
-+
- $(LINKALLTARGETS) : $(foreach,i,$(LINKLINKFILES) $(COMMONMISC)$/$$(@:b:s/_/./:e:s/.//)/$i) $(subst,LANGUAGE,$$(@:b:s/_/./:e:s/.//) $(LINKADDEDDEPS)) $(COMMONMISC)$/xhp_changed.flag $(PRJ)$/helpers$/hid.lst
-- $(WRAPCMD) HelpLinker @$(mktmp -mod $(LINKNAME) -hid $(PRJ)$/helpers/hid.lst -src $(COMMONMISC) -sty $(PRJ)$/source$/auxiliary$/embed.xsl -zipdir $(MISC)$/ziptmp$(@:b) -idxcaption $(PRJ)$/source$/auxiliary$/idxcaption.xsl -idxcontent $(PRJ)$/source$/auxiliary$/idxcontent.xsl -lang {$(subst,$(LINKNAME)_, $(@:b))} $(subst,LANGUAGE,{$(subst,$(LINKNAME)_, $(@:b))} $(LINKADDEDFILES)) $(foreach,i,$(LINKLINKFILES) $(COMMONMISC)$/{$(subst,$(LINKNAME)_, $(@:b))}/$i) -o $@)
-+ $(WRAPCMD) $(HELPLINKER) @$(mktmp -mod $(LINKNAME) -hid $(PRJ)$/helpers/hid.lst -src $(COMMONMISC) -sty $(PRJ)$/source$/auxiliary$/embed.xsl -zipdir $(MISC)$/ziptmp$(@:b) -idxcaption $(PRJ)$/source$/auxiliary$/idxcaption.xsl -idxcontent $(PRJ)$/source$/auxiliary$/idxcontent.xsl -lang {$(subst,$(LINKNAME)_, $(@:b))} $(subst,LANGUAGE,{$(subst,$(LINKNAME)_, $(@:b))} $(LINKADDEDFILES)) $(foreach,i,$(LINKLINKFILES) $(COMMONMISC)$/{$(subst,$(LINKNAME)_, $(@:b))}/$i) -o $@)
- .IF "$(SOLAR_JAVA)" == "TRUE"
- $(JAVAI) $(JAVA_LIBRARY_PATH) -cp "$(my_cp)" com.sun.star.help.HelpIndexer -lang $(@:b:s/_/./:e:s/.//) -mod $(LINKNAME) -zipdir $(MISC)$/ziptmp$(@:b) -o $@
- .ELSE
diff --git a/patches/dev300/crosswin32-i18npool-cross.diff b/patches/dev300/crosswin32-i18npool-cross.diff
deleted file mode 100644
index d70846b..0000000
--- a/patches/dev300/crosswin32-i18npool-cross.diff
+++ /dev/null
@@ -1,99 +0,0 @@
---- i18npool/source/textconversion/data/makefile.mk.~1.7.~ 2008-04-10 11:11:44.000000000 +0200
-+++ i18npool/source/textconversion/data/makefile.mk 2008-10-28 16:48:36.000000000 +0100
-@@ -64,9 +64,16 @@ LIB1OBJFILES=$(SHL1OBJS)
- .INCLUDE : target.mk
-
- APP1TARGET = genconv_dict
-+
-+.IF "$(CROSS_COMPILING)" == "no"
-+GENCONV_DICT = $(BIN)$/genconv_dict$(EXECPOST)
-+.ELSE # "$(CROSS_COMPILING)" == "yes"
-+GENCONV_DICT = $(TOOLS_DIR)/genconv_dict
-+.ENDIF # "$(CROSS_COMPILING)" == "yes"
-+
- $(MISC)$/%.cxx : %.dic
-- $(AUGMENT_LIBRARY_PATH) $(BIN)$/genconv_dict $* $< $@
-+ $(AUGMENT_LIBRARY_PATH) $(GENCONV_DICT) $* $< $@
-
- # ugly - is this dependency really required here?
--$(foreach,i,$(shell @$(FIND) . -name "*.dic") $(MISC)$/dict_$(i:b).cxx) : $(BIN)$/genconv_dict$(EXECPOST)
-+$(foreach,i,$(shell @$(FIND) . -name "*.dic") $(MISC)$/dict_$(i:b).cxx) : $(GENCONV_DICT)
-
-i18npool/source/localedata/data/makefile.mk
---- i18npool/source/localedata/data/makefile.mk.~1.47.~ 2008-04-10 11:06:09.000000000 +0200
-+++ i18npool/source/localedata/data/makefile.mk 2008-10-28 16:45:45.000000000 +0100
-@@ -486,7 +486,13 @@ DEPOBJFILES= \
-
- $(MY_MISC_CXXFILES) : $(BIN)$/saxparser$(EXECPOST)
-
-+.IF "$(CROSS_COMPILING)" == "no"
-+SAXPARSER = $(BIN)$/saxparser$(EXECPOST)
-+.ELSE # "$(CROSS_COMPILING)" == "yes
-+SAXPARSER = wine $(BIN)$/saxparser$(EXECPOST)
-+.ENDIF # "$(CROSS_COMPILING)" == "yes"
-+
- $(MISC)$/localedata_%.cxx : %.xml
-- $(WRAPCMD) $(BIN)$/saxparser $* $< $@ $(BIN)$/$(@:b).rdb $(SOLARBINDIR)$/types.rdb
-+ $(WRAPCMD) $(SAXPARSER) $* $< $@ $(BIN)$/$(@:b).rdb $(SOLARBINDIR)$/types.rdb
- $(RM) $(BIN)$/$(@:b).rdb
-
---- i18npool/source/collator/data/makefile.mk.~1.7.~ 2008-04-10 10:58:10.000000000 +0200
-+++ i18npool/source/collator/data/makefile.mk 2008-10-28 16:42:36.000000000 +0100
-@@ -60,9 +60,15 @@ SHL1OBJS=$(SLOFILES)
- # --- Targets ------------------------------------------------------
- .INCLUDE : target.mk
-
-+.IF "$(CROSS_COMPILING)" == "no"
-+GENCOLL_RULE = $(BIN)$/gencoll_rule$(EXECPOST)
-+.ELSE # "$(CROSS_COMPILING)" == "yes"
-+GENCOLL_RULE = $(TOOLS_DIR)/gencoll_rule
-+.ENDIF # "$(CROSS_COMPILING)" == "yes"
-+
- $(MISC)$/collator_%.cxx : %.txt
-- $(BIN)$/gencoll_rule $< $@ $*
-+ $(GENCOLL_RULE) $< $@ $*
-
- # ugly - is this dependency really required here?
--$(foreach,i,$(shell @$(FIND) . -name "*.txt") $(MISC)$/dict_$(i:b).cxx) : $(BIN)$/gencoll_rule$(EXECPOST)
-+$(foreach,i,$(shell @$(FIND) . -name "*.txt") $(MISC)$/dict_$(i:b).cxx) : $(BIN)$/$(GENCOLL_RULE)
-
---- i18npool/source/indexentry/data/makefile.mk.~1.7.~ 2008-04-10 11:01:24.000000000 +0200
-+++ i18npool/source/indexentry/data/makefile.mk 2008-10-28 16:44:07.000000000 +0100
-@@ -63,9 +63,15 @@ LIB1OBJFILES=$(SHL1OBJS)
- # --- Targets ------------------------------------------------------
- .INCLUDE : target.mk
-
-+.IF "$(CROSS_COMPILING)" == "no"
-+GENINDEX_DATA = $(BIN)$/genindex_data$(EXECPOST)
-+.ELSE # "$(CROSS_COMPILING)" == "yes"
-+GENINDEX_DATA = $(TOOLS_DIR)/genindex_data
-+.ENDIF # "$(CROSS_COMPILING)" == "yes"
-+
- $(MISC)$/%.cxx : %.txt
-- $(BIN)$/genindex_data $< $@ $*
-+ $(GENINDEX_DATA) $< $@ $*
-
- # ugly - is this dependency really required here?
--$(foreach,i,$(shell @$(FIND) . -name "*.txt") $(MISC)$/dict_$(i:b).cxx) : $(BIN)$/genindex_data$(EXECPOST)
-+$(foreach,i,$(shell @$(FIND) . -name "*.txt") $(MISC)$/dict_$(i:b).cxx) : $(BIN)$/$(GENINDEX_DATA)
-
---- i18npool/source/breakiterator/data/makefile.mk.~1.9.~ 2008-04-10 10:54:04.000000000 +0200
-+++ i18npool/source/breakiterator/data/makefile.mk 2008-10-28 16:40:03.000000000 +0100
-@@ -80,9 +80,15 @@ DEPOBJFILES= \
- # --- Targets ------------------------------------------------------
- .INCLUDE : target.mk
-
-+.IF "$(CROSS_COMPILING)" == "no"
-+GENDICT = $(BIN)$/gendict$(EXECPOST)
-+.ELSE # "$(CROSS_COMPILING)" == "yes"
-+GENDICT = $(TOOLS_DIR)/gendict
-+.ENDIF # "$(CROSS_COMPILING)" == "yes"
-+
- $(MISC)$/dict_%.cxx : %.dic
-- $(BIN)$/gendict $< $@
-+ $(GENDICT) $< $@
-
- # ugly - is this dependency really required here?
--$(foreach,i,$(shell @$(FIND) . -name "*.dic") $(MISC)$/dict_$(i:b).cxx) : $(BIN)$/gendict$(EXECPOST)
-+$(foreach,i,$(shell @$(FIND) . -name "*.dic") $(MISC)$/dict_$(i:b).cxx) : $(GENDICT)
-
diff --git a/patches/dev300/crosswin32-i18npool-mingw.diff b/patches/dev300/crosswin32-i18npool-mingw.diff
deleted file mode 100644
index 9b6824a..0000000
--- a/patches/dev300/crosswin32-i18npool-mingw.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-i18npool/source/collator/collator_unicode.cxx
---- i18npool/source/collator/collator_unicode.cxx.~1.20.~ 2008-04-10 10:57:26.000000000 +0200
-+++ i18npool/source/collator/collator_unicode.cxx 2008-10-28 16:31:43.000000000 +0100
-@@ -135,9 +135,9 @@ Collator_Unicode::loadCollatorAlgorithm(
- uppercase itself, so we don't have to bother with that.
- */
- icu::Locale icuLocale(
-- OUStringToOString(rLocale.Language, RTL_TEXTENCODING_ASCII_US).getStr(),
-- OUStringToOString(rLocale.Country, RTL_TEXTENCODING_ASCII_US).getStr(),
-- OUStringToOString(rAlgorithm, RTL_TEXTENCODING_ASCII_US).getStr());
-+ (char const*)OUStringToOString(rLocale.Language, RTL_TEXTENCODING_ASCII_US).getStr(),
-+ (char const*)OUStringToOString(rLocale.Country, RTL_TEXTENCODING_ASCII_US).getStr(),
-+ (char const*)OUStringToOString(rAlgorithm, RTL_TEXTENCODING_ASCII_US).getStr());
- // load ICU collator
- collator = (RuleBasedCollator*) icu::Collator::createInstance(icuLocale, status);
- if (! U_SUCCESS(status)) throw RuntimeException();
diff --git a/patches/dev300/crosswin32-icc-cross.diff b/patches/dev300/crosswin32-icc-cross.diff
deleted file mode 100644
index 51e4de1..0000000
--- a/patches/dev300/crosswin32-icc-cross.diff
+++ /dev/null
@@ -1,16 +0,0 @@
---- icc/makefile.mk.orig 2009-06-25 12:18:15.000000000 +0200
-+++ icc/makefile.mk 2009-06-25 12:21:09.000000000 +0200
-@@ -55,7 +55,12 @@
- Contrib$/ICC_utils$/Vetters.cpp
-
- CONFIGURE_ACTION= $(GNUCOPY) -r $(BACK_PATH)..$/source$/create_sRGB_profile Contrib$/CmdLine && unzip $(BACK_PATH)..$/makefiles.zip
--BUILD_ACTION=dmake && cd Contrib$/CmdLine$/create_sRGB_profile && .$/create_sRGB_profile
-+.IF "$(CROSS_COMPILING)" == "no"
-+BUILD_ACTION=dmake && cd Contrib$/CmdLine$/create_sRGB_profile && .$/create_sRGB_profile
-+.ELSE
-+# FIXME: should use CC_FOR_BUILD to build the thing here
-+BUILD_ACTION=dmake && cd Contrib$/CmdLine$/create_sRGB_profile && $(TOOLS_DIR)/create_sRGB_profile
-+.ENDIF
-
- # --- Targets ------------------------------------------------------
-
diff --git a/patches/dev300/crosswin32-instsetoo_native-mingw.diff b/patches/dev300/crosswin32-instsetoo_native-mingw.diff
deleted file mode 100644
index 1c859ba..0000000
--- a/patches/dev300/crosswin32-instsetoo_native-mingw.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- instsetoo_native/util/makefile.mk.pristine 2008-11-09 20:12:40.000000000 +0100
-+++ instsetoo_native/util/makefile.mk 2008-11-09 20:11:53.000000000 +0100
-@@ -96,7 +96,7 @@ LOCALPYFILES= \
- # native - "Native" software distribution for the platform
- # portable - Portable software distribution
-
--.IF "$(GUI)"!="WNT" && "$(EPM)"=="NO" && "$(USE_PACKAGER)"==""
-+.IF "$(BUILD_OS)"!="WNT" && "$(EPM)"=="NO" && "$(USE_PACKAGER)"==""
- ALLTAR : $(LOCALPYFILES)
- @echo "No EPM: do no packaging at this stage"
- .ELSE # "$(GUI)"!="WNT" && "$(EPM)"=="NO" && "$(USE_PACKAGER)"==""
diff --git a/patches/dev300/crosswin32-odk-cross.diff b/patches/dev300/crosswin32-odk-cross.diff
deleted file mode 100644
index a6273ad..0000000
--- a/patches/dev300/crosswin32-odk-cross.diff
+++ /dev/null
@@ -1,23 +0,0 @@
---- odk/pack/copying/makefile.mk.orig 2008-12-11 15:10:39.000000000 +0100
-+++ odk/pack/copying/makefile.mk 2009-06-30 21:13:04.000000000 +0200
-@@ -249,7 +249,7 @@
-
- $(IDL_DOCU_INDEX_FILE) : $(IDL_DOCU_CLEANUP_FLAG)
- -$(MKDIRHIER) $(@:d)
-- $(MY_AUTODOC) -html $(DESTDIRGENIDLREF) -dvgroot "http://wiki.services.openoffice.org/wiki" -sincefile $(IDL_SINCE_TAGS) -name $(IDLDOCREFNAME) -lg \
-+ $(TOOLS_DIR)/autodoc -html $(DESTDIRGENIDLREF) -dvgroot "http://wiki.services.openoffice.org/wiki" -sincefile $(IDL_SINCE_TAGS) -name $(IDLDOCREFNAME) -lg \
- idl -dvgfile $(IDL_CHAPTER_REFS) -t $(DESTDIRIDL)
- -rm $(@:d)$/idl.css
- $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(PRJ)$/docs$/common$/ref$/idl.css $(MY_TEXTCOPY_TARGETPRE) $(@:d:d)$/idl.css
-
---- odk/pack/gendocu/makefile.mk.orig 2008-10-01 12:04:58.000000000 +0200
-+++ odk/pack/gendocu/makefile.mk 2009-06-30 21:15:47.000000000 +0200
-@@ -85,7 +85,7 @@
-
- JAVADOCLOG = $(MISC)$/javadoc_log.txt
-
--MY_AUTODOC=$(SOLARBINDIR)$/autodoc
-+MY_AUTODOC=$(TOOLS_DIR)$/autodoc
-
- .IF "$(SOLAR_JAVA)"!=""
- all: \
diff --git a/patches/dev300/crosswin32-postprocess-mingw.diff b/patches/dev300/crosswin32-postprocess-mingw.diff
deleted file mode 100644
index e32ca8b..0000000
--- a/patches/dev300/crosswin32-postprocess-mingw.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-Too bad, our rebase has other arguments, and they're not trivial to translate.
-
-rebase -C ../wntgcci.pro/misc/coffbase.txt -b 0x68000000 -e 10000 -l ../wntgcci.pro/misc/rebase_log.txt -R /home/janneke/vc/gub/target/mingw/build/openoffice-trunk/build/ooo300-m9/solver/300/wntgcci.pro/bin -N no_rebase.txt -d -v @../wntgcci.pro/misc/rebase_new.txt
-/home/janneke/vc/gub/target/tools/root/usr/bin/rebase: unknown option -- C
-usage: rebase -b BaseAddress [-Vdv] [-o Offset] [-T FileList | -] Files...
-Error: rebase failed with exit code 1!
-
-
---- postprocess/rebase/makefile.mk.~1.10.~ 2008-04-10 10:48:57.000000000 +0200
-+++ postprocess/rebase/makefile.mk 2008-11-07 17:46:19.000000000 +0100
-@@ -48,13 +48,13 @@ IMAGENAMES=$(SOLARBINDIR)$/*.dll $(SOLAR
- ALLTAR : REBASE
-
- REBASE .PHONY : $(BASEADDRESSES)
--.IF "$(GUI)"=="WNT"
-+.IF "$(GUI)"=="WNT" && "$(CROSS_COMPILING)" == "no"
- .IF "$(product)"=="full"
- $(PERL) rebase.pl -C $(BASEADDRESSES) -b $(STARTADDRESS) -d -e 10000 -l $(LOGFILE) -m $(MISC) -v -R $(SOLARBINDIR) -N $(EXCLUDELIST) $(IMAGENAMES)
- .ELSE # "$(product)"=="full"
- @echo Doing nothing on non product builds ...
- .ENDIF # "$(product)"=="full"
--.ELSE # "$(GUI)"=="WNT"
-+.ELSE # "$(GUI)"!="WNT" || "$(CROSS_COMPILING)" != "no"
- @echo Nothing to do, 'rebase' is windows only.
- .ENDIF
-
diff --git a/patches/dev300/crosswin32-pyuno-mingw.diff b/patches/dev300/crosswin32-pyuno-mingw.diff
deleted file mode 100644
index 9aa7013..0000000
--- a/patches/dev300/crosswin32-pyuno-mingw.diff
+++ /dev/null
@@ -1,31 +0,0 @@
---- pyuno/source/module/makefile.mk.pristine 2008-10-29 14:25:58.000000000 +0100
-+++ pyuno/source/module/makefile.mk 2008-10-29 14:25:33.000000000 +0100
-@@ -57,6 +57,7 @@ EXTRA_FRAMEWORK_FLAG=-framework Python
- PYUNO_MODULE=$(DLLDEST)$/pyuno.so
- PYUNORC=pyunorc
- .ELSE
-+.INCLUDEDIRS: $(PRJ)/../python
- .INCLUDE : pyversion.mk
- PYUNORC=pyuno.ini
- .ENDIF
-@@ -118,7 +119,7 @@
- $(LB)$/lib$(TARGET).a
-
- $(LB)$/lib$(TARGET).a: $(MISC)$/$(TARGET).def
-- dlltool --dllname $(TARGET)$(DLLPOST) --input-def=$(MISC)$/$(TARGET).def --kill-at --output-lib=$(LB)$/lib$(TARGET).a
-+ $(DLLTOOL) --dllname $(TARGET)$(DLLPOST) --input-def=$(MISC)$/$(TARGET).def --kill-at --output-lib=$(LB)$/lib$(TARGET).a
- .ELSE
- ALLTAR : \
- $(DLLDEST)$/uno.py
-
---- pyuno/source/loader/makefile.mk.orig 2008-04-11 12:31:24.000000000 +0200
-+++ pyuno/source/loader/makefile.mk 2009-07-14 11:36:44.000000000 +0200
-@@ -117,7 +117,7 @@
- cd $(DLLDEST) && sh -c "DYLD_LIBRARY_PATH=$(DYLD_LIBRARY_PATH):$(OUT)$/lib;export DYLD_LIBRARY_PATH;regcomp -register -r pyuno_services.tmp $(foreach,i,$(COMPONENTS) -c $(i))"
- .ELSE
- .IF "$(GUI)$(COM)"=="WNTGCC"
-- cd $(DLLDEST) && sh -c "export PATH='$(PATH):$(OUT)$/bin'; regcomp -register -r pyuno_services.tmp $(foreach,i,$(COMPONENTS) -c $(i))"
-+ cd $(DLLDEST) && sh -c "export PATH='$(PATH):$(OUT)$/bin'; wine $(SOLARBINDIR)/regcomp -register -r pyuno_services.tmp $(foreach,i,$(COMPONENTS) -c $(i))"
- .ELSE
- cd $(DLLDEST) && regcomp -register -r pyuno_services.tmp $(foreach,i,$(COMPONENTS) -c $(i))
- .ENDIF # "$(GUI)$(COM)"=="WNTGCC"
diff --git a/patches/dev300/crosswin32-sal-mingw-c.diff b/patches/dev300/crosswin32-sal-mingw-c.diff
deleted file mode 100644
index 1e7782e..0000000
--- a/patches/dev300/crosswin32-sal-mingw-c.diff
+++ /dev/null
@@ -1,230 +0,0 @@
---- sal/osl/w32/dllentry.c.~1.34.~ 2008-04-10 13:17:16.000000000 +0200
-+++ sal/osl/w32/dllentry.c 2008-10-21 20:56:07.000000000 +0200
-@@ -216,7 +216,9 @@
-
- //We disable floating point exceptions. This is the usual state at program startup
- //but on Windows 98 and ME this is not always the case.
-+#ifndef __MINGW32__
- _control87(_MCW_EM, _MCW_EM);
-+#endif
- #ifdef __MINGW32__
- atexit(do_cleanup);
- }
---- sal/systools/win32/uwinapi/ResolveUnicows.cpp.pristine 2008-10-01 10:05:18.000000000 +0200
-+++ sal/systools/win32/uwinapi/ResolveUnicows.cpp 2009-04-04 14:43:41.198056996 +0200
-@@ -227,8 +226,8 @@ DEFINE_UNICOWS_THUNK( kernel32, DWORD, W
- DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, GetFileAttributesExW, (LPCWSTR,GET_FILEEX_INFO_LEVELS,PVOID) )
- DEFINE_UNICOWS_THUNK( kernel32, DWORD, WINAPI, GetFileAttributesW, (LPCWSTR) )
- DEFINE_UNICOWS_THUNK( comdlg32, short, WINAPI, GetFileTitleW, (LPCWSTR,LPWSTR,WORD) )
--DEFINE_UNICOWS_THUNK( version, DWORD, WINAPI, GetFileVersionInfoSizeW, (LPWSTR,PDWORD) )
--DEFINE_UNICOWS_THUNK( version, BOOL, WINAPI, GetFileVersionInfoW, (LPWSTR,DWORD,DWORD,PVOID) )
-+DEFINE_UNICOWS_THUNK( version, DWORD, WINAPI, GetFileVersionInfoSizeW, (const WCHAR*,DWORD*) )
-+DEFINE_UNICOWS_THUNK( version, BOOL, WINAPI, GetFileVersionInfoW, (const WCHAR*,DWORD,DWORD,PVOID) )
- DEFINE_UNICOWS_THUNK( kernel32, DWORD, WINAPI, GetFullPathNameW, (LPCWSTR,DWORD,LPWSTR,LPWSTR*) )
- DEFINE_UNICOWS_THUNK( gdi32, DWORD, WINAPI, GetGlyphOutlineW, (HDC,UINT,UINT,LPGLYPHMETRICS,DWORD,PVOID,const MAT2*) )
- DEFINE_UNICOWS_THUNK( gdi32, BOOL, WINAPI, GetICMProfileW, (HDC,LPDWORD,LPWSTR) )
-@@ -273,7 +272,7 @@ DEFINE_UNICOWS_THUNK( kernel32, BOOL, WI
- DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, GetStringTypeW, (DWORD,LPCWSTR,int,LPWORD) )
- DEFINE_UNICOWS_THUNK( kernel32, UINT, WINAPI, GetSystemDirectoryW, (LPWSTR,UINT) )
- DEFINE_UNICOWS_THUNK( kernel32, UINT, WINAPI, GetSystemWindowsDirectoryW, (LPWSTR,UINT) )
--DEFINE_UNICOWS_THUNK( user32, DWORD, WINAPI, GetTabbedTextExtentW, (HDC,LPCWSTR,int,int,CONST INT*) )
-+DEFINE_UNICOWS_THUNK( user32, DWORD, WINAPI, GetTabbedTextExtentW, (HDC,LPCWSTR,int,int,int*) )
- DEFINE_UNICOWS_THUNK( kernel32, UINT, WINAPI, GetTempFileNameW, (LPCWSTR,LPCWSTR,UINT,LPWSTR) )
- DEFINE_UNICOWS_THUNK( kernel32, DWORD, WINAPI, GetTempPathW, (DWORD,LPWSTR) )
- DEFINE_UNICOWS_THUNK( gdi32, BOOL, WINAPI, GetTextExtentExPointW, ( HDC,LPCWSTR,int,int,LPINT,LPINT,LPSIZE ) )
-@@ -452,11 +451,11 @@ DEFINE_UNICOWS_THUNK( shell32, BOOL, WIN
- DEFINE_UNICOWS_THUNK( winspool, DWORD, WINAPI, StartDocPrinterW, (HANDLE,DWORD,PBYTE) )
- DEFINE_UNICOWS_THUNK( gdi32, int, WINAPI, StartDocW, (HDC,const DOCINFOW*) )
- DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, SystemParametersInfoW, (UINT,UINT,PVOID,UINT) )
--DEFINE_UNICOWS_THUNK( user32, LONG, WINAPI, TabbedTextOutW, (HDC,int,int,LPCWSTR,int,int,CONST INT*,int) )
-+DEFINE_UNICOWS_THUNK( user32, LONG, WINAPI, TabbedTextOutW, (HDC,int,int,LPCWSTR,int,int,int*,int) )
- DEFINE_UNICOWS_THUNK( gdi32, BOOL, WINAPI, TextOutW, (HDC,int,int,LPCWSTR,int) )
- DEFINE_UNICOWS_THUNK( user32, int, WINAPI, TranslateAcceleratorW, (HWND,HACCEL,LPMSG) )
- DEFINE_UNICOWS_THUNK( user32, BOOL, WINAPI, UnregisterClassW, (LPCWSTR,HINSTANCE) )
--DEFINE_UNICOWS_THUNK( gdi32, BOOL, WINAPI, UpdateICMRegKeyW, (DWORD,LPWSTR,LPWSTR,UINT) )
-+DEFINE_UNICOWS_THUNK( gdi32, BOOL, WINAPI, UpdateICMRegKeyW, (DWORD,DWORD,LPWSTR,UINT) )
- DEFINE_UNICOWS_THUNK( kernel32, BOOL, WINAPI, UpdateResourceW, (HANDLE,LPCWSTR,LPCWSTR,WORD,PVOID,DWORD) )
- DEFINE_UNICOWS_THUNK( version, DWORD, WINAPI, VerFindFileW, (DWORD,LPWSTR,LPWSTR,LPWSTR,LPWSTR,PUINT,LPWSTR,PUINT) )
- DEFINE_UNICOWS_THUNK( version, DWORD, WINAPI, VerInstallFileW, (DWORD,LPWSTR,LPWSTR,LPWSTR,LPWSTR,LPWSTR,LPWSTR,PUINT) )
---- sal/systools/win32/onlineupdate/onlinecheck.cxx.orig 10 apr 2008 14:11:15 +0200 1.8
-+++ sal/systools/win32/onlineupdate/onlinecheck.cxx 22 okt 2008 10:56:53 +0200
-@@ -46,6 +46,134 @@
- #include <tchar.h>
- #ifdef __MINGW32__
- #include <excpt.h>
-+#include <setjmp.h>
-+
-+// not implemented in mingw, only in wine...
-+//BOOL WINAPI InternetGetConnectedStateEx(LPDWORD,LPTSTR,DWORD,DWORD);
-+#define InternetGetConnectedStateEx(a,b,c,d) InternetGetConnectedState(a,c)
-+
-+#undef OPTIONAL
-+#define OPTIONAL
-+
-+WINBASEAPI
-+VOID
-+WINAPI
-+RtlUnwind (
-+ IN PVOID TargetFrame OPTIONAL,
-+ IN PVOID TargetIp OPTIONAL,
-+ IN PEXCEPTION_RECORD ExceptionRecord OPTIONAL,
-+ IN PVOID ReturnValue
-+ );
-+
-+// What library is this supposed to be defined in?
-+#define RtlUnwind(a,b,c,d)
-+
-+class __SEHandler
-+{
-+ public:
-+ __SEHandler() {}
-+ ~__SEHandler() {}
-+ typedef int (*PF)(void *, LPEXCEPTION_POINTERS);
-+ typedef void (*PH)(void *, LPEXCEPTION_POINTERS);
-+ typedef void (*PN)(void *);
-+ void Set(jmp_buf jb, void *pdata=NULL, PF pfilter=NULL, PH phandlerbody=NULL, PN pfinal=NULL)
-+ {
-+ __builtin_memcpy(m_jmpbuf, jb, sizeof(jmp_buf));
-+ m_pData=pdata;
-+ switch (reinterpret_cast<int>(pfilter))
-+ {
-+ default:
-+ m_filter=pfilter;
-+ break;
-+ case EXCEPTION_CONTINUE_EXECUTION:
-+ m_filter=DefaultFilterContinueExecution;
-+ break;
-+ case EXCEPTION_EXECUTE_HANDLER:
-+ m_filter=DefaultFilterExecuteHandler;
-+ break;
-+ case EXCEPTION_CONTINUE_SEARCH:
-+ m_filter=DefaultFilterContinueSearch;
-+ break;
-+ }
-+ if (phandlerbody)
-+ m_handlerbody=phandlerbody;
-+ else
-+ m_handlerbody=DefaultHandler;
-+ if (pfinal)
-+ m_final=pfinal;
-+ else
-+ m_final=DefaultFinal;
-+ m_ER.pHandlerClass = this;
-+ m_ER.hp = handler;
-+ asm("movl %%fs:0, %%eax\n\t"
-+ "movl %%eax, %0": : "m" (m_ER.prev): "%eax" );
-+ asm("movl %0, %%eax\n\t"
-+ "movl %%eax, %%fs:0": : "r" (&m_ER): "%eax" );
-+ }
-+ void Reset()
-+ {
-+ m_final(m_pData);
-+ asm("movl %0, %%eax \n\t"
-+ "movl %%eax, %%fs:0"
-+ : : "m" (m_ER.prev): "%eax");
-+ }
-+ private:
-+ __SEHandler(const __SEHandler&);
-+ __SEHandler& operator=(const __SEHandler&);
-+ struct _ER {
-+ _ER* prev;
-+ PEXCEPTION_HANDLER hp;
-+ __SEHandler *pHandlerClass;
-+ };
-+ static EXCEPTION_DISPOSITION handler(
-+ struct _EXCEPTION_RECORD *pExceptionRecord,
-+ void * EstablisherFrame,
-+ struct _CONTEXT *ContextRecord,
-+ void * /*DispatcherContext*/)
-+ {
-+ __SEHandler* pThis = reinterpret_cast< _ER * >(EstablisherFrame)->pHandlerClass;
-+ if ( pExceptionRecord->ExceptionFlags & EH_UNWINDING )
-+ {
-+ pThis->m_final(pThis->m_pData);
-+ return ExceptionContinueSearch;
-+ }
-+ EXCEPTION_POINTERS ep={pExceptionRecord, ContextRecord};
-+ switch ( pThis->m_filter(pThis->m_pData, &ep) )
-+ {
-+ case EXCEPTION_EXECUTE_HANDLER:
-+ RtlUnwind(EstablisherFrame, &&__set_label, pExceptionRecord, 0);
-+__set_label:
-+ pThis->m_handlerbody(pThis->m_pData, &ep);
-+ ContextRecord->Ebp = pThis->m_jmpbuf[0];
-+ ContextRecord->Eip = pThis->m_jmpbuf[1];
-+ ContextRecord->Esp = pThis->m_jmpbuf[2];
-+ return ExceptionContinueExecution;
-+ case EXCEPTION_CONTINUE_SEARCH:
-+ return ExceptionContinueSearch;
-+ case EXCEPTION_CONTINUE_EXECUTION:
-+ return ExceptionContinueExecution;
-+ }
-+ return ExceptionContinueExecution;
-+ }
-+ static int DefaultFilterContinueSearch(void *, LPEXCEPTION_POINTERS) { return EXCEPTION_CONTINUE_SEARCH; }
-+ static int DefaultFilterContinueExecution(void *, LPEXCEPTION_POINTERS) { return EXCEPTION_CONTINUE_EXECUTION; }
-+ static int DefaultFilterExecuteHandler(void *, LPEXCEPTION_POINTERS) { return EXCEPTION_EXECUTE_HANDLER; }
-+ static void DefaultHandler(void *, LPEXCEPTION_POINTERS) {}
-+ static void DefaultFinal(void *) {}
-+ typedef int (*handler_p)(
-+ struct _EXCEPTION_RECORD *ExceptionRecord,
-+ void * EstablisherFrame,
-+ struct _CONTEXT *ContextRecord,
-+ void * DispatcherContext);
-+ _ER m_ER;
-+ void *m_pData;
-+ PN m_final;
-+ PH m_handlerbody;
-+ PF m_filter;
-+ jmp_buf m_jmpbuf;
-+};
-+
-+#undef OPTIONAL
- #endif
-
- #define elementsof(a) (sizeof(a)/sizeof((a)[0]))
---- sal/systools/win32/uwinapi/FindFirstVolumeA.cpp 2009-04-06 20:23:37.935495274 +0200
-+++ sal/systools/win32/uwinapi/FindFirstVolumeA.cpp 2009-04-06 20:21:51.303494448 +0200
-@@ -30,4 +30,4 @@
-
- #include "macros.h"
-
--DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, HANDLE, WINAPI, FindFirstVolumeA, (LPSTR lpszVolumeName, DWORD cchBufferLength) )
-\ Geen regeleindeteken (LF) aan einde van bestand
-+DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, HANDLE, WINAPI, FindFirstVolumeA, (LPCSTR lpszVolumeName, DWORD cchBufferLength) )
-\ Geen regeleindeteken (LF) aan einde van bestand
-diff -purN sal/systools/win32/uwinapi/FindFirstVolumeW.cpp sal/systools/win32/uwinapi/FindFirstVolumeW.cpp
---- sal/systools/win32/uwinapi/FindFirstVolumeW.cpp 2009-04-06 20:23:37.935495274 +0200
-+++ sal/systools/win32/uwinapi/FindFirstVolumeW.cpp 2009-04-06 20:21:51.303494448 +0200
-@@ -30,4 +30,4 @@
-
- #include "macros.h"
-
--DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, HANDLE, WINAPI, FindFirstVolumeW, (LPWSTR lpszVolumeName, DWORD cchBufferLength) )
-\ Geen regeleindeteken (LF) aan einde van bestand
-+DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, HANDLE, WINAPI, FindFirstVolumeW, (LPCWSTR lpszVolumeName, DWORD cchBufferLength) )
-\ Geen regeleindeteken (LF) aan einde van bestand
-diff -purN sal/systools/win32/uwinapi/FindNextVolumeA.cpp sal/systools/win32/uwinapi/FindNextVolumeA.cpp
---- sal/systools/win32/uwinapi/FindNextVolumeA.cpp 2009-04-06 20:23:37.935495274 +0200
-+++ sal/systools/win32/uwinapi/FindNextVolumeA.cpp 2009-04-06 20:21:51.303494448 +0200
-@@ -30,4 +30,4 @@
-
- #include "macros.h"
-
--DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, FindNextVolumeA, (HANDLE hFindVolume, LPSTR lpszVolumeName, DWORD cchBufferLength) )
-\ Geen regeleindeteken (LF) aan einde van bestand
-+DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, FindNextVolumeA, (HANDLE hFindVolume, LPCSTR lpszVolumeName, DWORD cchBufferLength) )
-\ Geen regeleindeteken (LF) aan einde van bestand
---- sal/osl/w32/system.h.orig 2009-08-10 18:58:46.000000000 +0200
-+++ sal/osl/w32/system.h 2009-08-10 19:04:33.000000000 +0200
-@@ -71,8 +71,8 @@
- #include <ws2tcpip.h>
- #endif
- #include <shlobj.h>
-- #ifndef NO_DEBUG_CRT
-- #include <crtdbg.h>
-+ #if !defined(NO_DEBUG_CRT) && !defined(__MINGW32__)
-+ #include <crtdbg.h>
- #endif
- #else
- // winsock2.h includes windows.h
diff --git a/patches/dev300/crosswin32-sal-mingw.diff b/patches/dev300/crosswin32-sal-mingw.diff
deleted file mode 100644
index 2628c1a..0000000
--- a/patches/dev300/crosswin32-sal-mingw.diff
+++ /dev/null
@@ -1,109 +0,0 @@
---- sal/osl/w32/signal.c.~1.12.~ 2008-04-10 13:22:35.000000000 +0200
-+++ sal/osl/w32/signal.c 2008-10-21 20:53:05.000000000 +0200
-@@ -37,8 +37,8 @@
- #include <osl/signal.h>
- #ifndef __MINGW32__
- #include <DbgHelp.h>
--#endif
- #include <ErrorRep.h>
-+#endif /* __MINGW32__ */
- #include <systools/win32/uwinapi.h>
-
- typedef struct _oslSignalHandlerImpl
---- sal/systools/win32/uwinapi/GetLongPathNameW.cpp.~1.5.~ 2008-04-10 14:18:12.000000000 +0200
-+++ sal/systools/win32/uwinapi/GetLongPathNameW.cpp 2008-10-21 21:30:26.000000000 +0200
-@@ -29,6 +29,13 @@
- ************************************************************************/
-
- #define UNICODE
-+
-+#ifdef __MINGW32__
-+#undef _WIN32_WINNT
-+#define _WIN32_WINNT 0x0500
-+#include <windows.h>
-+#endif /* __MINGW32__ */
-+
- #include "macros.h"
-
- EXTERN_C DWORD WINAPI GetLongPathNameW_NT( LPCWSTR lpShortPath, LPWSTR lpLongPath, DWORD cchBuffer )
---- sal/systools/win32/uwinapi/GetLongPathNameA.cpp.~1.5.~ 2008-04-10 14:17:56.000000000 +0200
-+++ sal/systools/win32/uwinapi/GetLongPathNameA.cpp 2008-10-21 21:29:56.000000000 +0200
-@@ -28,7 +28,13 @@
- *
- ************************************************************************/
-
-+#ifdef __MINGW32__
-+#undef _WIN32_WINNT
-+#define _WIN32_WINNT 0x0500
-+#include <windows.h>
-+#endif /* __MINGW32__ */
-+
- #include "macros.h"
-
- IMPLEMENT_THUNK( kernel32, WINDOWS, DWORD, WINAPI, GetLongPathNameA, ( LPCTSTR lpShortPath, LPTSTR lpLongPath, DWORD cchBuffer ) )
--#include "GetLongPathName.cpp"
-\ Geen regeleindeteken (LF) aan einde van bestand
-+#include "GetLongPathName.cpp"
---- sal/systools/win32/uwinapi/ResolveUnicows.cpp.~1.4.~ 2008-06-06 19:02:43.000000000 +0200
-+++ sal/systools/win32/uwinapi/ResolveUnicows.cpp 2008-10-21 21:53:19.000000000 +0200
-@@ -1,7 +1,6 @@
- #ifdef __MINGW32__
- #define _GDI32_
- #include "macros.h"
--#include <multimon.h>
- extern "C" {
- extern HMODULE hModuleUnicowsDLL;
- }
---- sal/systools/win32/uwinapi/makefile.mk.~1.17.~ 2008-04-10 14:26:19.000000000 +0200
-+++ sal/systools/win32/uwinapi/makefile.mk 2008-10-21 23:43:31.000000000 +0200
-@@ -160,7 +160,7 @@
- ALL: ALLTAR $(LB)$/libuwinapi.a
-
- $(LB)$/libuwinapi.a: $(MISC)$/uwinapi.def
-- dlltool --dllname uwinapi.dll --input-def=$(MISC)$/uwinapi.def --kill-at --output-lib=$(LB)$/libuwinapi.a
-+ $(DLLTOOL) --dllname uwinapi.dll --input-def=$(MISC)$/uwinapi.def --kill-at --output-lib=$(LB)$/libuwinapi.a
- .ENDIF
-
- .INCLUDE : target.mk
---- sal/systools/win32/uwinapi/macros.h.pristine 2008-10-27 17:30:38.000000000 +0100
-+++ sal/systools/win32/uwinapi/macros.h 2008-10-27 17:30:49.000000000 +0100
-@@ -43,7 +43,7 @@
- # ifdef UNICODE
- # define _UNICODE
- # endif
--# include <TCHAR.H>
-+# include <tchar.h>
- #endif
-
- // Globally disable "warning C4100: unreferenced formal parameter" caused by
---- sal/inc/sal/mathconf.h.~1.6.~ 2008-04-10 12:47:09.000000000 +0200
-+++ sal/inc/sal/mathconf.h 2008-04-10 12:47:24.000000000 +0200
-@@ -53,7 +53,7 @@
- problems, the SAL_MATH_FPEXCEPTIONS_OFF macro can be used to explicitly
- switch off exceptions (on Windows).
- */
--#if defined WNT
-+#if defined (WNT) && ! defined (__MINGW32__)
- #define SAL_MATH_FPEXCEPTIONS_OFF() _control87( _MCW_EM, _MCW_EM )
- #else /* WNT */
- #define SAL_MATH_FPEXCEPTIONS_OFF()
-@@ -61,16 +61,16 @@
-
-
- /* SAL_MATH_FINITE(d): test double d on INFINITY, NaN et al. */
--#if defined( WNT)
-+#if defined (WNT) && ! defined (__MINGW32__)
- #define SAL_MATH_FINITE(d) _finite(d)
- #elif defined OS2
- #define SAL_MATH_FINITE(x) \
- ((sizeof (x) == sizeof (float)) ? __isfinitef(x) \
- : (sizeof (x) == sizeof (double)) ? __isfinite(x) \
- : __isfinitel(x))
--#elif defined LINUX || defined UNX
-+#elif defined LINUX || defined UNX || defined __MINGW32__
- #define SAL_MATH_FINITE(d) finite(d)
--#else /* WNT, LINUX, UNX */
-+#else /* WNT, LINUX, UNX, __MINGW32__ */
- #error "SAL_MATH_FINITE not defined"
- #endif /* WNT, LINUX, UNX */
-
diff --git a/patches/dev300/crosswin32-sccomp-mingw.diff b/patches/dev300/crosswin32-sccomp-mingw.diff
deleted file mode 100644
index 2875387..0000000
--- a/patches/dev300/crosswin32-sccomp-mingw.diff
+++ /dev/null
@@ -1,23 +0,0 @@
---- sccomp/source/solver/solver.cxx.pristine 2008-10-30 08:51:53.000000000 +0100
-+++ sccomp/source/solver/solver.cxx 2008-10-30 08:51:44.000000000 +0100
-@@ -28,6 +28,10 @@
- *
- ************************************************************************/
-
-+#ifdef __MINGW32__
-+#define __MINGW32_UNDEF_CONFLICT_TYPES__
-+#endif /* __MINGW32__ */
-+
- #undef LANGUAGE_NONE
- #define WINAPI __stdcall
- #define LoadInverseLib FALSE
---- sccomp/source/solver/solver.hxx.pristine 2008-10-30 08:51:53.000000000 +0100
-+++ sccomp/source/solver/solver.hxx 2008-10-30 08:51:44.000000000 +0100
-@@ -31,6 +31,7 @@
- #ifndef SOLVER_HXX
- #define SOLVER_HXX
-
-+#include <sal/types.h>
- #include <com/sun/star/sheet/XSolver.hpp>
- #include <com/sun/star/sheet/XSolverDescription.hpp>
- #include <com/sun/star/lang/XServiceInfo.hpp>
diff --git a/patches/dev300/crosswin32-scp2-mingw.diff b/patches/dev300/crosswin32-scp2-mingw.diff
deleted file mode 100644
index a3e55f5..0000000
--- a/patches/dev300/crosswin32-scp2-mingw.diff
+++ /dev/null
@@ -1,274 +0,0 @@
-scp2/source/winexplorerext/file_winexplorerext.scp.pristine
---- scp2/source/winexplorerext/file_winexplorerext.scp.pristine 2008-11-27 09:24:30.000000000 +0100
-+++ scp2/source/winexplorerext/file_winexplorerext.scp 2008-11-27 09:24:08.000000000 +0100
-@@ -74,9 +74,11 @@
- End
- #endif
-
-+#if !defined __CROSS__
- File gid_File_Lib_Shlxtmsi
- TXT_FILE_BODY;
- Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
- Dir = gid_Dir_Program;
- Name = "shlxtmsi.dll";
- End
-+#endif /* !__CROSS__ */
-\ Geen regeleindeteken (LF) aan einde van bestand
-scp2/source/canvas/directxcanvas.scp.pristine
---- scp2/source/canvas/directxcanvas.scp.pristine 2008-06-24 14:18:48.000000000 +0200
-+++ scp2/source/canvas/directxcanvas.scp 2008-11-26 19:32:06.000000000 +0100
-@@ -30,7 +30,7 @@
-
- #include "macros.inc"
-
--#ifdef WNT
-+#if defined WNT && !defined __CROSS__
- # ifdef USE_DIRECTX5
- SPECIAL_UNO_COMPONENT_LIB_FILE(gid_File_Lib_DirectX5Canvas,directx5canvas.uno)
- # endif
-scp2/source/ooo/common_brand.scp.pristine
---- scp2/source/ooo/common_brand.scp.pristine 2008-11-26 11:18:01.000000000 +0100
-+++ scp2/source/ooo/common_brand.scp 2008-11-26 19:32:06.000000000 +0100
-@@ -628,7 +628,7 @@
- End
- #endif
-
--#if defined WNT && defined(_gcc3)
-+#if defined WNT && defined(_gcc3) && !defined __CROSS__
- File gid_Brand_File_Lib_Mingwm10
- BIN_FILE_BODY;
- Styles = (PACKED);
-scp2/source/ooo/file_library_ooo.scp.pristine
---- scp2/source/ooo/file_library_ooo.scp.pristine 2008-11-26 11:15:27.000000000 +0100
-+++ scp2/source/ooo/file_library_ooo.scp 2008-11-27 09:20:53.000000000 +0100
-@@ -29,7 +29,7 @@
- ************************************************************************/
- #include "macros.inc"
-
--#ifdef WNT
-+#if defined WNT && !defined __CROSS__
- File gid_File_Lib_Accessbridge
- BIN_FILE_BODY;
- Styles = (PACKED);
-@@ -41,7 +41,7 @@
- STD_UNO_LIB_FILE( gid_File_Lib_Adabas, adabas)
- #endif
-
--#if defined(WNT)
-+#if defined(WNT) && ! defined __CROSS__
- STD_UNO_LIB_FILE( gid_File_Lib_Ado, ado)
- #endif
-
-@@ -656,7 +656,7 @@
-
- STD_UNO_LIB_FILE( gid_File_Lib_Fwm , fwm)
-
--#ifdef WNT
-+#if defined WNT && !defined __CROSS__
- File gid_File_Lib_Gdiplus
- BIN_FILE_BODY;
- Styles = (PACKED);
-@@ -834,7 +834,7 @@
-
- #endif
-
--#ifdef WNT
-+#if defined WNT && !defined __CROSS__
-
- File gid_File_Lib_sn_tools
- BIN_FILE_BODY;
-@@ -845,7 +845,7 @@
-
- #endif
-
--#ifdef WNT
-+#if defined WNT && !defined __CROSS__
-
- File gid_File_Lib_relnotes
- BIN_FILE_BODY;
-@@ -957,7 +957,7 @@ File gid_File_Lib_Mozbootstrap
- #ifdef UNX
- Name = STRING(CONCAT2(libmozbootstrap,UNXSUFFIX));
- #else
-- Name = "libmozbootstrap.dll";
-+ Name = "mozbootstrap.dll";
- #endif
- End
-
-@@ -967,7 +967,7 @@
-
- STD_UNO_LIB_FILE(gid_File_Lib_Writerfilter,writerfilter)
-
--#ifdef WNT
-+#if defined WNT && !defined __CROSS__
- #if defined(_gcc3)
-
- File gid_File_Lib_Mingwm10
-@@ -1206,7 +1206,7 @@
-
- #endif
-
--#ifdef WNT
-+#if defined WNT && !defined __CROSS__
-
- File gid_File_Lib_Reg4allmsdoc
- TXT_FILE_BODY;
-@@ -1217,7 +1217,7 @@
-
- #endif
-
--#ifdef WNT
-+#if defined WNT && !defined __CROSS__
-
- File gid_File_Lib_Qslnkmsi
- TXT_FILE_BODY;
-@@ -1228,7 +1228,7 @@
-
- #endif
-
--#ifdef WNT
-+#if defined WNT && !defined __CROSS__
-
- File gid_File_Lib_Sdqsmsi
- TXT_FILE_BODY;
-@@ -1336,12 +1336,14 @@
-
- #ifdef WNT
-
-+#ifndef __CROSS__
- File gid_File_Lib_OOoFilt
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Program;
- Name = "ooofilt.dll";
- End
-+#endif /* !__CROSS__ */
-
- File gid_File_Lib_OOoFiltProxy
- TXT_FILE_BODY;
-@@ -1350,12 +1352,14 @@
- Name = "ooofiltproxy.dll";
- End
-
-+#ifndef __CROSS__
- File gid_File_Lib_Instooofiltmsi
- TXT_FILE_BODY;
- Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
- Dir = gid_Dir_Program;
- Name = "instooofiltmsi.dll";
- End
-+#endif /* !__CROSS__ */
-
- #endif
-
-@@ -1754,7 +1758,7 @@
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Program;
-- #ifdef WNT
-+ #if defined WNT && ! defined __CROSS__
- Name = "ssleay32.dll";
- #endif
- End
-@@ -1766,7 +1770,7 @@
- Styles = (PACKED);
- Dir = gid_Dir_Program;
-
-- #ifdef WNT
-+ #if defined WNT && ! defined __CROSS__
- Name = "libeay32.dll";
- #endif
- End
-scp2/source/ooo/windowscustomaction_ooo.scp.pristine
---- scp2/source/ooo/windowscustomaction_ooo.scp.pristine 2008-11-26 11:14:00.000000000 +0100
-+++ scp2/source/ooo/windowscustomaction_ooo.scp 2008-11-27 09:23:20.000000000 +0100
-@@ -30,6 +30,7 @@
-
- #include "macros.inc"
-
-+#ifndef __CROSS__
- WindowsCustomAction gid_Customaction_Regallmsdocdll
- Name = "Regallmsdocdll";
- Typ = "65";
-@@ -38,6 +39,7 @@
- Inbinarytable = 1;
- Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\" And Not PATCH", "CostFinalize");
- End
-+#endif /* !__CROSS__ */
-
- WindowsCustomAction gid_Customaction_Regactivexdll1
- Name = "Regactivexdll1";
-@@ -75,6 +77,7 @@
- Assignment1 = ("InstallExecuteSequence", "\&FEATURETEMPLATE=2 And \!FEATURETEMPLATE=3 And Not PATCH", "end");
- End
-
-+#ifndef __CROSS__
- WindowsCustomAction gid_Customaction_sdqsmsidll
- Name = "sdqsmsidll";
- Typ = "65";
-@@ -236,6 +239,7 @@
- Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\"", "end");
- Assignment2 = ("AdminExecuteSequence", "", "end");
- End
-+#endif /* !__CROSS__ */
-
- WindowsCustomAction gid_Customaction_RegCleanOld
- Name = "RegCleanOld";
-@@ -371,6 +375,7 @@
- Assignment10 = ("ControlCondition", "DestinationFolder", "LabelWrongProduct2", "Show", "ISWRONGPRODUCT");
- End
-
-+#ifndef __CROSS__
- WindowsCustomAction gid_Customaction_MigrateInstallPath
- Name = "MigrateInstallPath";
- Typ = "321";
-@@ -417,3 +422,4 @@
- Inbinarytable = 1;
- Assignment1 = ("ControlEvent", "SetupType", "Next", "DoAction", "SelectLanguage", "1", "1");
- End
-+#endif /* !__CROSS__ */
-scp2/source/ooo/scpaction_ooo.scp.pristine
---- scp2/source/ooo/scpaction_ooo.scp.pristine 2008-04-15 16:49:29.000000000 +0200
-+++ scp2/source/ooo/scpaction_ooo.scp 2008-11-26 19:32:06.000000000 +0100
-@@ -102,7 +102,7 @@
- #endif
- End
-
--#if defined(WNT) && defined(_gcc3)
-+#if defined(WNT) && defined(_gcc3) && !defined __CROSS__
- ScpAction SCP_COPY_MINGWM10
- Copy = "mingwm10.dll";
- Name = "mingwm10.dll";
-scp2/source/ooo/file_ooo.scp.pristine
---- scp2/source/ooo/file_ooo.scp.pristine 2008-11-26 11:17:34.000000000 +0100
-+++ scp2/source/ooo/file_ooo.scp 2008-11-26 19:32:06.000000000 +0100
-@@ -459,7 +459,7 @@
- EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(schart);
- End
-
--#if defined INCLUDE_JAVA_ACCESSBRIDGE && defined WNT
-+#if defined INCLUDE_JAVA_ACCESSBRIDGE && defined WNT && !defined __CROSS__
-
- File gid_File_Jar_Accessbridge
- TXT_FILE_BODY;
-scp2/source/ooo/ure.scp.pristine
---- scp2/source/ooo/ure.scp.pristine 2008-11-26 11:18:46.000000000 +0100
-+++ scp2/source/ooo/ure.scp 2008-11-26 19:32:06.000000000 +0100
-@@ -895,7 +895,7 @@
- End
- #endif
-
--#if (defined WNT && defined _gcc3)
-+#if (defined WNT && defined _gcc3) && !defined __CROSS__
- File gid_File_Lib_Mingwm10_Ure
- TXT_FILE_BODY;
- Dir = SCP2_URE_DL_DIR;
-@@ -937,7 +937,7 @@
- #endif
- #endif
-
--#if defined WNT
-+#if defined WNT && !defined __CROSS__
- File gid_File_Dl_Unicows
- TXT_FILE_BODY;
- Dir = SCP2_URE_DL_DIR;
diff --git a/patches/dev300/crosswin32-setup_native-mingw.diff b/patches/dev300/crosswin32-setup_native-mingw.diff
deleted file mode 100644
index b6606b0..0000000
--- a/patches/dev300/crosswin32-setup_native-mingw.diff
+++ /dev/null
@@ -1,18 +0,0 @@
---- setup_native/source/win32/customactions/tools/seterror.cxx.pristine 2008-10-28 20:55:13.000000000 +0100
-+++ setup_native/source/win32/customactions/tools/seterror.cxx 2008-10-28 21:12:01.000000000 +0100
-@@ -41,14 +41,14 @@
- #include <string.h>
- #include <malloc.h>
- #include <stdio.h>
--#include "strsafe.h"
-
- #include <seterror.hxx>
-
- //----------------------------------------------------------
- #ifdef DEBUG
-+#include "strsafe.h"
- inline void OutputDebugStringFormat( LPCTSTR pFormat, ... )
- {
- TCHAR buffer[1024];
-
-
diff --git a/patches/dev300/crosswin32-shell-mingw.diff b/patches/dev300/crosswin32-shell-mingw.diff
deleted file mode 100644
index fcdb514..0000000
--- a/patches/dev300/crosswin32-shell-mingw.diff
+++ /dev/null
@@ -1,327 +0,0 @@
---- shell/source/all/ooofilereader/makefile.mk.~1.7.~ 2008-07-22 19:48:30.000000000 +0200
-+++ shell/source/all/ooofilereader/makefile.mk 2008-11-03 20:35:11.000000000 +0100
-@@ -51,6 +51,10 @@ CDEFS_X64+=-D_WIN32_IE=0x501
- CFLAGS+=-DISOLATION_AWARE_ENABLED -DXML_UNICODE -DXML_UNICODE_WCHAR_T -DUNICODE -D_UNICODE
- .ENDIF
-
-+.IF "$(SYSTEM_EXPAT)" == "YES"
-+CFLAGS+=-DSYSTEM_EXPAT
-+.ENDIF
-+
- # --- Files --------------------------------------------------------
-
-
---- shell/source/win32/sysshell/systemshell.cxx.~1.6.~ 2008-04-11 10:29:13.000000000 +0200
-+++ shell/source/win32/sysshell/systemshell.cxx 2008-11-04 12:05:46.000000000 +0100
-@@ -38,10 +38,14 @@
- #pragma warning(push, 1)
- #pragma warning(disable:4917)
- #endif
--#include <Shlobj.h>
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list