[ooo-build-commit] .: patches/dev300
Thorsten Behrens
thorsten at kemper.freedesktop.org
Wed Feb 17 07:20:55 PST 2010
patches/dev300/apply | 6 +
patches/dev300/python-win32-buildfix.diff | 52 +++++++++++
patches/dev300/win32-force-version-fix.diff | 131 ++++++++++++++++++++++++++++
patches/dev300/win32-vs2005-compat.diff | 89 +++++++++++++++++++
4 files changed, 277 insertions(+), 1 deletion(-)
New commits:
commit 0568e7bd1e11c05eb67166f9962d0560197f2407
Author: Thorsten Behrens <tbehrens at novell.com>
Date: Wed Feb 17 16:15:30 2010 +0100
Finish support for win32 VS8.0
* patches/dev300/apply: added patches
* patches/dev300/python-win32-buildfix.diff: more delivering from
deep inside python build tree for vc8, 7.1 and 6
* patches/dev300/win32-force-version-fix.diff: make sure proper
winver is set, prior to including windows.h and using newer api
* patches/dev300/win32-vs2005-compat.diff: fixes minor vs8 compat
things, like subtly different namespace lookup
diff --git a/patches/dev300/apply b/patches/dev300/apply
index dc710c0..e63c2a8 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3575,9 +3575,13 @@ connectivity-build-fix.diff, i#107957, fridrich
# Allow oowintool to detect java sdk 1.6.x
oowintool-java6.diff, fridrich
-[ BuildBits > dev300-m70 < ooo320-m0 ]
+[ BuildBits >= dev300-m69 < ooo320-m0 ]
# make python build properly on win32
python-win32-buildfix.diff, thorsten
+# force WINVER when using non-std win api
+win32-force-version-fix.diff, thorsten
+# workaround a few VS8.0 compat problems
+win32-vs2005-compat.diff, thorsten
[ Netbook ]
vcl-netbook.diff, rodo
diff --git a/patches/dev300/python-win32-buildfix.diff b/patches/dev300/python-win32-buildfix.diff
index 8f5eee7..24246c4 100644
--- a/patches/dev300/python-win32-buildfix.diff
+++ b/patches/dev300/python-win32-buildfix.diff
@@ -379,3 +379,55 @@ diff --git a/python/makefile.mk b/python/makefile.mk
.ENDIF
.ENDIF
+diff --git a/python/prj/d.lst b/python/prj/d.lst
+--- python/prj/d.lst
++++ python/prj/d.lst
+@@ -104,6 +104,48 @@
+ ..\%__SRC%\misc\build\Python-2.6.1\PCbuild\_msi.pyd %_DEST%\lib%_EXT%\python\_msi.pyd
+ ..\%__SRC%\misc\build\Python-2.6.1\PCbuild\_elementtree.pyd %_DEST%\lib%_EXT%\python\_elementtree.pyd
+ ..\%__SRC%\misc\build\Python-2.6.1\PCbuild\_ctypes.pyd %_DEST%\lib%_EXT%\python\_ctypes.pyd
++..\%__SRC%\misc\build\Python-2.6.1\PC\VS8.0\python.exe %_DEST%\bin%_EXT%\python.exe
++..\%__SRC%\misc\build\Python-2.6.1\PC\VS8.0\python26.dll %_DEST%\bin%_EXT%\python26.dll
++..\%__SRC%\misc\build\Python-2.6.1\PC\VS8.0\python26.lib %_DEST%\lib%_EXT%\python26.lib
++..\%__SRC%\misc\build\Python-2.6.1\PC\VS8.0\_socket.pyd %_DEST%\lib%_EXT%\python\_socket.pyd
++..\%__SRC%\misc\build\Python-2.6.1\PC\VS8.0\_ssl.pyd %_DEST%\lib%_EXT%\python\_ssl.pyd
++..\%__SRC%\misc\build\Python-2.6.1\PC\VS8.0\select.pyd %_DEST%\lib%_EXT%\python\select.pyd
++..\%__SRC%\misc\build\Python-2.6.1\PC\VS8.0\unicodedata.pyd %_DEST%\lib%_EXT%\python\unicodedata.pyd
++..\%__SRC%\misc\build\Python-2.6.1\PC\VS8.0\winsound.pyd %_DEST%\lib%_EXT%\python\winsound.pyd
++..\%__SRC%\misc\build\Python-2.6.1\PC\VS8.0\pyexpat.pyd %_DEST%\lib%_EXT%\python\pyexpat.pyd
++..\%__SRC%\misc\build\Python-2.6.1\PC\VS8.0\_testcapi.pyd %_DEST%\lib%_EXT%\python\_testcapi.pyd
++..\%__SRC%\misc\build\Python-2.6.1\PC\VS8.0\_multiprocessing.pyd %_DEST%\lib%_EXT%\python\_multiprocessing.pyd
++..\%__SRC%\misc\build\Python-2.6.1\PC\VS8.0\_msi.pyd %_DEST%\lib%_EXT%\python\_msi.pyd
++..\%__SRC%\misc\build\Python-2.6.1\PC\VS8.0\_elementtree.pyd %_DEST%\lib%_EXT%\python\_elementtree.pyd
++..\%__SRC%\misc\build\Python-2.6.1\PC\VS8.0\_ctypes.pyd %_DEST%\lib%_EXT%\python\_ctypes.pyd
++..\%__SRC%\misc\build\Python-2.6.1\PC\VS7.1\python.exe %_DEST%\bin%_EXT%\python.exe
++..\%__SRC%\misc\build\Python-2.6.1\PC\VS7.1\python26.dll %_DEST%\bin%_EXT%\python26.dll
++..\%__SRC%\misc\build\Python-2.6.1\PC\VS7.1\python26.lib %_DEST%\lib%_EXT%\python26.lib
++..\%__SRC%\misc\build\Python-2.6.1\PC\VS7.1\_socket.pyd %_DEST%\lib%_EXT%\python\_socket.pyd
++..\%__SRC%\misc\build\Python-2.6.1\PC\VS7.1\_ssl.pyd %_DEST%\lib%_EXT%\python\_ssl.pyd
++..\%__SRC%\misc\build\Python-2.6.1\PC\VS7.1\select.pyd %_DEST%\lib%_EXT%\python\select.pyd
++..\%__SRC%\misc\build\Python-2.6.1\PC\VS7.1\unicodedata.pyd %_DEST%\lib%_EXT%\python\unicodedata.pyd
++..\%__SRC%\misc\build\Python-2.6.1\PC\VS7.1\winsound.pyd %_DEST%\lib%_EXT%\python\winsound.pyd
++..\%__SRC%\misc\build\Python-2.6.1\PC\VS7.1\pyexpat.pyd %_DEST%\lib%_EXT%\python\pyexpat.pyd
++..\%__SRC%\misc\build\Python-2.6.1\PC\VS7.1\_testcapi.pyd %_DEST%\lib%_EXT%\python\_testcapi.pyd
++..\%__SRC%\misc\build\Python-2.6.1\PC\VS7.1\_multiprocessing.pyd %_DEST%\lib%_EXT%\python\_multiprocessing.pyd
++..\%__SRC%\misc\build\Python-2.6.1\PC\VS7.1\_msi.pyd %_DEST%\lib%_EXT%\python\_msi.pyd
++..\%__SRC%\misc\build\Python-2.6.1\PC\VS7.1\_elementtree.pyd %_DEST%\lib%_EXT%\python\_elementtree.pyd
++..\%__SRC%\misc\build\Python-2.6.1\PC\VS7.1\_ctypes.pyd %_DEST%\lib%_EXT%\python\_ctypes.pyd
++..\%__SRC%\misc\build\Python-2.6.1\PC\VC6\python.exe %_DEST%\bin%_EXT%\python.exe
++..\%__SRC%\misc\build\Python-2.6.1\PC\VC6\python26.dll %_DEST%\bin%_EXT%\python26.dll
++..\%__SRC%\misc\build\Python-2.6.1\PC\VC6\python26.lib %_DEST%\lib%_EXT%\python26.lib
++..\%__SRC%\misc\build\Python-2.6.1\PC\VC6\_socket.pyd %_DEST%\lib%_EXT%\python\_socket.pyd
++..\%__SRC%\misc\build\Python-2.6.1\PC\VC6\_ssl.pyd %_DEST%\lib%_EXT%\python\_ssl.pyd
++..\%__SRC%\misc\build\Python-2.6.1\PC\VC6\select.pyd %_DEST%\lib%_EXT%\python\select.pyd
++..\%__SRC%\misc\build\Python-2.6.1\PC\VC6\unicodedata.pyd %_DEST%\lib%_EXT%\python\unicodedata.pyd
++..\%__SRC%\misc\build\Python-2.6.1\PC\VC6\winsound.pyd %_DEST%\lib%_EXT%\python\winsound.pyd
++..\%__SRC%\misc\build\Python-2.6.1\PC\VC6\pyexpat.pyd %_DEST%\lib%_EXT%\python\pyexpat.pyd
++..\%__SRC%\misc\build\Python-2.6.1\PC\VC6\_testcapi.pyd %_DEST%\lib%_EXT%\python\_testcapi.pyd
++..\%__SRC%\misc\build\Python-2.6.1\PC\VC6\_multiprocessing.pyd %_DEST%\lib%_EXT%\python\_multiprocessing.pyd
++..\%__SRC%\misc\build\Python-2.6.1\PC\VC6\_msi.pyd %_DEST%\lib%_EXT%\python\_msi.pyd
++..\%__SRC%\misc\build\Python-2.6.1\PC\VC6\_elementtree.pyd %_DEST%\lib%_EXT%\python\_elementtree.pyd
++..\%__SRC%\misc\build\Python-2.6.1\PC\VC6\_ctypes.pyd %_DEST%\lib%_EXT%\python\_ctypes.pyd
+
+ #linklib: libpython.so.*.*.*
+
diff --git a/patches/dev300/win32-force-version-fix.diff b/patches/dev300/win32-force-version-fix.diff
new file mode 100644
index 0000000..6a3a91b
--- /dev/null
+++ b/patches/dev300/win32-force-version-fix.diff
@@ -0,0 +1,131 @@
+diff --git a/canvas/source/cairo/cairo_win32_cairo.cxx b/canvas/source/cairo/cairo_win32_cairo.cxx
+--- canvas/source/cairo/cairo_win32_cairo.cxx
++++ canvas/source/cairo/cairo_win32_cairo.cxx
+@@ -28,6 +28,8 @@
+ *
+ ************************************************************************/
+
++#define _WIN32_WINNT 0x0500
++
+ // MARKER(update_precomp.py): autogen include statement, do not remove
+ #include "precompiled_canvas.hxx"
+
+diff --git a/connectivity/source/drivers/ado/ADriver.cxx b/connectivity/source/drivers/ado/ADriver.cxx
+--- connectivity/source/drivers/ado/ADriver.cxx
++++ connectivity/source/drivers/ado/ADriver.cxx
+@@ -28,6 +28,8 @@
+ *
+ ************************************************************************/
+
++#define _WIN32_WINNT 0x0501
++
+ // MARKER(update_precomp.py): autogen include statement, do not remove
+ #include "precompiled_connectivity.hxx"
+ #include "ado/ADriver.hxx"
+diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
+--- desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
++++ desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
+@@ -29,6 +29,8 @@
+ *
+ ************************************************************************/
+
++#define _WIN32_WINNT 0x0500
++
+ // MARKER(update_precomp.py): autogen include statement, do not remove
+ #include "precompiled_desktop.hxx"
+
+diff --git a/desktop/win32/source/setup/setup.cpp b/desktop/win32/source/setup/setup.cpp
+--- desktop/win32/source/setup/setup.cpp
++++ desktop/win32/source/setup/setup.cpp
+@@ -29,6 +29,7 @@
+ ************************************************************************/
+
+ #define WIN // scope W32 API
++#define _WIN32_WINNT 0x0501
+
+ #if defined _MSC_VER
+ #pragma warning(push, 1)
+diff --git a/fpicker/source/win32/filepicker/FileOpenDlg.cxx b/fpicker/source/win32/filepicker/FileOpenDlg.cxx
+--- fpicker/source/win32/filepicker/FileOpenDlg.cxx
++++ fpicker/source/win32/filepicker/FileOpenDlg.cxx
+@@ -28,6 +28,8 @@
+ *
+ ************************************************************************/
+
++#define _WIN32_WINNT 0x0500
++
+ // MARKER(update_precomp.py): autogen include statement, do not remove
+ #include "precompiled_fpicker.hxx"
+
+diff --git a/i18npool/source/isolang/inwnt.cxx b/i18npool/source/isolang/inwnt.cxx
+--- i18npool/source/isolang/inwnt.cxx
++++ i18npool/source/isolang/inwnt.cxx
+@@ -32,6 +32,8 @@
+
+ #include <sal/config.h>
+
++#define WINVER 0x0500
++
+ #ifdef _MSC_VER
+ #pragma warning(push,1) // disable warnings within system headers
+ #endif
+diff --git a/sal/osl/w32/file_dirvol.cxx b/sal/osl/w32/file_dirvol.cxx
+--- sal/osl/w32/file_dirvol.cxx
++++ sal/osl/w32/file_dirvol.cxx
+@@ -30,7 +30,7 @@
+
+ #define UNICODE
+ #define _UNICODE
+-#define _WIN32_WINNT_0x0500
++#define _WIN32_WINNT 0x0500
+ #include "systools/win32/uwinapi.h"
+
+ #include "osl/file.h"
+diff --git a/sal/osl/w32/file_error.c b/sal/osl/w32/file_error.c
+--- sal/osl/w32/file_error.c
++++ sal/osl/w32/file_error.c
+@@ -30,7 +30,7 @@
+
+ #define UNICODE
+ #define _UNICODE
+-#define _WIN32_WINNT_0x0500
++#define _WIN32_WINNT 0x0500
+ #include "systools/win32/uwinapi.h"
+
+ #include "file_error.h"
+diff --git a/sal/osl/w32/file_url.cxx b/sal/osl/w32/file_url.cxx
+--- sal/osl/w32/file_url.cxx
++++ sal/osl/w32/file_url.cxx
+@@ -30,7 +30,7 @@
+
+ #define UNICODE
+ #define _UNICODE
+-#define _WIN32_WINNT_0x0500
++#define _WIN32_WINNT 0x0500
+ #include "systools/win32/uwinapi.h"
+
+ #include "file_url.h"
+diff --git a/sal/osl/w32/tempfile.cxx b/sal/osl/w32/tempfile.cxx
+--- sal/osl/w32/tempfile.cxx
++++ sal/osl/w32/tempfile.cxx
+@@ -30,7 +30,7 @@
+
+ #define UNICODE
+ #define _UNICODE
+-#define _WIN32_WINNT_0x0500
++#define _WIN32_WINNT 0x0500
+ #include "systools/win32/uwinapi.h"
+
+ #include "osl/file.h"
+diff --git a/vcl/win/source/gdi/salprn.cxx b/vcl/win/source/gdi/salprn.cxx
+--- vcl/win/source/gdi/salprn.cxx
++++ vcl/win/source/gdi/salprn.cxx
+@@ -31,6 +31,8 @@
+ // MARKER(update_precomp.py): autogen include statement, do not remove
+ #include "precompiled_vcl.hxx"
+
++#define WINVER 0x0500
++
+ #include <string.h>
+ #include <tools/svwin.h>
+
diff --git a/patches/dev300/win32-vs2005-compat.diff b/patches/dev300/win32-vs2005-compat.diff
new file mode 100644
index 0000000..0ec25be
--- /dev/null
+++ b/patches/dev300/win32-vs2005-compat.diff
@@ -0,0 +1,89 @@
+diff --git a/cppu/inc/com/sun/star/uno/Reference.h b/cppu/inc/com/sun/star/uno/Reference.h
+--- cppu/inc/com/sun/star/uno/Reference.h
++++ cppu/inc/com/sun/star/uno/Reference.h
+@@ -242,13 +242,13 @@
+ public:
+ // these are here to force memory de/allocation to sal lib.
+ /** @internal */
+- inline static void * SAL_CALL operator new ( size_t nSize ) SAL_THROW( () )
++ inline static void * SAL_CALL operator new ( ::size_t nSize ) SAL_THROW( () )
+ { return ::rtl_allocateMemory( nSize ); }
+ /** @internal */
+ inline static void SAL_CALL operator delete ( void * pMem ) SAL_THROW( () )
+ { ::rtl_freeMemory( pMem ); }
+ /** @internal */
+- inline static void * SAL_CALL operator new ( size_t, void * pMem ) SAL_THROW( () )
++ inline static void * SAL_CALL operator new ( ::size_t, void * pMem ) SAL_THROW( () )
+ { return pMem; }
+ /** @internal */
+ inline static void SAL_CALL operator delete ( void *, void * ) SAL_THROW( () )
+diff --git a/cppu/inc/com/sun/star/uno/Sequence.h b/cppu/inc/com/sun/star/uno/Sequence.h
+--- cppu/inc/com/sun/star/uno/Sequence.h
++++ cppu/inc/com/sun/star/uno/Sequence.h
+@@ -72,7 +72,7 @@
+ public:
+ // these are here to force memory de/allocation to sal lib.
+ /** @internal */
+- inline static void * SAL_CALL operator new ( size_t nSize )
++ inline static void * SAL_CALL operator new ( ::size_t nSize )
+ SAL_THROW( () )
+ { return ::rtl_allocateMemory( nSize ); }
+ /** @internal */
+@@ -80,7 +80,7 @@
+ SAL_THROW( () )
+ { ::rtl_freeMemory( pMem ); }
+ /** @internal */
+- inline static void * SAL_CALL operator new ( size_t, void * pMem )
++ inline static void * SAL_CALL operator new ( ::size_t, void * pMem )
+ SAL_THROW( () )
+ { return pMem; }
+ /** @internal */
+diff --git a/setup_native/source/win32/customactions/rebase/rebase.cxx b/setup_native/source/win32/customactions/rebase/rebase.cxx
+--- setup_native/source/win32/customactions/rebase/rebase.cxx
++++ setup_native/source/win32/customactions/rebase/rebase.cxx
+@@ -68,8 +68,8 @@
+ ULONG_PTR lpNewImageBase = reinterpret_cast<ULONG_PTR>(address);
+
+ BOOL bResult = ReBaseImage(
+- filePath.c_str(),
+- "",
++ (PSTR)filePath.c_str(),
++ (PSTR)"",
+ TRUE,
+ FALSE,
+ FALSE,
+diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
+--- sw/source/filter/ww8/wrtw8nds.cxx
++++ sw/source/filter/ww8/wrtw8nds.cxx
+@@ -701,14 +701,14 @@
+ /*Get defaults if no formatting on ruby text*/
+
+ const SfxItemPool *pPool = rNode.GetSwAttrSet().GetPool();
+- const SfxItemPool &rPool = pPool ? *pPool : m_rWW8Export.pDoc->GetAttrPool();
++ pPool = pPool ? pPool : &m_rWW8Export.pDoc->GetAttrPool();
+
+- const SvxFontItem &rFont = DefaultItemGet< SvxFontItem >( rPool,
++ const SvxFontItem &rFont = DefaultItemGet< SvxFontItem >( *pPool,
+ GetWhichOfScript( RES_CHRATR_FONT,nRubyScript ) );
+ sFamilyName = rFont.GetFamilyName();
+
+ const SvxFontHeightItem &rHeight = DefaultItemGet< SvxFontHeightItem >
+- ( rPool, GetWhichOfScript( RES_CHRATR_FONTSIZE, nRubyScript ) );
++ ( *pPool, GetWhichOfScript( RES_CHRATR_FONTSIZE, nRubyScript ) );
+ nHeight = rHeight.GetHeight();
+ }
+ nHeight = (nHeight + 5)/10;
+diff --git a/vos/inc/vos/object.hxx b/vos/inc/vos/object.hxx
+--- vos/inc/vos/object.hxx
++++ vos/inc/vos/object.hxx
+@@ -73,8 +73,8 @@
+ /** Define private new and delete operator because of compiler bug,
+ when allocating and deleteing a exported class
+ */
+- void* SAL_CALL operator new(size_t size);
+- void* SAL_CALL operator new(size_t size, void* p);
++ void* SAL_CALL operator new(::size_t size);
++ void* SAL_CALL operator new(::size_t size, void* p);
+
+ void SAL_CALL operator delete(void* p);
+
More information about the ooo-build-commit
mailing list