[ooo-build-commit] patches/dev300

Fridrich Strba fridrich at kemper.freedesktop.org
Mon Nov 9 06:21:04 PST 2009 

 patches/dev300/apply                               |   10 -
 patches/dev300/crosswin32-config_office-cross.diff |    6 
 patches/dev300/crosswin32-desktop-mingw.diff       |  155 ++++++++++++---------
 patches/dev300/crosswin32-embeddedobj-mingw.diff   |   13 -
 patches/dev300/crosswin32-fpicker-mingw.diff       |   56 -------
 5 files changed, 101 insertions(+), 139 deletions(-)

New commits:
commit f7ebbfdd6b76373a837ed193a1b57b1338ba3efc
Author: Fridrich Strba <fridrich.strba at bluewin.ch>
Date:   Mon Nov 9 15:20:20 2009 +0100

    First steps to make the crosswin32 patches apply with ooo320
    
    * patches/dev300/apply:
    * patches/dev300/crosswin32-config_office-cross.diff:
    * patches/dev300/crosswin32-desktop-mingw.diff:
    * patches/dev300/crosswin32-embeddedobj-mingw.diff:
    * patches/dev300/crosswin32-fpicker-mingw.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 05c62f5..663a0c6 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3223,7 +3223,7 @@ oox-calc-export-sotstorage-init.diff, n#505917, janneke
 # Experimental patches to crosscompile OOo for Win32
 crosswin32-accessibility-nojava.diff
 crosswin32-basegfx-no-cppunit.diff
-crosswin32-bridges-mingw.diff
+#crosswin32-bridges-mingw.diff
 crosswin32-config_office-cross.diff
 crosswin32-config_office-mingw.diff
 crosswin32-connectivity-mingw.diff
@@ -3233,13 +3233,13 @@ crosswin32-dbaccess-mingw.diff
 crosswin32-desktop-mingw.diff
 crosswin32-dtrans-mingw.diff
 crosswin32-embeddedobj-mingw.diff
-crosswin32-embedserv-mingw.diff
+#crosswin32-embedserv-mingw.diff
 crosswin32-extensions-mingw.diff
-crosswin32-external-mingwheaders.diff
+#crosswin32-external-mingwheaders.diff
 crosswin32-fpicker-mingw.diff
 crosswin32-funit-char-line.diff
-crosswin32-goodies-mingw.diff
-crosswin32-helpcontent2-mingw.diff
+#crosswin32-goodies-mingw.diff
+#crosswin32-helpcontent2-mingw.diff
 crosswin32-hyphen-mingw.diff
 crosswin32-i18npool-cross.diff
 crosswin32-i18npool-mingw.diff
diff --git a/patches/dev300/crosswin32-config_office-cross.diff b/patches/dev300/crosswin32-config_office-cross.diff
index a61f4ee..be08f3f 100644
--- a/patches/dev300/crosswin32-config_office-cross.diff
+++ b/patches/dev300/crosswin32-config_office-cross.diff
@@ -179,13 +179,11 @@
    cd "$SRC_ROOT/config_office/guw" || exit
 --- set_soenv.in.orig	2008-10-20 19:52:27.000000000 +0200
 +++ set_soenv.in	2008-10-20 21:38:02.000000000 +0200
-@@ -1194,8 +1210,11 @@ if ($platform =~ m/cygwin|os2/)
- # The general environment path.
+@@ -1194,7 +1210,10 @@ if ($platform =~ m/cygwin|os2/)
  if ($platform =~ m/linux|netbsd|odf1|irix|freebsd|aix|solaris/)
  {  $PATH              = $cur_dir.
--                        $ps.'$SOLARVER'.$ds.'$INPATH'.$BIN.
+ #                        $ps.'$SOLARVER'.$ds.'$INPATH'.$BIN.
 -                        $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN.
-+                        $ps.'$SOLARVER'.$ds.'$INPATH'.$BIN;
 +   if ("@CROSS_COMPILING@" == "yes") {
 +        $PATH .=        $ps.'@TOOLS_DIR@';
 +   }
diff --git a/patches/dev300/crosswin32-desktop-mingw.diff b/patches/dev300/crosswin32-desktop-mingw.diff
index 89f8192..43ad3fb 100644
--- a/patches/dev300/crosswin32-desktop-mingw.diff
+++ b/patches/dev300/crosswin32-desktop-mingw.diff
@@ -52,7 +52,7 @@
 +.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
-     $(WRAPCMD) lngconvex.exe -ulf $(ULFDIR)$/setup.ulf -rc $(RCFILES) -rct rctmpl.txt -rch rcheader.txt -rcf rcfooter.txt
+     $(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
@@ -106,22 +106,22 @@
 
 --- 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
-@@ -82,16 +82,16 @@
+@@ -38,16 +38,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
+-	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, VERVARIANT, VER_COUNT
--	productversion VERSION, VERVARIANT, VER_COUNT
-+	FILEVERSION    VERSION, VERVARIANT, VER_COUNT
-+	PRODUCTVERSION VERSION, VERVARIANT, VER_COUNT
+-	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
@@ -130,7 +130,7 @@
  #if defined(DEBUG)
  	VS_FF_DEBUG |
  #endif
-@@ -100,47 +100,47 @@
+@@ -56,87 +56,87 @@
  #endif
  	0
  #ifndef WIN32
@@ -201,28 +201,46 @@
  #endif
  		}
  	}
-@@ -149,10 +149,14 @@
- VS_VERSION_INFO rcdata
- {
- 	0xF0, "sw", 0x0F, VER_YEAR, VER_MONTH, VER_DAY,
-+#ifndef CROSS_COMPILING
- 	VERSION, VERVARIANT, VER_COUNT
--};
--
-+#else
-+	VERSION
-+#endif
-+}
  
-+#ifdef CROSS_COMPILING
- 2 ICON "icons\\so9_writer_doc.ico"
- 3 ICON "icons\\so9_writer_tem.ico"
- 4 ICON "icons\\so9_calc_doc.ico"
-@@ -192,3 +196,44 @@
- 38 ICON "icons\\so7-base-doc.ico"
- 39 ICON "icons\\so7-math-doc.ico"
- 40 ICON "icons\\oxt-extension.ico"
-+#else
+-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"
@@ -262,8 +280,6 @@
 +38 ICON "icons/so7-base-doc.ico"
 +39 ICON "icons/so7-math-doc.ico"
 +40 ICON "icons/oxt-extension.ico"
-+#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)
@@ -296,7 +312,7 @@
  #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
-@@ -82,11 +82,11 @@
+@@ -38,11 +38,11 @@
  // 				version information
  // -----------------------------------------------------------------------
  
@@ -313,7 +329,7 @@
  #if defined(DEBUG)
  	VS_FF_DEBUG |
  #endif
-@@ -95,47 +95,47 @@
+@@ -51,89 +51,89 @@
  #endif
  	0
  #ifndef WIN32
@@ -323,8 +339,7 @@
 -	fileos VOS_NT_WINDOWS32
 +	FILEOS VOS_NT_WINDOWS32
  #endif
--	filetype VFT_APP
-+	FILETYPE VFT_APP
+ 	filetype VFT_APP
  	{
 -		block "StringFileInfo"
 +		BLOCK "StringFileInfo"
@@ -384,29 +399,47 @@
  #endif
  		}
  	}
-@@ -144,10 +144,14 @@
- VS_VERSION_INFO rcdata
- {
- 	0xF0, "sw", 0x0F, VER_YEAR, VER_MONTH, VER_DAY,
-+#ifndef CROSS_COMPILING
- 	VERSION, SUBVERSION, VERVARIANT, VER_COUNT
--};
--
-+#else
-+	VERSION
-+#endif
-+}
  
-+#ifdef CROSS_COMPILING
- 2 ICON "icons\\ooo3_writer_doc.ico"
- 3 ICON "icons\\ooo3_writer_tem.ico"
- 4 ICON "icons\\ooo3_calc_doc.ico"
-@@ -187,4 +191,44 @@
- 38 ICON "icons\\ooo11-base-doc.ico"
- 39 ICON "icons\\ooo11-math-doc.ico"
- 40 ICON "icons\\oxt-extension.ico"
--
-+#else
+ 
+-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"
@@ -446,4 +479,4 @@
 +38 ICON "icons/ooo11-base-doc.ico"
 +39 ICON "icons/ooo11-math-doc.ico"
 +40 ICON "icons/oxt-extension.ico"
-+#endif
+ 
diff --git a/patches/dev300/crosswin32-embeddedobj-mingw.diff b/patches/dev300/crosswin32-embeddedobj-mingw.diff
index 5febe92..6aa88cf 100644
--- a/patches/dev300/crosswin32-embeddedobj-mingw.diff
+++ b/patches/dev300/crosswin32-embeddedobj-mingw.diff
@@ -215,19 +215,6 @@
  		// the following service makes sence only on windows
  			xNewKey = xKey->createKey( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) + 
  										MSOLEDialogObjectCreator::impl_staticGetImplementationName() +
---- embeddedobj/source/msole/platform.h.~1.7.~	2008-04-11 07:02:49.000000000 +0200
-+++ embeddedobj/source/msole/platform.h	2008-11-01 14:23:32.000000000 +0100
-@@ -42,7 +42,9 @@
- #pragma warning(disable: 4548 4555 4917)
- #endif
- #include "windows.h"
--#ifdef __MINGW32__
-+#if defined (__MINGW32__) && defined (__CROSS__)
-+#include <oleidl.h>
-+#elif defined __MINGW32__
- #include <atlbase.h>
- #else
- #if defined(_MSC_VER) && (_MSC_VER > 1310)
 --- 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
diff --git a/patches/dev300/crosswin32-fpicker-mingw.diff b/patches/dev300/crosswin32-fpicker-mingw.diff
index 215469e..3a1f605 100644
--- a/patches/dev300/crosswin32-fpicker-mingw.diff
+++ b/patches/dev300/crosswin32-fpicker-mingw.diff
@@ -107,32 +107,6 @@
  
  //------------------------------------------------------------
  // we are using a table based algorithm to dispatch control 
---- fpicker/source/win32/filepicker/makefile.mk.pristine	2008-10-31 17:41:41.000000000 +0100
-+++ fpicker/source/win32/filepicker/makefile.mk	2008-10-31 17:44:49.000000000 +0100
-@@ -55,7 +55,7 @@ CDEFS+=-UWINVER -DWINVER=0x500
- # --- Resources ----------------------------------------------------
- 
- .IF "$(GUI)" == "WNT"
--RCFILES=fps.rc
-+RCFILES=Fps.rc
- .ENDIF
- 
- # --- Files --------------------------------------------------------
-@@ -80,9 +80,14 @@ SLOFILES=$(SLO)$/FileOpenDlg.obj\
- 		 $(SLO)$/customcontrolfactory.obj\
- 		 $(SLO)$/dialogcustomcontrols.obj\
- 		 $(SLO)$/asyncrequests.obj\
-+#
-+
-+.IF "$(CROSS_COMPILING)" == "no"
-+SLOFILES +=\
- 		 $(SLO)$/VistaFilePickerEventHandler.obj\
- 		 $(SLO)$/VistaFilePickerImpl.obj\
- 		 $(SLO)$/VistaFilePicker.obj
-+.ENDIF # "$(CROSS_COMPILING)" == "no"
- 
- # --- Targets ------------------------------------------------------
- 
 --- 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 @@
@@ -217,36 +191,6 @@
  namespace /* private */
  {
  
---- fpicker/source/win32/filepicker/FPentry.cxx.pristine	2008-10-29 21:13:36.000000000 +0100
-+++ fpicker/source/win32/filepicker/FPentry.cxx	2008-10-31 18:45:17.000000000 +0100
-@@ -41,8 +41,10 @@
- #include "FPServiceInfo.hxx"
- 
- #pragma warning (disable:4917)
-+#ifndef __MINGW32__
- #include "VistaFilePicker.hxx"
--#include "..\misc\WinImplHelper.hxx"
-+#endif /* __MINGW32__ */
-+#include "../misc/WinImplHelper.hxx"
- #include <stdio.h>
- 
- //-----------------------------------------------
-@@ -66,6 +68,7 @@ static Reference< XInterface > SAL_CALL 
- 	const Reference< XMultiServiceFactory >& rServiceManager )
- {
- 	Reference< XInterface > xDlg;
-+#ifndef __MINGW32__
- 	bool					bVista = IsWindowsVista();
- 
- 	if (bVista)
-@@ -76,6 +79,7 @@ static Reference< XInterface > SAL_CALL 
- 				new ::fpicker::win32::vista::VistaFilePicker( rServiceManager ) ) );
- 	}
- 	else
-+#endif /* __MINGW32__ */
- 	{
-         fprintf(stdout, "use normal system file picker ...\n");
- 		xDlg.set( 
 --- 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 @@

More information about the ooo-build-commit mailing list