From ce64829c0d165fe0f25c861117a359b05293ec51 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 24 Apr 2011 17:38:50 +0200
Subject: update to firefox4

---
 package/firefox/patches/patch-configure | 63 ++++-----------------------------
 1 file changed, 6 insertions(+), 57 deletions(-)

(limited to 'package/firefox/patches/patch-configure')

diff --git a/package/firefox/patches/patch-configure b/package/firefox/patches/patch-configure
index cda2ec0e1..221ae4c83 100644
--- a/package/firefox/patches/patch-configure
+++ b/package/firefox/patches/patch-configure
@@ -1,63 +1,12 @@
---- mozilla-1.9.2.orig/configure	2011-03-19 21:39:59.000000000 +0100
-+++ mozilla-1.9.2/configure	2011-04-23 11:35:36.000000000 +0200
-@@ -3970,7 +3970,7 @@ else
-     echo "$ac_t""yes" 1>&6    
- fi
- 
--  for ac_prog in $PYTHON python2.5 python2.4 python
-+  for ac_prog in $PYTHON python2.6 python2.5 python2.4 python
- do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
-@@ -5625,7 +5625,6 @@ DIRENT_INO=d_ino
- CYGWIN_WRAPPER=
- WIN_TOP_SRC=
- MOZ_USER_DIR=".mozilla"
--HOST_AR='$(AR)'
- HOST_AR_FLAGS='$(AR_FLAGS)'
- 
- MOZ_JPEG_CFLAGS=
-@@ -13581,9 +13580,9 @@ if test "$SYSTEM_PNG" = 1; then
-     LIBS="$PNG_LIBS $LIBS"
-     cat > conftest.$ac_ext <<EOF
- #line 13584 "configure"
--#include "confdefs.h"
-  #include <stdio.h>
-                      #include <sys/types.h>
-+#include "confdefs.h"
-                      #include <png.h> 
- int main() {
-  #if PNG_LIBPNG_VER < $MOZPNG
-@@ -17895,7 +17894,7 @@ echo "configure:17889: checking for SQLI
- else
-   
-         if test "$cross_compiling" = yes; then
--  ac_cv_sqlite_secure_delete=no
-+  ac_cv_sqlite_secure_delete=yes
-         
- else
-   cat > conftest.$ac_ext <<EOF
-@@ -21460,18 +21459,11 @@ fi
+--- mozilla-2.0.orig/configure	2011-03-19 00:48:56.000000000 +0100
++++ mozilla-2.0/configure	2011-04-24 06:37:26.000000000 +0200
+@@ -23503,6 +23503,9 @@ fi
      fi
  fi
  
--if test -n "$CROSS_COMPILE"; then
--     if test -z "$HOST_LIBIDL_CONFIG"; then
--        HOST_LIBIDL_CONFIG="$LIBIDL_CONFIG"
--    fi
--    if test -n "$HOST_LIBIDL_CONFIG" && test "$HOST_LIBIDL_CONFIG" != "no"; then
--        HOST_LIBIDL_CFLAGS=`${HOST_LIBIDL_CONFIG} --cflags`
--        HOST_LIBIDL_LIBS=`${HOST_LIBIDL_CONFIG} --libs`
--    else
--        HOST_LIBIDL_CFLAGS="$LIBIDL_CFLAGS"
--        HOST_LIBIDL_LIBS="$LIBIDL_LIBS"
--    fi
--fi
 +HOST_LIBIDL_CFLAGS=`env PKG_CONFIG_LIBDIR=${PKG_HOSTLIB_DIR} ${BUILD_LIBIDL_CONFIG} --cflags`
 +HOST_LIBIDL_LIBS=`env PKG_CONFIG_LIBDIR=${PKG_HOSTLIB_DIR} ${BUILD_LIBIDL_CONFIG} --libs`
 +
-+echo "host libidl cflags: ${HOST_LIBIDL_CFLAGS}"
-+echo "host libidl libs: ${HOST_LIBIDL_LIBS}"
- 
- if test -z "$SKIP_PATH_CHECKS"; then
- if test -z "${GLIB_CFLAGS}" || test -z "${GLIB_LIBS}" ; then
+ if test -n "$CROSS_COMPILE"; then
+     case "$target" in
+     *-mingw*|*-cygwin*|*-msvc*|*-mks*)
-- 
cgit v1.2.3