[ooo-build-commit] patches/dev300
Fridrich Strba
fridrich at kemper.freedesktop.org
Thu Dec 3 08:21:33 PST 2009
patches/dev300/apply | 113 +++---
patches/dev300/crosswin32-desktop-mingw-res.diff | 346 +++++++++++++++++++
patches/dev300/crosswin32-desktop-mingw.diff | 346 -------------------
patches/dev300/crosswin32-external-mingwheaders.diff | 72 +--
patches/dev300/crosswin32-i18npool-cross.diff | 8
patches/dev300/crosswin32-solenv-mingw-res.diff | 115 ++++++
patches/dev300/crosswin32-solenv-mingw.diff | 115 ------
7 files changed, 551 insertions(+), 564 deletions(-)
New commits:
commit 3bbc1bcd0aa7fa73a536345d68b77affca3df6ac
Author: Fridrich Strba <fridrich.strba at bluewin.ch>
Date: Thu Dec 3 16:52:33 2009 +0100
Some more work on trying to make the crosswin32 patches apply
* patches/dev300/apply:
* patches/dev300/crosswin32-desktop-mingw-res.diff:
* patches/dev300/crosswin32-desktop-mingw.diff:
* patches/dev300/crosswin32-external-mingwheaders.diff:
* patches/dev300/crosswin32-i18npool-cross.diff:
* patches/dev300/crosswin32-solenv-mingw-res.diff:
* patches/dev300/crosswin32-solenv-mingw.diff:
diff --git a/patches/dev300/apply b/patches/dev300/apply
index f05a4a9..2578ae8 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3234,62 +3234,6 @@ oox-pptx-export-animations-paragraph-target.diff, n#497570, rodo
oox-pptx-export-blip-luminance.diff, n#497570, rodo
oox-calc-export-sotstorage-init.diff, n#505917, janneke
-[ CrossWin32Patches ]
-# Experimental patches to crosscompile OOo for Win32
-crosswin32-accessibility-nojava.diff
-crosswin32-basegfx-no-cppunit.diff
-#crosswin32-bridges-mingw.diff
-crosswin32-config_office-cross.diff
-crosswin32-config_office-mingw.diff
-crosswin32-connectivity-mingw.diff
-crosswin32-cppuhelper-mingw.diff
-crosswin32-cppunit-mingw.diff
-crosswin32-dbaccess-mingw.diff
-crosswin32-desktop-mingw.diff
-crosswin32-dtrans-mingw.diff
-crosswin32-embeddedobj-mingw.diff
-#crosswin32-embedserv-mingw.diff
-crosswin32-extensions-mingw.diff
-#crosswin32-external-mingwheaders.diff
-crosswin32-fpicker-mingw.diff
-crosswin32-funit-char-line.diff
-#crosswin32-goodies-mingw.diff
-#crosswin32-helpcontent2-mingw.diff
-crosswin32-hyphen-mingw.diff
-crosswin32-i18npool-cross.diff
-crosswin32-i18npool-mingw.diff
-crosswin32-icc-cross.diff
-crosswin32-instsetoo_native-mingw.diff
-crosswin32-lingucomponent-mingw.diff
-crosswin32-o3tl-no-cppunit.diff
-crosswin32-unixodbc-disable.diff
-crosswin32-odk-cross.diff
-crosswin32-postprocess-mingw.diff
-crosswin32-pyuno-mingw.diff
-crosswin32-sal-cross.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-cross.diff
-crosswin32-solenv-mingw-installer.diff
-crosswin32-solenv-mingw.diff
-crosswin32-solenv.diff
-crosswin32-soltools-cross.diff
-crosswin32-store-core.diff
-crosswin32-store-registry.diff
-crosswin32-svx-mingw.diff
-crosswin32-sysui-mingw.diff
-crosswin32-tools-mingw.diff
-crosswin32-trans-mingw.diff
-crosswin32-unotools-mingw.diff
-crosswin32-vcl-mingw.diff
-crosswin32-writerperfect-cross.diff
-# things to fix later
-crosswin32-ugly-hacks.diff
-
[ Experimental ]
experimental_ooapi.diff, flr
desktop-cmd-bulk-conversion.diff, flr
@@ -3443,6 +3387,63 @@ libwpg-testing.diff
libwps-testing.diff
writerperfect-testing.diff
+[ CrossWin32Patches ]
+# Experimental patches to crosscompile OOo for Win32
+crosswin32-accessibility-nojava.diff
+crosswin32-basegfx-no-cppunit.diff
+crosswin32-config_office-cross.diff
+crosswin32-config_office-mingw.diff
+crosswin32-connectivity-mingw.diff
+crosswin32-cppuhelper-mingw.diff
+crosswin32-cppunit-mingw.diff
+crosswin32-dbaccess-mingw.diff
+crosswin32-desktop-mingw.diff
+crosswin32-desktop-mingw-res.diff
+crosswin32-dtrans-mingw.diff
+crosswin32-embeddedobj-mingw.diff
+#crosswin32-embedserv-mingw.diff
+crosswin32-extensions-mingw.diff
+crosswin32-external-mingwheaders.diff
+crosswin32-fpicker-mingw.diff
+crosswin32-funit-char-line.diff
+#crosswin32-goodies-mingw.diff
+#crosswin32-helpcontent2-mingw.diff
+crosswin32-hyphen-mingw.diff
+crosswin32-i18npool-cross.diff
+crosswin32-i18npool-mingw.diff
+crosswin32-icc-cross.diff
+crosswin32-instsetoo_native-mingw.diff
+crosswin32-lingucomponent-mingw.diff
+crosswin32-o3tl-no-cppunit.diff
+crosswin32-unixodbc-disable.diff
+crosswin32-odk-cross.diff
+crosswin32-postprocess-mingw.diff
+crosswin32-pyuno-mingw.diff
+crosswin32-sal-cross.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-cross.diff
+crosswin32-solenv-mingw-installer.diff
+crosswin32-solenv-mingw.diff
+crosswin32-solenv-mingw-res.diff
+crosswin32-solenv.diff
+crosswin32-soltools-cross.diff
+crosswin32-store-core.diff
+crosswin32-store-registry.diff
+crosswin32-svx-mingw.diff
+crosswin32-sysui-mingw.diff
+crosswin32-tools-mingw.diff
+crosswin32-trans-mingw.diff
+crosswin32-unotools-mingw.diff
+crosswin32-vcl-mingw.diff
+crosswin32-writerperfect-cross.diff
+# things to fix later
+crosswin32-ugly-hacks.diff
+
[ Misc ]
# make the always save behavior configurable.
diff --git a/patches/dev300/crosswin32-desktop-mingw-res.diff b/patches/dev300/crosswin32-desktop-mingw-res.diff
new file mode 100644
index 0000000..8aabe64
--- /dev/null
+++ b/patches/dev300/crosswin32-desktop-mingw-res.diff
@@ -0,0 +1,346 @@
+--- desktop/util/verinfo.rc.~1.19.12.1.~ 2008-09-19 09:30:39.000000000 +0200
++++ desktop/util/verinfo.rc 2008-11-05 15:04:37.000000000 +0100
+@@ -38,16 +38,16 @@
+ // version information
+ // -----------------------------------------------------------------------
+
+-VS_VERSION_INFO versioninfo
++VS_VERSION_INFO VERSIONINFO
+ #ifndef SUBVERSION
+- fileversion VERSION, 0, VERVARIANT, VER_COUNT
+- productversion VERSION, 0, VERVARIANT, VER_COUNT
++ FILEVERSION VERSION, 0, VERVARIANT, VER_COUNT
++ PRODUCTVERSION VERSION, 0, VERVARIANT, VER_COUNT
+ #else
+- fileversion VERSION, SUBVERSION, VERVARIANT, VER_COUNT
+- productversion VERSION, SUBVERSION, VERVARIANT, VER_COUNT
++ FILEVERSION VERSION, SUBVERSION, VERVARIANT, VER_COUNT
++ PRODUCTVERSION VERSION, SUBVERSION, VERVARIANT, VER_COUNT
+ #endif
+- fileflagsmask 0x3F
+- fileflags
++ FILEFLAGSMASK 0x3F
++ FILEFLAGS
+ #if defined(DEBUG)
+ VS_FF_DEBUG |
+ #endif
+@@ -56,87 +56,87 @@
+ #endif
+ 0
+ #ifndef WIN32
+- fileos VOS_DOS_WINDOWS16
++ FILEOS VOS_DOS_WINDOWS16
+ #else
+- fileos VOS_NT_WINDOWS32
++ FILEOS VOS_NT_WINDOWS32
+ #endif
+- filetype VFT_APP
++ FILETYPE VFT_APP
+ {
+- block "StringFileInfo"
++ BLOCK "StringFileInfo"
+ {
+ #ifdef LG_D
+- block "040704E4"
++ BLOCK "040704E4"
+ {
+ // German StringTable
+- value "CompanyName", "Sun Microsystems, Inc.\0"
+- value "FileDescription", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0"
+- value "FileVersion", PPS(VER_LEVEL) "\0"
+- value "ProductVersion", PPS(VER_LEVEL) "\0"
+- value "OriginalFilename", "SOFFICE.EXE\0"
+- value "InternalName", "SOFFICE\0"
+- value "LegalCopyright", S_CRIGHT " Sun Microsystems, Inc.\0"
++ VALUE "CompanyName", "Sun Microsystems, Inc.\0"
++ VALUE "FileDescription", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0"
++ VALUE "FileVersion", PPS(VER_LEVEL) "\0"
++ VALUE "ProductVersion", PPS(VER_LEVEL) "\0"
++ VALUE "OriginalFilename", "SOFFICE.EXE\0"
++ VALUE "InternalName", "SOFFICE\0"
++ VALUE "LegalCopyright", S_CRIGHT " Sun Microsystems, Inc.\0"
+ }
+ #else
+- block "040904E4"
++ BLOCK "040904E4"
+ {
+ // International StringTable
+- value "CompanyName", "Sun Microsystems, Inc.\0"
+- value "FileDescription", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0"
+- value "FileVersion", PPS(VER_LEVEL) "\0"
+- value "ProductVersion", PPS(VER_LEVEL) "\0"
+- value "OriginalFilename", "SOFFICE.EXE\0"
+- value "InternalName", "SOFFICE\0"
+- value "LegalCopyright", S_CRIGHT " Sun Microsystems, Inc.\0"
++ VALUE "CompanyName", "Sun Microsystems, Inc.\0"
++ VALUE "FileDescription", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0"
++ VALUE "FileVersion", PPS(VER_LEVEL) "\0"
++ VALUE "ProductVersion", PPS(VER_LEVEL) "\0"
++ VALUE "OriginalFilename", "SOFFICE.EXE\0"
++ VALUE "InternalName", "SOFFICE\0"
++ VALUE "LegalCopyright", S_CRIGHT " Sun Microsystems, Inc.\0"
+ }
+ #endif
+ }
+
+- block "VarFileInfo"
++ BLOCK "VarFileInfo"
+ {
+ #ifdef LG_D
+- value "Translation", 0x0407, 1252
++ VALUE "Translation", 0x0407, 1252
+ #else
+- value "Translation", 0x0409, 1252
++ VALUE "Translation", 0x0409, 1252
+ #endif
+ }
+ }
+
+-2 ICON "icons\\oasis-text.ico"
+-3 ICON "icons\\oasis-text-template.ico"
+-4 ICON "icons\\oasis-spreadsheet.ico"
+-5 ICON "icons\\oasis-spreadsheet-template.ico"
+-6 ICON "icons\\oasis-drawing.ico"
+-7 ICON "icons\\oasis-drawing-template.ico"
+-8 ICON "icons\\oasis-presentation.ico"
+-9 ICON "icons\\oasis-presentation-template.ico"
+-10 ICON "icons\\oasis-presentation-template.ico"
+-11 ICON "icons\\oasis-master-document.ico"
+-12 ICON "icons\\oasis-web-template.ico"
+-13 ICON "icons\\oasis-empty-document.ico"
+-14 ICON "icons\\oasis-database.ico"
+-15 ICON "icons\\oasis-formula.ico"
+-16 ICON "icons\\empty-template.ico"
+-17 ICON "icons\\empty-document.ico"
+-18 ICON "icons\\so8-configuration.ico"
+-19 ICON "icons\\so8-open.ico"
+-20 ICON "icons\\empty-document.ico"
+-21 ICON "icons\\so9_writer_app.ico"
+-22 ICON "icons\\so9_calc_app.ico"
+-23 ICON "icons\\so9_draw_app.ico"
+-24 ICON "icons\\so9_impress_app.ico"
+-25 ICON "icons\\so9_math_app.ico"
+-26 ICON "icons\\so9_base_app.ico"
+-27 ICON "icons\\oasis-empty-document.ico"
+-28 ICON "icons\\text.ico"
+-29 ICON "icons\\text-template.ico"
+-30 ICON "icons\\spreadsheet.ico"
+-31 ICON "icons\\spreadsheet-template.ico"
+-32 ICON "icons\\drawing.ico"
+-33 ICON "icons\\drawing-template.ico"
+-34 ICON "icons\\presentation.ico"
+-35 ICON "icons\\presentation-template.ico"
+-36 ICON "icons\\master-document.ico"
+-37 ICON "icons\\empty-document.ico"
+-38 ICON "icons\\database.ico"
+-39 ICON "icons\\formula.ico"
+-40 ICON "icons\\oxt-extension.ico"
++2 ICON "icons/oasis-text.ico"
++3 ICON "icons/oasis-text-template.ico"
++4 ICON "icons/oasis-spreadsheet.ico"
++5 ICON "icons/oasis-spreadsheet-template.ico"
++6 ICON "icons/oasis-drawing.ico"
++7 ICON "icons/oasis-drawing-template.ico"
++8 ICON "icons/oasis-presentation.ico"
++9 ICON "icons/oasis-presentation-template.ico"
++10 ICON "icons/oasis-presentation-template.ico"
++11 ICON "icons/oasis-master-document.ico"
++12 ICON "icons/oasis-web-template.ico"
++13 ICON "icons/oasis-empty-document.ico"
++14 ICON "icons/oasis-database.ico"
++15 ICON "icons/oasis-formula.ico"
++16 ICON "icons/empty-template.ico"
++17 ICON "icons/empty-document.ico"
++18 ICON "icons/so8-configuration.ico"
++19 ICON "icons/so8-open.ico"
++20 ICON "icons/empty-document.ico"
++21 ICON "icons/so9_writer_app.ico"
++22 ICON "icons/so9_calc_app.ico"
++23 ICON "icons/so9_draw_app.ico"
++24 ICON "icons/so9_impress_app.ico"
++25 ICON "icons/so9_math_app.ico"
++26 ICON "icons/so9_base_app.ico"
++27 ICON "icons/oasis-empty-document.ico"
++28 ICON "icons/text.ico"
++29 ICON "icons/text-template.ico"
++30 ICON "icons/spreadsheet.ico"
++31 ICON "icons/spreadsheet-template.ico"
++32 ICON "icons/drawing.ico"
++33 ICON "icons/drawing-template.ico"
++34 ICON "icons/presentation.ico"
++35 ICON "icons/presentation-template.ico"
++36 ICON "icons/master-document.ico"
++37 ICON "icons/empty-document.ico"
++38 ICON "icons/database.ico"
++39 ICON "icons/formula.ico"
++40 ICON "icons/oxt-extension.ico"
+--- desktop/util/ooverinfo.rc.orig 2009-07-07 16:49:16.000000000 +0200
++++ desktop/util/ooverinfo.rc 2009-07-07 16:54:34.000000000 +0200
+@@ -38,11 +38,11 @@
+ // version information
+ // -----------------------------------------------------------------------
+
+-VS_VERSION_INFO versioninfo
+- fileversion VERSION, SUBVERSION, VERVARIANT, VER_COUNT
+- productversion VERSION, SUBVERSION, VERVARIANT, VER_COUNT
+- fileflagsmask 0x3F
+- fileflags
++VS_VERSION_INFO VERSIONINFO
++ FILEVERSION VERSION, SUBVERSION, VERVARIANT, VER_COUNT
++ PRODUCTVERSION VERSION, SUBVERSION, VERVARIANT, VER_COUNT
++ FILEFLAGSMASK 0x3F
++ FILEFLAGS
+ #if defined(DEBUG)
+ VS_FF_DEBUG |
+ #endif
+@@ -51,89 +51,89 @@
+ #endif
+ 0
+ #ifndef WIN32
+- fileos VOS_DOS_WINDOWS16
++ FILEOS VOS_DOS_WINDOWS16
+ #else
+- fileos VOS_NT_WINDOWS32
++ FILEOS VOS_NT_WINDOWS32
+ #endif
+ filetype VFT_APP
+ {
+- block "StringFileInfo"
++ BLOCK "StringFileInfo"
+ {
+ #ifdef LG_D
+- block "040704E4"
++ BLOCK "040704E4"
+ {
+ // German StringTable
+- value "CompanyName", "OpenOffice.org\0"
+- value "FileDescription", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0"
+- value "FileVersion", PPS(VER_LEVEL) "\0"
+- value "ProductVersion", PPS(VER_LEVEL) "\0"
+- value "OriginalFilename", "SOFFICE.EXE\0"
+- value "InternalName", "SOFFICE\0"
+- value "LegalCopyright", S_CRIGHT " Sun Microsystems, Inc.\0"
++ VALUE "CompanyName", "OpenOffice.org\0"
++ VALUE "FileDescription", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0"
++ VALUE "FileVersion", PPS(VER_LEVEL) "\0"
++ VALUE "ProductVersion", PPS(VER_LEVEL) "\0"
++ VALUE "OriginalFilename", "SOFFICE.EXE\0"
++ VALUE "InternalName", "SOFFICE\0"
++ VALUE "LegalCopyright", S_CRIGHT " Sun Microsystems, Inc.\0"
+ }
+ #else
+- block "040904E4"
++ BLOCK "040904E4"
+ {
+ // International StringTable
+- value "CompanyName", "OpenOffice.org\0"
+- value "FileDescription", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0"
+- value "FileVersion", PPS(VER_LEVEL) "\0"
+- value "ProductVersion", PPS(VER_LEVEL) "\0"
+- value "OriginalFilename", "SOFFICE.EXE\0"
+- value "InternalName", "SOFFICE\0"
+- value "LegalCopyright", S_CRIGHT " Sun Microsystems, Inc.\0"
++ VALUE "CompanyName", "OpenOffice.org\0"
++ VALUE "FileDescription", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0"
++ VALUE "FileVersion", PPS(VER_LEVEL) "\0"
++ VALUE "ProductVersion", PPS(VER_LEVEL) "\0"
++ VALUE "OriginalFilename", "SOFFICE.EXE\0"
++ VALUE "InternalName", "SOFFICE\0"
++ VALUE "LegalCopyright", S_CRIGHT " Sun Microsystems, Inc.\0"
+ }
+ #endif
+ }
+
+- block "VarFileInfo"
++ BLOCK "VarFileInfo"
+ {
+ #ifdef LG_D
+- value "Translation", 0x0407, 1252
++ VALUE "Translation", 0x0407, 1252
+ #else
+- value "Translation", 0x0409, 1252
++ VALUE "Translation", 0x0409, 1252
+ #endif
+ }
+ }
+
+
+-2 ICON "icons\\ooo3_writer_doc.ico"
+-3 ICON "icons\\ooo3_writer_tem.ico"
+-4 ICON "icons\\ooo3_calc_doc.ico"
+-5 ICON "icons\\ooo3_calc_tem.ico"
+-6 ICON "icons\\ooo3_draw_doc.ico"
+-7 ICON "icons\\ooo3_draw_tem.ico"
+-8 ICON "icons\\ooo3_impress_doc.ico"
+-9 ICON "icons\\ooo3_impress_tem.ico"
+-10 ICON "icons\\ooo3_impress_doc.ico"
+-11 ICON "icons\\ooo3_global_doc.ico"
+-12 ICON "icons\\ooo3_html_doc.ico"
+-13 ICON "icons\\ooo3_chart_doc.ico"
+-14 ICON "icons\\ooo3_base_doc.ico"
+-15 ICON "icons\\ooo3_math_doc.ico"
+-16 ICON "icons\\ooo3_empty_tem.ico"
+-17 ICON "icons\\ooo3_macro_doc.ico"
+-18 ICON "icons\\ooo-configuration.ico"
+-19 ICON "icons\\ooo-open.ico"
+-20 ICON "icons\\ooo-image-doc.ico"
+-21 ICON "icons\\ooo3_writer_app.ico"
+-22 ICON "icons\\ooo3_calc_app.ico"
+-23 ICON "icons\\ooo3_draw_app.ico"
+-24 ICON "icons\\ooo3_impress_app.ico"
+-25 ICON "icons\\ooo3_math_app.ico"
+-26 ICON "icons\\ooo3_base_app.ico"
+-27 ICON "icons\\ooo3_empty_doc.ico"
+-28 ICON "icons\\ooo11-writer-doc.ico"
+-29 ICON "icons\\ooo11-writer-tem.ico"
+-30 ICON "icons\\ooo11-calc-doc.ico"
+-31 ICON "icons\\ooo11-calc-tem.ico"
+-32 ICON "icons\\ooo11-draw-doc.ico"
+-33 ICON "icons\\ooo11-draw-tem.ico"
+-34 ICON "icons\\ooo11-impress-doc.ico"
+-35 ICON "icons\\ooo11-impress-tem.ico"
+-36 ICON "icons\\ooo11-master-doc.ico"
+-37 ICON "icons\\ooo11-chart-doc.ico"
+-38 ICON "icons\\ooo11-base-doc.ico"
+-39 ICON "icons\\ooo11-math-doc.ico"
+-40 ICON "icons\\oxt-extension.ico"
++2 ICON "icons/ooo3_writer_doc.ico"
++3 ICON "icons/ooo3_writer_tem.ico"
++4 ICON "icons/ooo3_calc_doc.ico"
++5 ICON "icons/ooo3_calc_tem.ico"
++6 ICON "icons/ooo3_draw_doc.ico"
++7 ICON "icons/ooo3_draw_tem.ico"
++8 ICON "icons/ooo3_impress_doc.ico"
++9 ICON "icons/ooo3_impress_tem.ico"
++10 ICON "icons/ooo3_impress_doc.ico"
++11 ICON "icons/ooo3_global_doc.ico"
++12 ICON "icons/ooo3_html_doc.ico"
++13 ICON "icons/ooo3_chart_doc.ico"
++14 ICON "icons/ooo3_base_doc.ico"
++15 ICON "icons/ooo3_math_doc.ico"
++16 ICON "icons/ooo3_empty_tem.ico"
++17 ICON "icons/ooo3_macro_doc.ico"
++18 ICON "icons/ooo-configuration.ico"
++19 ICON "icons/ooo-open.ico"
++20 ICON "icons/ooo-image-doc.ico"
++21 ICON "icons/ooo3_writer_app.ico"
++22 ICON "icons/ooo3_calc_app.ico"
++23 ICON "icons/ooo3_draw_app.ico"
++24 ICON "icons/ooo3_impress_app.ico"
++25 ICON "icons/ooo3_math_app.ico"
++26 ICON "icons/ooo3_base_app.ico"
++27 ICON "icons/ooo3_empty_doc.ico"
++28 ICON "icons/ooo11-writer-doc.ico"
++29 ICON "icons/ooo11-writer-tem.ico"
++30 ICON "icons/ooo11-calc-doc.ico"
++31 ICON "icons/ooo11-calc-tem.ico"
++32 ICON "icons/ooo11-draw-doc.ico"
++33 ICON "icons/ooo11-draw-tem.ico"
++34 ICON "icons/ooo11-impress-doc.ico"
++35 ICON "icons/ooo11-impress-tem.ico"
++36 ICON "icons/ooo11-master-doc.ico"
++37 ICON "icons/ooo11-chart-doc.ico"
++38 ICON "icons/ooo11-base-doc.ico"
++39 ICON "icons/ooo11-math-doc.ico"
++40 ICON "icons/oxt-extension.ico"
+
diff --git a/patches/dev300/crosswin32-desktop-mingw.diff b/patches/dev300/crosswin32-desktop-mingw.diff
index 43ad3fb..f312bff 100644
--- a/patches/dev300/crosswin32-desktop-mingw.diff
+++ b/patches/dev300/crosswin32-desktop-mingw.diff
@@ -104,182 +104,6 @@
+
+#endif
---- desktop/util/verinfo.rc.~1.19.12.1.~ 2008-09-19 09:30:39.000000000 +0200
-+++ desktop/util/verinfo.rc 2008-11-05 15:04:37.000000000 +0100
-@@ -38,16 +38,16 @@
- // version information
- // -----------------------------------------------------------------------
-
--VS_VERSION_INFO versioninfo
-+VS_VERSION_INFO VERSIONINFO
- #ifndef SUBVERSION
-- fileversion VERSION, 0, VERVARIANT, VER_COUNT
-- productversion VERSION, 0, VERVARIANT, VER_COUNT
-+ FILEVERSION VERSION, 0, VERVARIANT, VER_COUNT
-+ PRODUCTVERSION VERSION, 0, VERVARIANT, VER_COUNT
- #else
-- fileversion VERSION, SUBVERSION, VERVARIANT, VER_COUNT
-- productversion VERSION, SUBVERSION, VERVARIANT, VER_COUNT
-+ FILEVERSION VERSION, SUBVERSION, VERVARIANT, VER_COUNT
-+ PRODUCTVERSION VERSION, SUBVERSION, VERVARIANT, VER_COUNT
- #endif
-- fileflagsmask 0x3F
-- fileflags
-+ FILEFLAGSMASK 0x3F
-+ FILEFLAGS
- #if defined(DEBUG)
- VS_FF_DEBUG |
- #endif
-@@ -56,87 +56,87 @@
- #endif
- 0
- #ifndef WIN32
-- fileos VOS_DOS_WINDOWS16
-+ FILEOS VOS_DOS_WINDOWS16
- #else
-- fileos VOS_NT_WINDOWS32
-+ FILEOS VOS_NT_WINDOWS32
- #endif
-- filetype VFT_APP
-+ FILETYPE VFT_APP
- {
-- block "StringFileInfo"
-+ BLOCK "StringFileInfo"
- {
- #ifdef LG_D
-- block "040704E4"
-+ BLOCK "040704E4"
- {
- // German StringTable
-- value "CompanyName", "Sun Microsystems, Inc.\0"
-- value "FileDescription", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0"
-- value "FileVersion", PPS(VER_LEVEL) "\0"
-- value "ProductVersion", PPS(VER_LEVEL) "\0"
-- value "OriginalFilename", "SOFFICE.EXE\0"
-- value "InternalName", "SOFFICE\0"
-- value "LegalCopyright", S_CRIGHT " Sun Microsystems, Inc.\0"
-+ VALUE "CompanyName", "Sun Microsystems, Inc.\0"
-+ VALUE "FileDescription", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0"
-+ VALUE "FileVersion", PPS(VER_LEVEL) "\0"
-+ VALUE "ProductVersion", PPS(VER_LEVEL) "\0"
-+ VALUE "OriginalFilename", "SOFFICE.EXE\0"
-+ VALUE "InternalName", "SOFFICE\0"
-+ VALUE "LegalCopyright", S_CRIGHT " Sun Microsystems, Inc.\0"
- }
- #else
-- block "040904E4"
-+ BLOCK "040904E4"
- {
- // International StringTable
-- value "CompanyName", "Sun Microsystems, Inc.\0"
-- value "FileDescription", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0"
-- value "FileVersion", PPS(VER_LEVEL) "\0"
-- value "ProductVersion", PPS(VER_LEVEL) "\0"
-- value "OriginalFilename", "SOFFICE.EXE\0"
-- value "InternalName", "SOFFICE\0"
-- value "LegalCopyright", S_CRIGHT " Sun Microsystems, Inc.\0"
-+ VALUE "CompanyName", "Sun Microsystems, Inc.\0"
-+ VALUE "FileDescription", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0"
-+ VALUE "FileVersion", PPS(VER_LEVEL) "\0"
-+ VALUE "ProductVersion", PPS(VER_LEVEL) "\0"
-+ VALUE "OriginalFilename", "SOFFICE.EXE\0"
-+ VALUE "InternalName", "SOFFICE\0"
-+ VALUE "LegalCopyright", S_CRIGHT " Sun Microsystems, Inc.\0"
- }
- #endif
- }
-
-- block "VarFileInfo"
-+ BLOCK "VarFileInfo"
- {
- #ifdef LG_D
-- value "Translation", 0x0407, 1252
-+ VALUE "Translation", 0x0407, 1252
- #else
-- value "Translation", 0x0409, 1252
-+ VALUE "Translation", 0x0409, 1252
- #endif
- }
- }
-
--2 ICON "icons\\so9_writer_doc.ico"
--3 ICON "icons\\so9_writer_tem.ico"
--4 ICON "icons\\so9_calc_doc.ico"
--5 ICON "icons\\so9_calc_tem.ico"
--6 ICON "icons\\so9_draw_doc.ico"
--7 ICON "icons\\so9_draw_tem.ico"
--8 ICON "icons\\so9_impress_doc.ico"
--9 ICON "icons\\so9_impress_tem.ico"
--10 ICON "icons\\so9_impress_doc.ico"
--11 ICON "icons\\so9_global_doc.ico"
--12 ICON "icons\\so9_html_doc.ico"
--13 ICON "icons\\so9_chart_doc.ico"
--14 ICON "icons\\so9_base_doc.ico"
--15 ICON "icons\\so9_math_doc.ico"
--16 ICON "icons\\so9_empty_tem.ico"
--17 ICON "icons\\so9_macro_doc.ico"
--18 ICON "icons\\so8-configuration.ico"
--19 ICON "icons\\so8-open.ico"
--20 ICON "icons\\so8-image-doc.ico"
--21 ICON "icons\\so9_writer_app.ico"
--22 ICON "icons\\so9_calc_app.ico"
--23 ICON "icons\\so9_draw_app.ico"
--24 ICON "icons\\so9_impress_app.ico"
--25 ICON "icons\\so9_math_app.ico"
--26 ICON "icons\\so9_base_app.ico"
--27 ICON "icons\\so9_empty_doc.ico"
--28 ICON "icons\\so7-writer-doc.ico"
--29 ICON "icons\\so7-writer-tem.ico"
--30 ICON "icons\\so7-calc-doc.ico"
--31 ICON "icons\\so7-calc-tem.ico"
--32 ICON "icons\\so7-draw-doc.ico"
--33 ICON "icons\\so7-draw-tem.ico"
--34 ICON "icons\\so7-impress-doc.ico"
--35 ICON "icons\\so7-impress-tem.ico"
--36 ICON "icons\\so7-master-doc.ico"
--37 ICON "icons\\so7-chart-doc.ico"
--38 ICON "icons\\so7-base-doc.ico"
--39 ICON "icons\\so7-math-doc.ico"
--40 ICON "icons\\oxt-extension.ico"
-+2 ICON "icons/so9_writer_doc.ico"
-+3 ICON "icons/so9_writer_tem.ico"
-+4 ICON "icons/so9_calc_doc.ico"
-+5 ICON "icons/so9_calc_tem.ico"
-+6 ICON "icons/so9_draw_doc.ico"
-+7 ICON "icons/so9_draw_tem.ico"
-+8 ICON "icons/so9_impress_doc.ico"
-+9 ICON "icons/so9_impress_tem.ico"
-+10 ICON "icons/so9_impress_doc.ico"
-+11 ICON "icons/so9_global_doc.ico"
-+12 ICON "icons/so9_html_doc.ico"
-+13 ICON "icons/so9_chart_doc.ico"
-+14 ICON "icons/so9_base_doc.ico"
-+15 ICON "icons/so9_math_doc.ico"
-+16 ICON "icons/so9_empty_tem.ico"
-+17 ICON "icons/so9_macro_doc.ico"
-+18 ICON "icons/so8-configuration.ico"
-+19 ICON "icons/so8-open.ico"
-+20 ICON "icons/so8-image-doc.ico"
-+21 ICON "icons/so9_writer_app.ico"
-+22 ICON "icons/so9_calc_app.ico"
-+23 ICON "icons/so9_draw_app.ico"
-+24 ICON "icons/so9_impress_app.ico"
-+25 ICON "icons/so9_math_app.ico"
-+26 ICON "icons/so9_base_app.ico"
-+27 ICON "icons/so9_empty_doc.ico"
-+28 ICON "icons/so7-writer-doc.ico"
-+29 ICON "icons/so7-writer-tem.ico"
-+30 ICON "icons/so7-calc-doc.ico"
-+31 ICON "icons/so7-calc-tem.ico"
-+32 ICON "icons/so7-draw-doc.ico"
-+33 ICON "icons/so7-draw-tem.ico"
-+34 ICON "icons/so7-impress-doc.ico"
-+35 ICON "icons/so7-impress-tem.ico"
-+36 ICON "icons/so7-master-doc.ico"
-+37 ICON "icons/so7-chart-doc.ico"
-+38 ICON "icons/so7-base-doc.ico"
-+39 ICON "icons/so7-math-doc.ico"
-+40 ICON "icons/oxt-extension.ico"
--- 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)
@@ -310,173 +134,3 @@
+#include <windows.h>
//#include "tools/postwin.h"
#endif
---- desktop/util/ooverinfo.rc.orig 2009-07-07 16:49:16.000000000 +0200
-+++ desktop/util/ooverinfo.rc 2009-07-07 16:54:34.000000000 +0200
-@@ -38,11 +38,11 @@
- // version information
- // -----------------------------------------------------------------------
-
--VS_VERSION_INFO versioninfo
-- fileversion VERSION, SUBVERSION, VERVARIANT, VER_COUNT
-- productversion VERSION, SUBVERSION, VERVARIANT, VER_COUNT
-- fileflagsmask 0x3F
-- fileflags
-+VS_VERSION_INFO VERSIONINFO
-+ FILEVERSION VERSION, SUBVERSION, VERVARIANT, VER_COUNT
-+ PRODUCTVERSION VERSION, SUBVERSION, VERVARIANT, VER_COUNT
-+ FILEFLAGSMASK 0x3F
-+ FILEFLAGS
- #if defined(DEBUG)
- VS_FF_DEBUG |
- #endif
-@@ -51,89 +51,89 @@
- #endif
- 0
- #ifndef WIN32
-- fileos VOS_DOS_WINDOWS16
-+ FILEOS VOS_DOS_WINDOWS16
- #else
-- fileos VOS_NT_WINDOWS32
-+ FILEOS VOS_NT_WINDOWS32
- #endif
- filetype VFT_APP
- {
-- block "StringFileInfo"
-+ BLOCK "StringFileInfo"
- {
- #ifdef LG_D
-- block "040704E4"
-+ BLOCK "040704E4"
- {
- // German StringTable
-- value "CompanyName", "OpenOffice.org\0"
-- value "FileDescription", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0"
-- value "FileVersion", PPS(VER_LEVEL) "\0"
-- value "ProductVersion", PPS(VER_LEVEL) "\0"
-- value "OriginalFilename", "SOFFICE.EXE\0"
-- value "InternalName", "SOFFICE\0"
-- value "LegalCopyright", S_CRIGHT " Sun Microsystems, Inc.\0"
-+ VALUE "CompanyName", "OpenOffice.org\0"
-+ VALUE "FileDescription", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0"
-+ VALUE "FileVersion", PPS(VER_LEVEL) "\0"
-+ VALUE "ProductVersion", PPS(VER_LEVEL) "\0"
-+ VALUE "OriginalFilename", "SOFFICE.EXE\0"
-+ VALUE "InternalName", "SOFFICE\0"
-+ VALUE "LegalCopyright", S_CRIGHT " Sun Microsystems, Inc.\0"
- }
- #else
-- block "040904E4"
-+ BLOCK "040904E4"
- {
- // International StringTable
-- value "CompanyName", "OpenOffice.org\0"
-- value "FileDescription", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0"
-- value "FileVersion", PPS(VER_LEVEL) "\0"
-- value "ProductVersion", PPS(VER_LEVEL) "\0"
-- value "OriginalFilename", "SOFFICE.EXE\0"
-- value "InternalName", "SOFFICE\0"
-- value "LegalCopyright", S_CRIGHT " Sun Microsystems, Inc.\0"
-+ VALUE "CompanyName", "OpenOffice.org\0"
-+ VALUE "FileDescription", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0"
-+ VALUE "FileVersion", PPS(VER_LEVEL) "\0"
-+ VALUE "ProductVersion", PPS(VER_LEVEL) "\0"
-+ VALUE "OriginalFilename", "SOFFICE.EXE\0"
-+ VALUE "InternalName", "SOFFICE\0"
-+ VALUE "LegalCopyright", S_CRIGHT " Sun Microsystems, Inc.\0"
- }
- #endif
- }
-
-- block "VarFileInfo"
-+ BLOCK "VarFileInfo"
- {
- #ifdef LG_D
-- value "Translation", 0x0407, 1252
-+ VALUE "Translation", 0x0407, 1252
- #else
-- value "Translation", 0x0409, 1252
-+ VALUE "Translation", 0x0409, 1252
- #endif
- }
- }
-
-
--2 ICON "icons\\ooo3_writer_doc.ico"
--3 ICON "icons\\ooo3_writer_tem.ico"
--4 ICON "icons\\ooo3_calc_doc.ico"
--5 ICON "icons\\ooo3_calc_tem.ico"
--6 ICON "icons\\ooo3_draw_doc.ico"
--7 ICON "icons\\ooo3_draw_tem.ico"
--8 ICON "icons\\ooo3_impress_doc.ico"
--9 ICON "icons\\ooo3_impress_tem.ico"
--10 ICON "icons\\ooo3_impress_doc.ico"
--11 ICON "icons\\ooo3_global_doc.ico"
--12 ICON "icons\\ooo3_html_doc.ico"
--13 ICON "icons\\ooo3_chart_doc.ico"
--14 ICON "icons\\ooo3_base_doc.ico"
--15 ICON "icons\\ooo3_math_doc.ico"
--16 ICON "icons\\ooo3_empty_tem.ico"
--17 ICON "icons\\ooo3_macro_doc.ico"
--18 ICON "icons\\ooo-configuration.ico"
--19 ICON "icons\\ooo-open.ico"
--20 ICON "icons\\ooo-image-doc.ico"
--21 ICON "icons\\ooo3_writer_app.ico"
--22 ICON "icons\\ooo3_calc_app.ico"
--23 ICON "icons\\ooo3_draw_app.ico"
--24 ICON "icons\\ooo3_impress_app.ico"
--25 ICON "icons\\ooo3_math_app.ico"
--26 ICON "icons\\ooo3_base_app.ico"
--27 ICON "icons\\ooo3_empty_doc.ico"
--28 ICON "icons\\ooo11-writer-doc.ico"
--29 ICON "icons\\ooo11-writer-tem.ico"
--30 ICON "icons\\ooo11-calc-doc.ico"
--31 ICON "icons\\ooo11-calc-tem.ico"
--32 ICON "icons\\ooo11-draw-doc.ico"
--33 ICON "icons\\ooo11-draw-tem.ico"
--34 ICON "icons\\ooo11-impress-doc.ico"
--35 ICON "icons\\ooo11-impress-tem.ico"
--36 ICON "icons\\ooo11-master-doc.ico"
--37 ICON "icons\\ooo11-chart-doc.ico"
--38 ICON "icons\\ooo11-base-doc.ico"
--39 ICON "icons\\ooo11-math-doc.ico"
--40 ICON "icons\\oxt-extension.ico"
-+2 ICON "icons/ooo3_writer_doc.ico"
-+3 ICON "icons/ooo3_writer_tem.ico"
-+4 ICON "icons/ooo3_calc_doc.ico"
-+5 ICON "icons/ooo3_calc_tem.ico"
-+6 ICON "icons/ooo3_draw_doc.ico"
-+7 ICON "icons/ooo3_draw_tem.ico"
-+8 ICON "icons/ooo3_impress_doc.ico"
-+9 ICON "icons/ooo3_impress_tem.ico"
-+10 ICON "icons/ooo3_impress_doc.ico"
-+11 ICON "icons/ooo3_global_doc.ico"
-+12 ICON "icons/ooo3_html_doc.ico"
-+13 ICON "icons/ooo3_chart_doc.ico"
-+14 ICON "icons/ooo3_base_doc.ico"
-+15 ICON "icons/ooo3_math_doc.ico"
-+16 ICON "icons/ooo3_empty_tem.ico"
-+17 ICON "icons/ooo3_macro_doc.ico"
-+18 ICON "icons/ooo-configuration.ico"
-+19 ICON "icons/ooo-open.ico"
-+20 ICON "icons/ooo-image-doc.ico"
-+21 ICON "icons/ooo3_writer_app.ico"
-+22 ICON "icons/ooo3_calc_app.ico"
-+23 ICON "icons/ooo3_draw_app.ico"
-+24 ICON "icons/ooo3_impress_app.ico"
-+25 ICON "icons/ooo3_math_app.ico"
-+26 ICON "icons/ooo3_base_app.ico"
-+27 ICON "icons/ooo3_empty_doc.ico"
-+28 ICON "icons/ooo11-writer-doc.ico"
-+29 ICON "icons/ooo11-writer-tem.ico"
-+30 ICON "icons/ooo11-calc-doc.ico"
-+31 ICON "icons/ooo11-calc-tem.ico"
-+32 ICON "icons/ooo11-draw-doc.ico"
-+33 ICON "icons/ooo11-draw-tem.ico"
-+34 ICON "icons/ooo11-impress-doc.ico"
-+35 ICON "icons/ooo11-impress-tem.ico"
-+36 ICON "icons/ooo11-master-doc.ico"
-+37 ICON "icons/ooo11-chart-doc.ico"
-+38 ICON "icons/ooo11-base-doc.ico"
-+39 ICON "icons/ooo11-math-doc.ico"
-+40 ICON "icons/oxt-extension.ico"
-
diff --git a/patches/dev300/crosswin32-external-mingwheaders.diff b/patches/dev300/crosswin32-external-mingwheaders.diff
index f85e1f7..fdf88c6 100644
--- a/patches/dev300/crosswin32-external-mingwheaders.diff
+++ b/patches/dev300/crosswin32-external-mingwheaders.diff
@@ -1,19 +1,15 @@
---- external/mingwheaders/makefile.mk.pristine 2008-06-06 18:46:47.000000000 +0200
-+++ external/mingwheaders/makefile.mk 2008-10-22 09:10:58.000000000 +0200
-@@ -35,17 +35,26 @@
+--- 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"
-+# patches fail with i686-mingw-gcc built from 4.1.1
-+# How this is supposed to work, patching mingw header files
-+# without patching the mingw libraries? Why not fix OO.o
-+# client code to work with latest mingw?
# Cygwin and MinGW use different directories for the W32API headers
.IF "$(USE_MINGW)" == "cygwin"
- MINGW_INCLUDE_DIR=$/usr$/include/mingw/include/
+ MINGW_INCLUDE_DIR=$/usr$/include/mingw/
MINGW_W32API_INCLUDE_DIR=$/usr$/include/w32api/
MINGW_W32API_LIB_DIR=$/usr$/include/w32api/
-.ELSE
@@ -29,43 +25,37 @@
.ENDIF
SYS_INCLUDE_DIR=$(MINGW_INCLUDE_DIR)$/sys/
-@@ -184,29 +189,33 @@
- $(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 || :
+@@ -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
+ $(COPY) $(FILES_TO_COPY_FROM_DIRECTXSDK:^$(DIRECTXSDK_INCLUDE_DIR)) $(MISC)$/mingw$/include
+.ENDIF # "$(DIRECTXSDK_HOME)" != ""
- $(TOUCH) $(MISC)$/mingwheader_copy
+ $(TOUCH) $(MISC)$/mingwheader_copy
.IF "$(DISABLE_ATL)"==""
- $(MINGWHEADER_ATL_COPY_TARGET):
- $(MKDIRHIER) $(MISC)$/mingw$/include/atl
- $(COPY) $(FILES_TO_COPY_FROM_ATL:^$(ATL_INCLUDE_DIR)) $(MISC)$/mingw$/include$/atl
-- $(TOUCH) $(MINGWHEADER_ATL_COPY_TARGET)
-+ $(TOUCH) $(MINGWHEADER_ATL_COPY_TARGET)
- .ENDIF
-
- $(LB)$/libmsvcrt.a:
- .IF "$(USE_MINGW)" == "cygwin"
-- $(WRAPCMD) nm -g --defined-only $(COMPATH)$/lib/mingw/libmsvcrt.a > $(MISC)$/msvcrt.nm
-+ $(WRAPCMD) $(NM) -g --defined-only $(COMPATH)$/lib/mingw/libmsvcrt.a > $(MISC)$/msvcrt.nm
-+.ELIF "$(CROSS_COMPILING)" == "no"
-+ $(WRAPCMD) $(NM) -g --defined-only $(COMPATH)$/lib/libmsvcrt.a > $(MISC)$/msvcrt.nm
+@@ -191,16 +198,16 @@
.ELSE
-- $(WRAPCMD) nm -g --defined-only $(COMPATH)$/lib/libmsvcrt.a > $(MISC)$/msvcrt.nm
--.ENDIF
-+ $(WRAPCMD) $(NM) -g --defined-only $(COMPATH)/../../lib/libmsvcrt.a > $(MISC)$/msvcrt.nm
-+.ENDIF # "$(CROSS_COMPILING)" == "yes"
- 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
-+ $(DLLTOOL) --dllname msvcrt.dll --input-def=$(MISC)$/msvcrt.def --kill-at --output-lib=$(LB)$/libmsvcrt.a
+ $(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
+ -$(RM) $(MISC)$/mingw$/include$/*.h
diff --git a/patches/dev300/crosswin32-i18npool-cross.diff b/patches/dev300/crosswin32-i18npool-cross.diff
index df8872c..83908b0 100644
--- a/patches/dev300/crosswin32-i18npool-cross.diff
+++ b/patches/dev300/crosswin32-i18npool-cross.diff
@@ -1,4 +1,3 @@
-i18npool/source/textconversion/data/makefile.mk
--- 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)
@@ -13,8 +12,8 @@ i18npool/source/textconversion/data/makefile.mk
+.ENDIF # "$(CROSS_COMPILING)" == "yes"
+
$(MISC)$/%.cxx : %.dic
-- $(BIN)$/genconv_dict $* $< $@
-+ $(GENCONV_DICT) $* $< $@
+- $(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)
@@ -38,7 +37,6 @@ i18npool/source/localedata/data/makefile.mk
+ $(WRAPCMD) $(SAXPARSER) $* $< $@ $(BIN)$/$(@:b).rdb $(SOLARBINDIR)$/types.rdb
$(RM) $(BIN)$/$(@:b).rdb
-i18npool/source/collator/data/makefile.mk
--- 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)
@@ -59,7 +57,6 @@ i18npool/source/collator/data/makefile.mk
-$(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
--- 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)
@@ -80,7 +77,6 @@ i18npool/source/indexentry/data/makefile.mk
-$(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
--- 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= \
diff --git a/patches/dev300/crosswin32-solenv-mingw-res.diff b/patches/dev300/crosswin32-solenv-mingw-res.diff
new file mode 100644
index 0000000..d477d26
--- /dev/null
+++ b/patches/dev300/crosswin32-solenv-mingw-res.diff
@@ -0,0 +1,115 @@
+--- solenv/inc/shlinfo.rc.pristine 2008-10-29 09:33:25.000000000 +0100
++++ solenv/inc/shlinfo.rc 2008-10-29 09:33:33.000000000 +0100
+@@ -29,8 +29,9 @@
+ ************************************************************************/
+
+ #define VERSION 3
+-#define SUBVERSION 1
+-#define VERVARIANT 0
++#if !defined(VERVARIANT)
++ #define VERVARIANT 0
++#endif
+
+ // .0 + VER_CONCEPT
+ // .100 + VER_ALPHA
+@@ -90,16 +91,16 @@
+ // version information
+ // -----------------------------------------------------------------------
+
+-VS_VERSION_INFO versioninfo
++VS_VERSION_INFO VERSIONINFO
+ #ifndef SUBVERSION
+- fileversion VERSION, 0, 0, VERVARIANT
+- productversion VERSION, 0, 0, VERVARIANT
++ FILEVERSION VERSION, 0, 0, VERVARIANT
++ PRODUCTVERSION VERSION, 0, 0, VERVARIANT
+ #else
+- fileversion VERSION, VERVARIANT, VER_COUNT
+- productversion VERSION, VERVARIANT, VER_COUNT
++ FILEVERSION VERSION, VERVARIANT, VER_COUNT
++ PRODUCTVERSION VERSION, VERVARIANT, VER_COUNT
+ #endif
+- fileflagsmask 0x3F
+- fileflags
++ FILEFLAGSMASK 0x3F
++ FILEFLAGS
+ #if defined(DEBUG)
+ VS_FF_DEBUG |
+ #endif
+@@ -108,36 +109,36 @@
+ #endif
+ 0
+ #ifndef WIN32
+- fileos VOS_DOS_WINDOWS16
++ FILEOS VOS_DOS_WINDOWS16
+ #else
+- fileos VOS_NT_WINDOWS32
++ FILEOS VOS_NT_WINDOWS32
+ #endif
+- filetype VFT_APP
++ FILETYPE VFT_APP
+ {
+- block "StringFileInfo"
++ BLOCK "StringFileInfo"
+ {
+ #ifdef LG_D
+- block "040704E4"
++ BLOCK "040704E4"
+ {
+ // German StringTable
+- value "CompanyName", "Sun Microsystems, Inc.\0"
+- value "FileVersion", PPS(VER_LEVEL) "\0"
+- value "OriginalFilename", PPS(ORG_NAME) "\0"
+- value "InternalName", PPS(INTERNAL_NAME) "\0"
+- value "LegalCopyright", S_CRIGHT " Sun Microsystems, Inc.\0"
++ VALUE "CompanyName", "Sun Microsystems, Inc.\0"
++ VALUE "FileVersion", PPS(VER_LEVEL) "\0"
++ VALUE "OriginalFilename", PPS(ORG_NAME) "\0"
++ VALUE "InternalName", PPS(INTERNAL_NAME) "\0"
++ VALUE "LegalCopyright", S_CRIGHT " Sun Microsystems, Inc.\0"
+ ADDITIONAL_VERINFO1
+ ADDITIONAL_VERINFO2
+ ADDITIONAL_VERINFO3
+ }
+ #else
+- block "040904E4"
++ BLOCK "040904E4"
+ {
+ // International StringTable
+- value "CompanyName", "Sun Microsystems, Inc.\0"
+- value "FileVersion", PPS(VER_LEVEL) "\0"
+- value "OriginalFilename", PPS(ORG_NAME) "\0"
+- value "InternalName", PPS(INTERNAL_NAME) "\0"
+- value "LegalCopyright", S_CRIGHT " Sun Microsystems, Inc.\0"
++ VALUE "CompanyName", "Sun Microsystems, Inc.\0"
++ VALUE "FileVersion", PPS(VER_LEVEL) "\0"
++ VALUE "OriginalFilename", PPS(ORG_NAME) "\0"
++ VALUE "InternalName", PPS(INTERNAL_NAME) "\0"
++ VALUE "LegalCopyright", S_CRIGHT " Sun Microsystems, Inc.\0"
+ ADDITIONAL_VERINFO1
+ ADDITIONAL_VERINFO2
+ ADDITIONAL_VERINFO3
+@@ -145,12 +146,12 @@
+ #endif
+ }
+
+- block "VarFileInfo"
++ BLOCK "VarFileInfo"
+ {
+ #ifdef LG_D
+- value "Translation", 0x0407, 1252
++ VALUE "Translation", 0x0407, 1252
+ #else
+- value "Translation", 0x0409, 1252
++ VALUE "Translation", 0x0409, 1252
+ #endif
+ }
+ }
+@@ -160,6 +161,6 @@
+ {
+ 0xF0, "sw", 0x0F, VER_YEAR, VER_MONTH, VER_DAY,
+ VERSION, VERVARIANT, VER_COUNT
+-};
++}
+
+ #endif // OS2
diff --git a/patches/dev300/crosswin32-solenv-mingw.diff b/patches/dev300/crosswin32-solenv-mingw.diff
index e1bad87..5fd68e3 100644
--- a/patches/dev300/crosswin32-solenv-mingw.diff
+++ b/patches/dev300/crosswin32-solenv-mingw.diff
@@ -171,121 +171,6 @@
+XSLTLIB=-lxslt -lxml2
+LIBXML2LIB=-lxml2
+.ENDIF
---- solenv/inc/shlinfo.rc.pristine 2008-10-29 09:33:25.000000000 +0100
-+++ solenv/inc/shlinfo.rc 2008-10-29 09:33:33.000000000 +0100
-@@ -29,8 +29,9 @@
- ************************************************************************/
-
- #define VERSION 3
--#define SUBVERSION 1
--#define VERVARIANT 0
-+#if !defined(VERVARIANT)
-+ #define VERVARIANT 0
-+#endif
-
- // .0 + VER_CONCEPT
- // .100 + VER_ALPHA
-@@ -90,16 +91,16 @@
- // version information
- // -----------------------------------------------------------------------
-
--VS_VERSION_INFO versioninfo
-+VS_VERSION_INFO VERSIONINFO
- #ifndef SUBVERSION
-- fileversion VERSION, 0, 0, VERVARIANT
-- productversion VERSION, 0, 0, VERVARIANT
-+ FILEVERSION VERSION, 0, 0, VERVARIANT
-+ PRODUCTVERSION VERSION, 0, 0, VERVARIANT
- #else
-- fileversion VERSION, VERVARIANT, VER_COUNT
-- productversion VERSION, VERVARIANT, VER_COUNT
-+ FILEVERSION VERSION, VERVARIANT, VER_COUNT
-+ PRODUCTVERSION VERSION, VERVARIANT, VER_COUNT
- #endif
-- fileflagsmask 0x3F
-- fileflags
-+ FILEFLAGSMASK 0x3F
-+ FILEFLAGS
- #if defined(DEBUG)
- VS_FF_DEBUG |
- #endif
-@@ -108,36 +109,36 @@
- #endif
- 0
- #ifndef WIN32
-- fileos VOS_DOS_WINDOWS16
-+ FILEOS VOS_DOS_WINDOWS16
- #else
-- fileos VOS_NT_WINDOWS32
-+ FILEOS VOS_NT_WINDOWS32
- #endif
-- filetype VFT_APP
-+ FILETYPE VFT_APP
- {
-- block "StringFileInfo"
-+ BLOCK "StringFileInfo"
- {
- #ifdef LG_D
-- block "040704E4"
-+ BLOCK "040704E4"
- {
- // German StringTable
-- value "CompanyName", "Sun Microsystems, Inc.\0"
-- value "FileVersion", PPS(VER_LEVEL) "\0"
-- value "OriginalFilename", PPS(ORG_NAME) "\0"
-- value "InternalName", PPS(INTERNAL_NAME) "\0"
-- value "LegalCopyright", S_CRIGHT " Sun Microsystems, Inc.\0"
-+ VALUE "CompanyName", "Sun Microsystems, Inc.\0"
-+ VALUE "FileVersion", PPS(VER_LEVEL) "\0"
-+ VALUE "OriginalFilename", PPS(ORG_NAME) "\0"
-+ VALUE "InternalName", PPS(INTERNAL_NAME) "\0"
-+ VALUE "LegalCopyright", S_CRIGHT " Sun Microsystems, Inc.\0"
- ADDITIONAL_VERINFO1
- ADDITIONAL_VERINFO2
- ADDITIONAL_VERINFO3
- }
- #else
-- block "040904E4"
-+ BLOCK "040904E4"
- {
- // International StringTable
-- value "CompanyName", "Sun Microsystems, Inc.\0"
-- value "FileVersion", PPS(VER_LEVEL) "\0"
-- value "OriginalFilename", PPS(ORG_NAME) "\0"
-- value "InternalName", PPS(INTERNAL_NAME) "\0"
-- value "LegalCopyright", S_CRIGHT " Sun Microsystems, Inc.\0"
-+ VALUE "CompanyName", "Sun Microsystems, Inc.\0"
-+ VALUE "FileVersion", PPS(VER_LEVEL) "\0"
-+ VALUE "OriginalFilename", PPS(ORG_NAME) "\0"
-+ VALUE "InternalName", PPS(INTERNAL_NAME) "\0"
-+ VALUE "LegalCopyright", S_CRIGHT " Sun Microsystems, Inc.\0"
- ADDITIONAL_VERINFO1
- ADDITIONAL_VERINFO2
- ADDITIONAL_VERINFO3
-@@ -145,12 +146,12 @@
- #endif
- }
-
-- block "VarFileInfo"
-+ BLOCK "VarFileInfo"
- {
- #ifdef LG_D
-- value "Translation", 0x0407, 1252
-+ VALUE "Translation", 0x0407, 1252
- #else
-- value "Translation", 0x0409, 1252
-+ VALUE "Translation", 0x0409, 1252
- #endif
- }
- }
-@@ -160,6 +161,6 @@
- {
- 0xF0, "sw", 0x0F, VER_YEAR, VER_MONTH, VER_DAY,
- VERSION, VERVARIANT, VER_COUNT
--};
-+}
-
- #endif // OS2
--- solenv/inc/_tg_shl.mk.pristine 2008-10-29 09:33:25.000000000 +0100
+++ solenv/inc/_tg_shl.mk 2008-10-29 09:33:33.000000000 +0100
@@ -275,7 +275,11 @@
More information about the ooo-build-commit
mailing list