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

[rengelhard svn gnome org]

Author: rengelhard
Date: Sat May  3 21:42:02 2008
New Revision: 12452
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12452&view=rev

Log:
2008-05-03  Rene Engelhard  <rene debian org>

        * patches/src680/apply,
          patches/src680/seamonkey-is-iceape-diff: fix build with
          --with-system-mozilla=iceape (DebianOnly)


Added:
   branches/ooo-build-2-4/patches/src680/seamonkey-is-iceape-diff
Modified:
   branches/ooo-build-2-4/ChangeLog
   branches/ooo-build-2-4/patches/src680/apply

Modified: branches/ooo-build-2-4/patches/src680/apply
==============================================================================
--- branches/ooo-build-2-4/patches/src680/apply	(original)
+++ branches/ooo-build-2-4/patches/src680/apply	Sat May  3 21:42:02 2008
@@ -894,6 +894,7 @@
 SectionOwner => rengelha
 # fix the splash progressbar colors
 debian-splash.diff
+seamonkey-is-iceape-diff
 
 [ DroplineGNOMEOnly ]
 SectionOwner => DropLine

Added: branches/ooo-build-2-4/patches/src680/seamonkey-is-iceape-diff
==============================================================================
--- (empty file)
+++ branches/ooo-build-2-4/patches/src680/seamonkey-is-iceape-diff	Sat May  3 21:42:02 2008
@@ -0,0 +1,22 @@
+--- config_office/configure.in-old	2008-05-03 23:27:00.000000000 +0200
++++ config_office/configure.in	2008-05-03 23:27:37.000000000 +0200
+@@ -511,7 +511,7 @@
+                           components cannot be built against a contemporary
+                           mozilla. The flavour used can be specified by
+                           --with-system-mozilla=<flavour>. Supported are:
+-                          libxul (default), xulrunner, firefox, seamonkey,
++                          libxul (default), xulrunner, firefox, iceape,
+                           mozilla
+ ], WITH_SYSTEM_MOZILLA=$withval, WITH_SYSTEM_MOZILLA=no)
+ AC_ARG_WITH(stlport,
+@@ -4134,8 +4134,8 @@
+       MOZ_FLAVOUR=libxul
+     elif test -n "$with_system_mozilla" && test "$with_system_mozilla" = "xulrunner"; then
+       MOZ_FLAVOUR=xulrunner
+-    elif test -n "$with_system_mozilla" && test "$with_system_mozilla" = "seamonkey"; then
+-      MOZ_FLAVOUR=seamonkey
++    elif test -n "$with_system_mozilla" && test "$with_system_mozilla" = "iceape"; then
++      MOZ_FLAVOUR=iceape
+     elif test -n "$with_system_mozilla" && test "$with_system_mozilla" = "firefox"; then
+       MOZ_FLAVOUR=firefox
+     elif test -n "$with_system_mozilla" && test "$with_system_mozilla" = "mozilla"; then