[ooo-build-commit] patches/dev300
Tor Lillqvist
tml at kemper.freedesktop.org
Thu Oct 1 04:49:14 PDT 2009
patches/dev300/apply | 8 +++
patches/dev300/build-fix-win32-m58.diff | 73 ++++++++++++++++++++++++++++++++
patches/dev300/build-fix-win32.diff | 16 -------
3 files changed, 80 insertions(+), 17 deletions(-)
New commits:
commit be13af2181749179719ef8d72eeec313e802b0ff
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Thu Oct 1 14:48:14 2009 +0300
Split and adapt build-fix-win32.diff for m58/60
diff --git a/patches/dev300/apply b/patches/dev300/apply
index cfe0386..18bc261 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3507,12 +3507,18 @@ build-fix-linux.diff
# the underlying problem these patches avoid should be fixex --noelp
build-fix-linux-m58.diff
-[ BuildFixWin32 ]
+[ BuildFixWin32 >= dev300-m60 ]
# FIXME: 2009-09-10: various hacks to get the build to build, should be removed
# the changes in this patch should be integrated into existing patches or
# the underlying problem these patches avoid should be fixex --noelp
build-fix-win32.diff
+[ BuildFixWin32 < dev300-m60 ]
+# FIXME: 2009-09-10: various hacks to get the build to build, should be removed
+# the changes in this patch should be integrated into existing patches or
+# the underlying problem these patches avoid should be fixex --noelp
+build-fix-win32-m58.diff
+
[ EMFPlus ]
emf+-driver-string.diff, n#519715, rodo
diff --git a/patches/dev300/build-fix-win32-m58.diff b/patches/dev300/build-fix-win32-m58.diff
new file mode 100644
index 0000000..9961e22
--- /dev/null
+++ b/patches/dev300/build-fix-win32-m58.diff
@@ -0,0 +1,73 @@
+--- sd/prj/build.lst
++++ sd/prj/build.lst
+@@ -30,7 +30,6 @@
+ sd sd\source\filter nmake - all sd_filt sd_sdi sd_ppt sd_inc NULL
+ sd sd\source\filter\cgm nmake - all sd_cgm sd_inc NULL
+ sd sd\source\filter\eppt nmake - all sd_eppt sd_inc NULL
+-sd sd\source\filter\pptx nmake - all sd_pptx sd_inc NULL
+ sd sd\source\filter\grf nmake - all sd_grf sd_inc NULL
+ sd sd\source\filter\xml nmake - all sd_xml sd_inc NULL
+ sd sd\source\filter\html nmake - all sd_html sd_inc NULL
+@@ -41,4 +40,4 @@
+ sd sd\source\ui\framework\module nmake - all sd_framework_module sd_inc NULL
+ sd sd\source\ui\framework\factories nmake - all sd_framework_factories sd_inc NULL
+ sd sd\source\ui\framework\tools nmake - all sd_framework_tools sd_inc NULL
+-sd sd\util nmake - all sd_util sd_app sd_cgm sd_core sd_dlg sd_docsh sd_eppt sd_pptx sd_filt sd_func sd_grf sd_unid sd_view sd_xml sd_html sd_ppt sd_accessibility sd_animations sd_toolpanel sd_toolpanel_controls sd_tools sd_slsshell sd_slsmodel sd_slsview sd_slscontroller sd_slscache sd_notes sd_table sd_slideshow sd_presenter sd_undo sd_helper sd_framework_configuration sd_framework_module sd_framework_tools sd_framework_factories NULL
++sd sd\util nmake - all sd_util sd_app sd_cgm sd_core sd_dlg sd_docsh sd_eppt sd_filt sd_func sd_grf sd_unid sd_view sd_xml sd_html sd_ppt sd_accessibility sd_animations sd_toolpanel sd_toolpanel_controls sd_tools sd_slsshell sd_slsmodel sd_slsview sd_slscontroller sd_slscache sd_notes sd_table sd_slideshow sd_presenter sd_undo sd_helper sd_framework_configuration sd_framework_module sd_framework_tools sd_framework_factories NULL
+--- scp2/source/ooo/file_library_ooo.scp
++++ scp2/source/ooo/file_library_ooo.scp
+@@ -1922,6 +1922,12 @@
+ Name = SCP2_URE_DL_NORMAL("msvcr80");
+ Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+ End
++File gid_File_Moz_Msvc80crt_Manifest
++ BIN_FILE_BODY;
++ Styles = (PACKED);
++ Dir = gid_Dir_Program;
++ Name = "Microsoft.VC80.CRT.manifest";
++End
+ #endif
+
+ #ifndef SYSTEM_REDLAND
+--- scp2/source/ooo/common_brand.scp
++++ scp2/source/ooo/common_brand.scp
+@@ -504,18 +504,6 @@
+ Name = "unopkg.bin";
+ End
+
+-#if defined WNT && \
+- (defined M1310 || \
+- ((defined M1400 || defined M1500) && \
+- !(defined SYSTEM_MOZILLA || defined WITHOUT_MOZILLA)))
+-File gid_Brand_File_Bin_Msvcr71
+- TXT_FILE_BODY;
+- Dir = gid_Brand_Dir_Program;
+- Name = SCP2_URE_DL_NORMAL("msvcr71" SCP2_STDLP_DEBUG);
+- Styles = (PACKED);
+-End
+-#endif
+-
+ // Due to Windows DLL search order, OOo executables might pick up a libxml2 DLL
+ // from a Windows system directory instead of the one from the URE; to avoid
+ // problems, as a HACK, for now a copy of the URE libxml2 DLL is placed next to
+--- external/prj/d.lst
++++ external/prj/d.lst
+@@ -34,8 +34,8 @@
+ ..\msvcp80\msvcm80*.dll %_DEST%\bin%_EXT%
+ ..\msvcp80\msvcp80*.dll %_DEST%\bin%_EXT%
+ ..\msvcp80\msvcr80*.dll %_DEST%\bin%_EXT%
+-..\msvcp90\Microsoft.VC80.CRT.manifest %_DEST%\bin%_EXT%\Microsoft.VC80.CRT.manifest
+-..\msvcp90\Microsoft.VC80.DebugCRT.manifest %_DEST%\bin%_EXT%\Microsoft.VC80.DebugCRT.manifest
++..\msvcp80\Microsoft.VC80.CRT.manifest %_DEST%\bin%_EXT%\Microsoft.VC80.CRT.manifest
++..\msvcp80\Microsoft.VC80.DebugCRT.manifest %_DEST%\bin%_EXT%\Microsoft.VC80.DebugCRT.manifest
+
+ ..\msvcp90\msvcm90*.dll %_DEST%\bin%_EXT%
+ ..\msvcp90\msvcp90*.dll %_DEST%\bin%_EXT%
+--- external/msvcp80/README_msvcX80.dll
++++ external/msvcp80/README_msvcX80.dll
+@@ -1,2 +1,3 @@
+-Put the msvcp80.dll and msvcr80.dll in this directory for Windows builds using
+-a VS 2005 compiler.
++Put the msvcp80.dll, msvcr80.dll and Microsoft.VC80.CRT.manifest in this
++directory for Windows builds using VS 2005, or using prebuilt Mozilla DLLs
++that were built using VS 2005.
diff --git a/patches/dev300/build-fix-win32.diff b/patches/dev300/build-fix-win32.diff
index 9961e22..3ad67cd 100644
--- a/patches/dev300/build-fix-win32.diff
+++ b/patches/dev300/build-fix-win32.diff
@@ -1,19 +1,3 @@
---- sd/prj/build.lst
-+++ sd/prj/build.lst
-@@ -30,7 +30,6 @@
- sd sd\source\filter nmake - all sd_filt sd_sdi sd_ppt sd_inc NULL
- sd sd\source\filter\cgm nmake - all sd_cgm sd_inc NULL
- sd sd\source\filter\eppt nmake - all sd_eppt sd_inc NULL
--sd sd\source\filter\pptx nmake - all sd_pptx sd_inc NULL
- sd sd\source\filter\grf nmake - all sd_grf sd_inc NULL
- sd sd\source\filter\xml nmake - all sd_xml sd_inc NULL
- sd sd\source\filter\html nmake - all sd_html sd_inc NULL
-@@ -41,4 +40,4 @@
- sd sd\source\ui\framework\module nmake - all sd_framework_module sd_inc NULL
- sd sd\source\ui\framework\factories nmake - all sd_framework_factories sd_inc NULL
- sd sd\source\ui\framework\tools nmake - all sd_framework_tools sd_inc NULL
--sd sd\util nmake - all sd_util sd_app sd_cgm sd_core sd_dlg sd_docsh sd_eppt sd_pptx sd_filt sd_func sd_grf sd_unid sd_view sd_xml sd_html sd_ppt sd_accessibility sd_animations sd_toolpanel sd_toolpanel_controls sd_tools sd_slsshell sd_slsmodel sd_slsview sd_slscontroller sd_slscache sd_notes sd_table sd_slideshow sd_presenter sd_undo sd_helper sd_framework_configuration sd_framework_module sd_framework_tools sd_framework_factories NULL
-+sd sd\util nmake - all sd_util sd_app sd_cgm sd_core sd_dlg sd_docsh sd_eppt sd_filt sd_func sd_grf sd_unid sd_view sd_xml sd_html sd_ppt sd_accessibility sd_animations sd_toolpanel sd_toolpanel_controls sd_tools sd_slsshell sd_slsmodel sd_slsview sd_slscontroller sd_slscache sd_notes sd_table sd_slideshow sd_presenter sd_undo sd_helper sd_framework_configuration sd_framework_module sd_framework_tools sd_framework_factories NULL
--- scp2/source/ooo/file_library_ooo.scp
+++ scp2/source/ooo/file_library_ooo.scp
@@ -1922,6 +1922,12 @@
More information about the ooo-build-commit
mailing list