ooo-build r15322 - in trunk: . patches/dev300

[noelpwer svn gnome org]

Author: noelpwer
Date: Thu Feb 12 15:19:23 2009
New Revision: 15322
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15322&view=rev

Log:
2009-02-12  Noel Power <noel power novell com>

        * patches/dev300/cygwin-make-ver.diff: fix windows patches for configure
        move
        * patches/dev300/2005-express-stl-remove.diff:
        * patches/dev300/mozilla-buildlibs-win32.diff:
        * patches/dev300/win32-activex-disable.diff:



Modified:
   trunk/ChangeLog
   trunk/patches/dev300/2005-express-stl-remove.diff
   trunk/patches/dev300/cygwin-make-ver.diff
   trunk/patches/dev300/mozilla-buildlibs-win32.diff
   trunk/patches/dev300/win32-activex-disable.diff

Modified: trunk/patches/dev300/2005-express-stl-remove.diff
==============================================================================
--- trunk/patches/dev300/2005-express-stl-remove.diff	(original)
+++ trunk/patches/dev300/2005-express-stl-remove.diff	Thu Feb 12 15:19:23 2009
@@ -134,17 +134,3 @@
  			// now all types between begin and (the old) end which equal aThisRoundType
  			// are moved behind the new end
  		}
---- connectivity/source/drivers/odbc/OStatement.cxx	2006-09-17 04:07:43.000000000 +0100
-+++ connectivity/source/drivers/odbc/OStatement.cxx	2006-11-09 21:44:59.703125000 +0000
-@@ -199,7 +199,11 @@ Sequence< Type > SAL_CALL OStatement_Bas
- 	Sequence< Type > aOldTypes = OStatement_BASE::getTypes();
- 	if ( m_pConnection && !m_pConnection->isAutoRetrievingEnabled() )
- 	{
-+#if defined(_MSC_VER) && (_MSC_VER > 1310) && (_MSC_VER < 1500)
-+		remove(aOldTypes.getArray(),aOldTypes.getArray() + aOldTypes.getLength(),
-+#else
- 		::std::remove(aOldTypes.getArray(),aOldTypes.getArray() + aOldTypes.getLength(),
-+#endif
- 						::getCppuType( (const Reference< XGeneratedResultSet > *)0 ));
- 		aOldTypes.realloc(aOldTypes.getLength() - 1);
- 	}

Modified: trunk/patches/dev300/cygwin-make-ver.diff
==============================================================================
--- trunk/patches/dev300/cygwin-make-ver.diff	(original)
+++ trunk/patches/dev300/cygwin-make-ver.diff	Thu Feb 12 15:19:23 2009
@@ -1,10 +1,10 @@
---- config_office/configure.in.patched	2006-08-09 11:39:50.373000000 +0100
-+++ config_office/configure.in	2006-08-09 11:44:06.841750000 +0100
+--- configure.in.patched	2006-08-09 11:39:50.373000000 +0100
++++ configure.in	2006-08-09 11:44:06.841750000 +0100
 @@ -1232,6 +1232,10 @@
             break
        fi
  done
-+$GNUMAKE --version 2> /dev/null | grep ' 3.81'  2>&1 > /dev/null
++$GNUMAKE --version 2> /dev/null | grep ' 3.80'  2>&1 > /dev/null
 +if test $? -eq 0;  then
 +  AC_MSG_ERROR("gmake 3.81 cannot build mozilla - please use 3.80")
 +fi

Modified: trunk/patches/dev300/mozilla-buildlibs-win32.diff
==============================================================================
--- trunk/patches/dev300/mozilla-buildlibs-win32.diff	(original)
+++ trunk/patches/dev300/mozilla-buildlibs-win32.diff	Thu Feb 12 15:19:23 2009
@@ -132,17 +132,17 @@
  .ENDIF # "$(GUI)"=="WNT"
  
  zip:	\
---- config_office/configure.in	2005-10-13 10:31:41.000000000 +0200
-+++ config_office/configure.in	2005-10-14 18:35:17.449625000 +0200
+--- configure.in	2005-10-13 10:31:41.000000000 +0200
++++ configure.in	2005-10-14 18:35:17.449625000 +0200
 @@ -2877,13 +2913,14 @@
     fi 
     if test "$_os" = "WINNT"; then
        AC_MSG_CHECKING([for glib and libIDL binaries])
--      if test ! -e "../moz/download/vc71-glib-1.2.10-bin.zip" \
--           -o ! -e "../moz/download/vc71-libIDL-0.6.8-bin.zip" \
-+      if test ! -e "../moz/download/glib-1.2.10.tar.gz" \
-+           -o ! -e "../moz/download/libIDL-0.6.8.tar.gz" \
-            -o ! -e "../moz/download/wintools.zip" ; then
+-      if test ! -e "./moz/download/vc71-glib-1.2.10-bin.zip" \
+-           -o ! -e "./moz/download/vc71-libIDL-0.6.8-bin.zip" \
++      if test ! -e "./moz/download/glib-1.2.10.tar.gz" \
++           -o ! -e "./moz/download/libIDL-0.6.8.tar.gz" \
+            -o ! -e "./moz/download/wintools.zip" ; then
  AC_MSG_ERROR([One or more of the following archives is missing in moz/download/
 -  vc71-glib-1.2.10-bin.zip
 -  vc71-libIDL-0.6.8-bin.zip

Modified: trunk/patches/dev300/win32-activex-disable.diff
==============================================================================
--- trunk/patches/dev300/win32-activex-disable.diff	(original)
+++ trunk/patches/dev300/win32-activex-disable.diff	Thu Feb 12 15:19:23 2009
@@ -1,5 +1,5 @@
---- config_office/configure.in	Wed May  3 15:15:00 2006
-+++ /mnt/pippi/src/2.0.2/build/OOO_2_0_2/config_office/configure.in	Wed May  3 14:38:03 2006
+--- configure.in	Wed May  3 15:15:00 2006
++++ configure.in	Wed May  3 14:38:03 2006
 @@ -74,6 +74,9 @@
                            epm, however epm is useless for large scale
                            package building.
@@ -7,9 +7,9 @@
 +AC_ARG_ENABLE(activex_component,
 +[  --disable-activex-component Remove support for ActiveX embedding of OOo
 +],,enable_activex_component=yes)
- AC_ARG_WITH(package-format,
- [  --with-package-format   specify package format(s) for OOo installsets.
-                           Default is "normal" one of the OS/Distribution.
+ AC_ARG_WITH(epm,
+ [  --with-epm		  Decides which epm to use. Default is to use
+ 			  the one from the system if one is built. When
 @@ -4268,6 +4272,20 @@
  AC_SUBST(WITH_WRITER2LATEX)