ooo-build r11607 - in trunk: . patches/src680

[strba svn gnome org]

Author: strba
Date: Mon Feb 18 11:52:59 2008
New Revision: 11607
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11607&view=rev

Log:
massage patch to apply on GoOoLinux too

Modified:
   trunk/ChangeLog
   trunk/patches/src680/win32-activex-disable.diff

Modified: trunk/patches/src680/win32-activex-disable.diff
==============================================================================
--- trunk/patches/src680/win32-activex-disable.diff	(original)
+++ trunk/patches/src680/win32-activex-disable.diff	Mon Feb 18 11:52:59 2008
@@ -1,15 +1,15 @@
 --- 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
 @@ -74,6 +74,9 @@
-                           distributions where AFM files or TrueType Fonts
-                           are known to be available.
- ],,)
+                           epm, however epm is useless for large scale
+                           package building.
+ ],,enable_epm="yes")
 +AC_ARG_ENABLE(activex_component,
 +[  --disable-activex-component Remove support for ActiveX embedding of OOo
 +],,enable_activex_component=yes)
- AC_ARG_ENABLE(epm,
- [  --disable-epm           OO.o includes self-packaging code, that requires
-                           epm, however epm is useless for large scale
+ AC_ARG_WITH(package-format,
+ [  --with-package-format   specify package format(s) for OOo installsets.
+                           Default is "normal" one of the OS/Distribution.
 @@ -4268,6 +4272,20 @@
  AC_SUBST(WITH_WRITER2LATEX)