[Libreoffice-commits] .: 2 commits - configure.in shell/source

[Bjoern Michaelsen]

 configure.in                       |    4 +++-
 shell/source/unix/misc/open-url.sh |    4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit c497ae0ded79422ec54ff8677e8a7c36351a7aef
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Thu Nov 24 18:32:31 2011 +0100

    upstream seamoney-is-iceape.diff from libreoffice/build

diff --git a/configure.in b/configure.in
index 2711e51..ffdb978 100644
--- a/configure.in
+++ b/configure.in
@@ -1346,7 +1346,7 @@ AC_ARG_WITH(system-mozilla,
         [Use Mozilla already on system. Note that some 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, mozilla.]),
+         xulrunner, firefox, seamonkey, mozilla, iceape.]),
     WITH_SYSTEM_MOZILLA=$withval ,
 WITH_SYSTEM_MOZILLA=no)
 
@@ -5838,6 +5838,8 @@ if test -n "$with_system_mozilla" && test "$with_system_mozilla" != "no"; 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
commit 2d8d1548f285501367db19c68dd0dcef0a4af4df
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Thu Nov 24 18:29:39 2011 +0100

    upstream open-url-support-iceanimals.diff from libreoffice/build

diff --git a/shell/source/unix/misc/open-url.sh b/shell/source/unix/misc/open-url.sh
index 0dc22cb..c9007d8 100755
--- a/shell/source/unix/misc/open-url.sh
+++ b/shell/source/unix/misc/open-url.sh
@@ -58,7 +58,7 @@ if echo $1 | grep '^mailto:' > /dev/null; then
     exit 0
   fi
   # mozilla derivates may need -remote semantics
-  for i in thunderbird mozilla netscape; do
+  for i in thunderbird mozilla netscape icedove iceape; do
     mailer=`which $i`
     if [ ! -z "$mailer" ]; then
       run_mozilla "$mailer" "$1"
@@ -80,7 +80,7 @@ else
     exit 0
   fi
   # mozilla derivates may need -remote semantics
-  for i in chrome seamonkey firefox; do
+  for i in chrome seamonkey firefox iceweasel iceape; do
     browser=`which $i`
     if [ ! -z "$browser" ]; then
       run_mozilla "$browser" "$1"