resolve merge conflict

4 files changed, 60 insertions, 0 deletions

diff --git a/package/firefox/patches/patch-configure b/package/firefox/patches/patch-configure
new file mode 100644
index 000000000..f424b3787
--- /dev/null
+++ b/package/firefox/patches/patch-configure
@@ -0,0 +1,13 @@
+--- mozilla-1.9.2.orig/configure	2010-04-02 18:07:41.000000000 +0200
++++ mozilla-1.9.2/configure	2010-04-11 14:38:39.000000000 +0200
+@@ -21012,8 +21012,8 @@ if test -n "$CROSS_COMPILE"; 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`
++        HOST_LIBIDL_CFLAGS=`PKG_CONFIG_LIBDIR=/usr/lib/pkgconfig ${HOST_LIBIDL_CONFIG} --cflags`
++        HOST_LIBIDL_LIBS=`PKG_CONFIG_LIBDIR=/usr/lib/pkgconfig ${HOST_LIBIDL_CONFIG} --libs`
+     else
+         HOST_LIBIDL_CFLAGS="$LIBIDL_CFLAGS"
+         HOST_LIBIDL_LIBS="$LIBIDL_LIBS"
diff --git a/package/firefox/patches/patch-gfx_qcms_qcmstypes_h b/package/firefox/patches/patch-gfx_qcms_qcmstypes_h
new file mode 100644
index 000000000..436b1a452
--- /dev/null
+++ b/package/firefox/patches/patch-gfx_qcms_qcmstypes_h
@@ -0,0 +1,25 @@
+--- mozilla-1.9.2.orig/gfx/qcms/qcmstypes.h	2010-04-02 18:02:27.000000000 +0200
++++ mozilla-1.9.2/gfx/qcms/qcmstypes.h	2010-04-11 14:57:54.000000000 +0200
+@@ -11,22 +11,11 @@
+ /* int_types.h gets included somehow, so avoid redefining the types differently */
+ #include <sys/int_types.h>
+ #else
+-typedef PRInt8 int8_t;
+-typedef PRUint8 uint8_t;
+-typedef PRInt16 int16_t;
+-typedef PRUint16 uint16_t;
+-typedef PRInt32 int32_t;
+-typedef PRUint32 uint32_t;
+-typedef PRInt64 int64_t;
+-typedef PRUint64 uint64_t;
+-
+ #ifdef __OS2__
+ /* OS/2's stdlib typdefs uintptr_t. So we'll just include that so we don't collide */
+ #include <stdlib.h>
+ #elif defined(__FreeBSD__)
+ /* FreeBSD typedefs uintptr_t in /usr/include/sys/types.h */
+-#else
+-typedef PRUptrdiff uintptr_t;
+ #endif
+ #endif
+ 
diff --git a/package/firefox/patches/patch-js_src_jsnum_h b/package/firefox/patches/patch-js_src_jsnum_h
new file mode 100644
index 000000000..af999878c
--- /dev/null
+++ b/package/firefox/patches/patch-js_src_jsnum_h
@@ -0,0 +1,11 @@
+--- mozilla-1.9.2.orig/js/src/jsnum.h	2010-04-02 18:02:28.000000000 +0200
++++ mozilla-1.9.2/js/src/jsnum.h	2010-04-11 14:04:14.000000000 +0200
+@@ -98,7 +98,7 @@ JSDOUBLE_IS_FINITE(jsdouble d)
+ #ifdef WIN32
+     return _finite(d);
+ #else
+-    return finite(d);
++    return isfinite(d);
+ #endif
+ }
+ 
diff --git a/package/firefox/patches/patch-security_nss_lib_freebl_stubs_c b/package/firefox/patches/patch-security_nss_lib_freebl_stubs_c
new file mode 100644
index 000000000..233823c91
--- /dev/null
+++ b/package/firefox/patches/patch-security_nss_lib_freebl_stubs_c
@@ -0,0 +1,11 @@
+--- mozilla-1.9.2.orig/security/nss/lib/freebl/stubs.c	2010-04-02 18:03:06.000000000 +0200
++++ mozilla-1.9.2/security/nss/lib/freebl/stubs.c	2010-04-11 15:37:04.000000000 +0200
+@@ -530,7 +530,7 @@ freebl_InitNSSUtil(void *lib)
+  * fetch the library if it's loaded. For NSS it should already be loaded
+  */
+ #define freebl_getLibrary(libName)  \
+-    dlopen (libName, RTLD_LAZY|RTLD_NOLOAD)
++    dlopen (libName, RTLD_LAZY)
+ 
+ #define freebl_releaseLibrary(lib) \
+     if (lib) dlclose(lib)