[Libreoffice-commits] .: 2 commits - patches/dev300 patches/mono

[René Engelhard]

 patches/dev300/seamonkey-is-iceape.diff |    4 ++--
 patches/mono/mono-build.diff            |   15 ++++++++-------
 2 files changed, 10 insertions(+), 9 deletions(-)

New commits:
commit f00a519b5bc50e055bd12e64283b0a2251a99466
Merge: 1c8a1d7... a85c579...
Author: Rene Engelhard <rene at debian.org>
Date:   Mon Nov 1 20:25:06 2010 +0100

    Merge remote branch 'origin/libreoffice-3-3'

commit a85c57964a27c09aa555fd664c82515fc871f1d8
Author: Rene Engelhard <rene at debian.org>
Date:   Mon Nov 1 19:33:05 2010 +0100

    update two patches to apply after configure.in option sorting

diff --git a/patches/dev300/seamonkey-is-iceape.diff b/patches/dev300/seamonkey-is-iceape.diff
index 49db7fa..10fccb6 100644
--- a/patches/dev300/seamonkey-is-iceape.diff
+++ b/patches/dev300/seamonkey-is-iceape.diff
@@ -1,6 +1,6 @@
 --- configure.in-old	2008-05-03 23:27:00.000000000 +0200
 +++ configure.in	2008-05-03 23:27:37.000000000 +0200
-@@ -511,7 +511,7 @@
+@@ -795,7 +795,7 @@
                            components cannot be built against a contemporary
                            mozilla. The flavour used can be specified by
                            --with-system-mozilla=<flavour>. Supported are:
@@ -8,7 +8,7 @@
 +                          libxul (default), xulrunner, firefox, iceape,
                            mozilla
  ], WITH_SYSTEM_MOZILLA=$withval, WITH_SYSTEM_MOZILLA=no)
- AC_ARG_WITH(linker-hash-style,
+
 @@ -4134,8 +4134,8 @@
        MOZ_FLAVOUR=libxul
      elif test -n "$with_system_mozilla" && test "$with_system_mozilla" = "xulrunner"; then
diff --git a/patches/mono/mono-build.diff b/patches/mono/mono-build.diff
index f2abb40..8fcd7fa 100644
--- a/patches/mono/mono-build.diff
+++ b/patches/mono/mono-build.diff
@@ -127,16 +127,17 @@ diff --git configure.in configure.in
 index 12fbec8..9c8aa00 100644
 --- configure.in
 +++ configure.in
-@@ -42,6 +42,9 @@ AC_ARG_WITH(external-tar,
- [  --with-external-tar=<TARFILE PATH>   Specify path to tarfiles manually ],
- [ TARFILE_LOCATION="$withval"
- ])
+@@ -373,6 +373,10 @@
+                           build.
+ ],,)
+
 +AC_ARG_ENABLE(mono,
 +[  --enable-mono           Enables the compilation of the Mono bindings
 +],,)
- AC_ARG_WITH(openldap,
- [  --with-openldap         Enables the use of the OpenLDAP LDAP SDK instead
-                           of the Netscape/Mozilla one
++
+ dnl ===================================================================
+ dnl Optional Packages (--with/without-)
+ dnl ===================================================================
 @@ -1992,7 +1992,6 @@
  dnl in fact apply equally to what we actually support, i.e.
  dnl Visual Studio 2008 and 2010?)