mozilla-headless: Update to work with recent git changes

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

1 files changed, 25 insertions, 7 deletions

diff --git a/meta/packages/mozilla-headless/mozilla-headless/removebadrpath.patch b/meta/packages/mozilla-headless/mozilla-headless/removebadrpath.patch
index 9409105780..53ae6d3251 100644
--- a/meta/packages/mozilla-headless/mozilla-headless/removebadrpath.patch
+++ b/meta/packages/mozilla-headless/mozilla-headless/removebadrpath.patch
@@ -1,8 +1,8 @@
 Index: offscreen/js/src/configure.in
 ===================================================================
---- offscreen.orig/js/src/configure.in  2009-06-17 14:31:40.000000000 +0100
-+++ offscreen/js/src/configure.in       2009-06-17 14:31:40.000000000 +0100
-@@ -880,7 +880,7 @@
+--- offscreen.orig/js/src/configure.in  2009-12-09 13:38:51.000000000 +0000
++++ offscreen/js/src/configure.in       2009-12-09 14:14:08.000000000 +0000
+@@ -858,7 +858,7 @@
  HOST_AR_FLAGS='$(AR_FLAGS)'
  
  MOZ_JS_LIBS='-L$(libdir) -lmozjs'
@@ -10,12 +10,21 @@ Index: offscreen/js/src/configure.in
 +MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin'
  
  MOZ_COMPONENT_NSPR_LIBS='-L$(LIBXUL_DIST)/bin $(NSPR_LIBS)'
- MOZ_XPCOM_OBSOLETE_LIBS='-L$(LIBXUL_DIST)/lib -lxpcom_compat'
+ 
+@@ -3824,7 +3824,7 @@
+ [  --with-nspr-libs=LIBS   Pass LIBS to LD when linking code that uses NSPR.
+                           See --with-nspr-cflags for more details.],
+     NSPR_LIBS=$withval)
+-$NSPR_LIBS="$NSPR_LIBS -L$(LIBXUL_DIST)/sdk/lib"
++NSPR_LIBS="$NSPR_LIBS -L$(LIBXUL_DIST)/sdk/lib"
+ AC_SUBST(NSPR_CFLAGS)
+ AC_SUBST(NSPR_LIBS)
+ 
 Index: offscreen/configure.in
 ===================================================================
---- offscreen.orig/configure.in 2009-06-17 15:09:44.000000000 +0100
-+++ offscreen/configure.in      2009-06-17 15:10:00.000000000 +0100
-@@ -1060,7 +1060,7 @@
+--- offscreen.orig/configure.in 2009-12-09 13:38:51.000000000 +0000
++++ offscreen/configure.in      2009-12-09 14:31:33.000000000 +0000
+@@ -1041,7 +1041,7 @@
  
  MOZ_JS_LIBS='-L$(LIBXUL_DIST)/bin -lmozjs'
  DYNAMIC_XPCOM_LIBS='-L$(LIBXUL_DIST)/bin -lxpcom -lxpcom_core'
@@ -24,3 +33,12 @@ Index: offscreen/configure.in
  XPCOM_FROZEN_LDOPTS='-L$(LIBXUL_DIST)/bin -lxpcom'
  LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) -lxul'
  XPCOM_GLUE_LDOPTS='$(LIBXUL_DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) $(XPCOM_FROZEN_LDOPTS)'
+@@ -8378,7 +8378,7 @@
+ if test "$BUILD_CTYPES"; then
+   # Run the libffi 'configure' script on platforms that it supports.
+   if test -z "$_MSC_VER"; then
+-    ac_configure_args="--disable-shared --enable-static --disable-raw-api"
++    ac_configure_args="$ac_configure_args --disable-shared --enable-static --disable-raw-api"
+     if test "$MOZ_DEBUG"; then
+       ac_configure_args="$ac_configure_args --enable-debug"
+     fi