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

[ccheney svn gnome org]

Author: ccheney
Date: Sat Mar 29 19:23:36 2008
New Revision: 12053
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12053&view=rev

Log:
2008-03-29  Chris Cheney <ccheney ubuntu com>

        * patches/src680/xulrunner-1.9.diff: Update to version from 
        cws_src680_cmcfixes43



Modified:
   trunk/ChangeLog
   trunk/patches/src680/xulrunner-1.9.diff

Modified: trunk/patches/src680/xulrunner-1.9.diff
==============================================================================
--- trunk/patches/src680/xulrunner-1.9.diff	(original)
+++ trunk/patches/src680/xulrunner-1.9.diff	Sat Mar 29 19:23:36 2008
@@ -1,20 +1,16 @@
-Index: configure.in
-===================================================================
-RCS file: /cvs/tools/config_office/configure.in,v
-retrieving revision 1.249
-diff -u -r1.249 configure.in
---- config_office/configure.in	19 Feb 2008 12:37:37 -0000	1.249
-+++ config_office/configure.in	4 Mar 2008 08:43:21 -0000
-@@ -466,7 +466,7 @@
+--- configure.in.orig	2008-01-31 05:45:01.000000000 -0600
++++ configure.in	2008-03-29 14:19:38.000000000 -0500
+@@ -466,7 +466,8 @@
                            components cannot be built against a contemporary
                            mozilla. The flavour used can be specified by
                            --with-system-mozilla=<flavour>. Supported are:
 -                          xulrunner (default), firefox, seamonkey, mozilla
-+                          libxul (default), xulrunner, firefox, seamonkey, mozilla
++                          libxul (default), xulrunner, firefox, seamonkey,
++                          mozilla
  ], WITH_SYSTEM_MOZILLA=$withval, WITH_SYSTEM_MOZILLA=no)
  AC_ARG_WITH(stlport,
  [  --with-stlport         The location that STLport is installed in. The STL
-@@ -3794,7 +3794,9 @@
+@@ -3781,7 +3782,9 @@
      AC_MSG_RESULT([external])
      SYSTEM_MOZILLA=YES
      AC_MSG_CHECKING([which Mozilla flavour to use])
@@ -25,7 +21,7 @@
        MOZ_FLAVOUR=xulrunner
      elif test -n "$with_system_mozilla" && test "$with_system_mozilla" = "seamonkey"; then
        MOZ_FLAVOUR=seamonkey
-@@ -3803,12 +3805,24 @@
+@@ -3790,12 +3793,18 @@
      elif test -n "$with_system_mozilla" && test "$with_system_mozilla" = "mozilla"; then
        MOZ_FLAVOUR=mozilla
      else
@@ -36,12 +32,6 @@
      AC_MSG_RESULT($tmp)
  
 -    PKG_CHECK_MODULES( MOZILLAXPCOM, $MOZ_FLAVOUR-xpcom )
-+    #e.g. http://fedoraproject.org/wiki/Releases/FeatureXULRunnerAPIChanges
-+    #the plugin pkg-config etc. reverts to "mozilla-plugin" with libxul
-+    if test "$MOZ_FLAVOUR" == "libxul"; then
-+        MOZ_FLAVOUR="mozilla"
-+    fi
-+
 +    PKG_CHECK_MODULES( MOZ_NSS, nss, STANDALONENSS="TRUE", STANDALONENSS="" )
 +    if test -z "$STANDALONENSS"; then
 +        PKG_CHECK_MODULES( MOZ_NSS, $MOZ_FLAVOUR-nss )
@@ -52,7 +42,7 @@
  
      if $PKG_CONFIG --exists nspr ; then
        PKG_CHECK_MODULES( MOZ_NSPR, nspr )
-@@ -3818,12 +3832,14 @@
+@@ -3805,12 +3814,20 @@
        PKG_CHECK_MODULES( MOZ_NSPR, $MOZ_FLAVOUR-nspr )
      fi
  
@@ -62,7 +52,13 @@
 +    if $PKG_CONFIG --exists libxul ; then
 +      PKG_CHECK_MODULES( MOZILLAXPCOM, libxul )
 +      MOZ_INC=`$PKG_CONFIG --variable=includedir libxul`
-+      MOZ_LIB=`$PKG_CONFIG --variable=sdkdir libxul`
++      MOZ_LIB=`$PKG_CONFIG --variable=libdir libxul`
++      if ! test -e "$MOZ_LIB/libxul.so"; then
++         MOZ_LIB=`$PKG_CONFIG --variable=sdkdir libxul`
++         if test -e "$MOZ_LIB/sdk/lib/libxul.so"; then
++            MOZ_LIB="$MOZ_LIB/sdk/lib"
++         fi
++      fi
      else
 -        NSS_LIB="-L`$PKG_CONFIG --variable=libdir nss`"
 -        AC_SUBST(NSS_LIB)
@@ -72,7 +68,7 @@
      fi
  
      save_CPPFLAGS="$CPPFLAGS"
-@@ -3839,8 +3855,6 @@
+@@ -3826,8 +3843,6 @@
      CPPFLAGS="$save_CPPFLAGS"
      LIBS="$save_LIBS"
  
@@ -81,3 +77,17 @@
      MOZ_LIB_XPCOM=$MOZILLAXPCOM_LIBS
      if test "$WITH_LDAP" != "NO" && test "$WITH_OPENLDAP" != "YES"; then
        AC_MSG_CHECKING([whether $tmp was compiled with --enable-ldap])
+@@ -3840,6 +3855,13 @@
+ Please recompile $tmp with --enable-ldap or use --with-openldap.])
+       fi
+     fi
++
++    #e.g. http://fedoraproject.org/wiki/Releases/FeatureXULRunnerAPIChanges
++    #the plugin pkg-config etc. reverts to "mozilla-plugin" with libxul
++    if test "$MOZ_FLAVOUR" == "libxul"; then
++        MOZ_FLAVOUR="mozilla"
++    fi
++
+ elif test "$enable_mozilla" = "no"; then
+     AC_MSG_RESULT([none])
+     WITH_MOZILLA=NO