ooo-build r13287 - in branches/ooo-build-2-4-1: . patches/src680

[thorstenb svn gnome org]

Author: thorstenb
Date: Fri Jul 18 09:29:18 2008
New Revision: 13287
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13287&view=rev

Log:
	* patches/src680/apply:
	* patches/src680/config_office-disable-atl.diff: add new configure
	option to set the DISABLE_ATL env var (needed for vista PSDK &
	express compilers)
	* patches/src680/postprocess-exclude-msvcr80.diff: exclude
	msvcr80.dll from rebasing, this fails because of signed dll



Added:
   branches/ooo-build-2-4-1/patches/src680/config_office-disable-atl.diff
   branches/ooo-build-2-4-1/patches/src680/postprocess-exclude-msvcr80.diff
Modified:
   branches/ooo-build-2-4-1/ChangeLog
   branches/ooo-build-2-4-1/patches/src680/apply

Modified: branches/ooo-build-2-4-1/patches/src680/apply
==============================================================================
--- branches/ooo-build-2-4-1/patches/src680/apply	(original)
+++ branches/ooo-build-2-4-1/patches/src680/apply	Fri Jul 18 09:29:18 2008
@@ -2489,7 +2489,7 @@
 [ Fixes ]
 cppcanvas-fix-roundcorners.diff, i#361534, rodo
 vcl-fix-randr-heapcorruption.diff, i#89718, n#398244, thorsten
-# make fpicker depend on ucb (for odma headers)
 fpicker-dependencies.diff, thorsten
-# backport from dev300 vq41
 config_office-vista-psdk-support.diff, thorsten
+postprocess-exclude-msvcr80.diff, thorsten
+config_office-disable-atl.diff, thorsten

Added: branches/ooo-build-2-4-1/patches/src680/config_office-disable-atl.diff
==============================================================================
--- (empty file)
+++ branches/ooo-build-2-4-1/patches/src680/config_office-disable-atl.diff	Fri Jul 18 09:29:18 2008
@@ -0,0 +1,40 @@
+--- config_office/configure.in.bak	2008-07-17 07:57:50.734375000 -0700
++++ config_office/configure.in	2008-07-17 08:00:13.781250000 -0700
+@@ -152,6 +152,10 @@
+ [  --disable-activex       Disable the use of ActiveX for windows build.
+                           This switch is mandatory when using VC++ 2005 Express.
+ ],,)
++AC_ARG_ENABLE(atl,
++[  --disable-atl          Disable the use of atl.h windows build.
++                          This switch is mandatory when using VC++ 2005 Express.
++],,)
+ 
+ AC_ARG_ENABLE(symbols,
+ [  --enable-symbols        Include debugging symbols in output.
+@@ -1173,6 +1177,16 @@
+       AC_MSG_RESULT([no])
+    fi
+    AC_SUBST(DISABLE_ACTIVEX)
++
++   AC_MSG_CHECKING([whether to use atl.h])
++   if test "$enable_atl" = "yes" -o "$enable_atl" = "TRUE" -o "$enable_atl" = ""; then
++      DISABLE_ATL=""
++      AC_MSG_RESULT([yes])
++   else
++      DISABLE_ATL="TRUE"
++      AC_MSG_RESULT([no])
++   fi
++   AC_SUBST(DISABLE_ATL)
+ fi
+ 
+ dnl ===================================================================
+--- config_office/set_soenv.in.bak	2008-07-17 08:01:33.000000000 -0700
++++ config_office/set_soenv.in	2008-07-17 08:02:13.890625000 -0700
+@@ -1859,6 +1859,7 @@
+    ToFile( "MFC_INCLUDE",       $MFC_INCLUDE,       "e" );
+    ToFile( "NSIS_PATH",         $NSIS_PATH,         "e" );
+    ToFile( "DISABLE_ACTIVEX",   "@DISABLE_ACTIVEX@","e" );
++   ToFile( "DISABLE_ATL",       "@DISABLE_ATL@","e" );
+    ToFile( "USE_NEW_SDK",       $USE_NEW_SDK,       "e" );
+ 
+    if ( "@NOWRAPCMD@" eq "yes" ) {

Added: branches/ooo-build-2-4-1/patches/src680/postprocess-exclude-msvcr80.diff
==============================================================================
--- (empty file)
+++ branches/ooo-build-2-4-1/patches/src680/postprocess-exclude-msvcr80.diff	Fri Jul 18 09:29:18 2008
@@ -0,0 +1,8 @@
+--- postprocess/rebase/no_rebase.txt	26 Mar 2007 14:20:45 -0000	1.7
++++ postprocess/rebase/no_rebase.txt	18 Jul 2008 08:59:50 -0000
+@@ -9,3 +9,4 @@
+ unicows.dll
+ gdiplus.dll
+ mingwm10.dll
++msvcr80.dll
+\ No newline at end of file