summaryrefslogtreecommitdiff
path: root/package/firefox/patches
diff options
context:
space:
mode:
Diffstat (limited to 'package/firefox/patches')
-rw-r--r--package/firefox/patches/patch-configure66
-rw-r--r--package/firefox/patches/patch-content_base_public_nsContentUtils_h11
-rw-r--r--package/firefox/patches/patch-content_base_src_nsContentSink_cpp10
-rw-r--r--package/firefox/patches/patch-content_canvas_src_nsCanvasRenderingContext2D_cpp11
-rw-r--r--package/firefox/patches/patch-content_media_nsAudioStream_cpp11
-rw-r--r--package/firefox/patches/patch-gfx_qcms_iccread_c18
-rw-r--r--package/firefox/patches/patch-gfx_qcms_qcmstypes_h26
-rw-r--r--package/firefox/patches/patch-ipc_chromium_src_base_debug_util_posix_cc29
-rw-r--r--package/firefox/patches/patch-js_src_ctypes_CTypes_cpp11
-rw-r--r--package/firefox/patches/patch-js_src_jsnum_h6
-rw-r--r--package/firefox/patches/patch-modules_libpr0n_decoders_nsPNGDecoder_cpp12
-rw-r--r--package/firefox/patches/patch-security_coreconf_Linux_mk4
-rw-r--r--package/firefox/patches/patch-security_coreconf_command_mk4
-rw-r--r--package/firefox/patches/patch-security_nss_lib_freebl_stubs_c11
-rw-r--r--package/firefox/patches/patch-xpcom_threads_nsThread_cpp33
15 files changed, 110 insertions, 153 deletions
diff --git a/package/firefox/patches/patch-configure b/package/firefox/patches/patch-configure
index 6ab49e7f0..42b39365b 100644
--- a/package/firefox/patches/patch-configure
+++ b/package/firefox/patches/patch-configure
@@ -1,52 +1,36 @@
---- mozilla-1.9.2.orig/configure 2010-12-03 16:57:11.000000000 +0100
-+++ mozilla-1.9.2/configure 2010-12-29 21:52:34.000000000 +0100
-@@ -3970,7 +3970,7 @@ else
- echo "$ac_t""yes" 1>&6
+--- mozilla-2.0.orig/configure 2011-03-19 00:48:56.000000000 +0100
++++ mozilla-2.0/configure 2011-03-28 12:25:19.041814743 +0200
+@@ -22573,15 +22573,6 @@ if test "${with_libIDL+set}" = set; then
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=
-@@ -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
- fi
- fi
-
--if test -n "$CROSS_COMPILE"; then
-- if test -z "$HOST_LIBIDL_CONFIG"; then
+-if test -z "$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"
+- if test -z "$HOST_LIBIDL_PREFIX"; then
+- HOST_LIBIDL_PREFIX="$LIBIDL_PREFIX"
- fi
-fi
+-
+ if test "$SKIP_IDL_CHECK" = "no"
+ then
+ _LIBIDL_FOUND=
+@@ -22788,6 +22779,7 @@ fi
+ fi
+ fi
+
++
+ # Check whether --with-glib-prefix or --without-glib-prefix was given.
+ if test "${with_glib_prefix+set}" = set; then
+ withval="$with_glib_prefix"
+@@ -23542,6 +23534,9 @@ else
+ LIBIDL_LIBS="$HOST_LIBIDL_LIBS"
+ 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 -z "${GLIB_CFLAGS}" -o -z "${GLIB_LIBS}" ; then
+ if test "$MOZ_ENABLE_GTK2" -o "$USE_ELF_DYNSTR_GC" ; then
diff --git a/package/firefox/patches/patch-content_base_public_nsContentUtils_h b/package/firefox/patches/patch-content_base_public_nsContentUtils_h
new file mode 100644
index 000000000..0d5d389a4
--- /dev/null
+++ b/package/firefox/patches/patch-content_base_public_nsContentUtils_h
@@ -0,0 +1,11 @@
+--- mozilla-2.0.orig/content/base/public/nsContentUtils.h 2011-03-19 00:33:33.000000000 +0100
++++ mozilla-2.0/content/base/public/nsContentUtils.h 2011-03-27 21:49:48.303361341 +0200
+@@ -1942,7 +1942,7 @@ inline NS_HIDDEN_(PRBool) NS_FloatIsFini
+ #ifdef WIN32
+ return _finite(f);
+ #else
+- return finite(f);
++ return isfinite(f);
+ #endif
+ }
+
diff --git a/package/firefox/patches/patch-content_base_src_nsContentSink_cpp b/package/firefox/patches/patch-content_base_src_nsContentSink_cpp
deleted file mode 100644
index a97306351..000000000
--- a/package/firefox/patches/patch-content_base_src_nsContentSink_cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- mozilla-1.9.2.orig/content/base/src/nsContentSink.cpp 2010-10-27 05:01:11.000000000 +0200
-+++ mozilla-1.9.2/content/base/src/nsContentSink.cpp 2010-11-11 22:40:48.404995720 +0100
-@@ -1973,7 +1973,6 @@ nsIAtom** const kDefaultAllowedAttribute
- &nsGkAtoms::nowrap,
- &nsGkAtoms::open,
- &nsGkAtoms::optimum,
-- &nsGkAtoms::pattern,
- &nsGkAtoms::placeholder,
- &nsGkAtoms::pointSize,
- &nsGkAtoms::prompt,
diff --git a/package/firefox/patches/patch-content_canvas_src_nsCanvasRenderingContext2D_cpp b/package/firefox/patches/patch-content_canvas_src_nsCanvasRenderingContext2D_cpp
new file mode 100644
index 000000000..bd9eacb42
--- /dev/null
+++ b/package/firefox/patches/patch-content_canvas_src_nsCanvasRenderingContext2D_cpp
@@ -0,0 +1,11 @@
+--- mozilla-2.0.orig/content/canvas/src/nsCanvasRenderingContext2D.cpp 2011-03-19 00:33:34.000000000 +0100
++++ mozilla-2.0/content/canvas/src/nsCanvasRenderingContext2D.cpp 2011-03-27 22:36:34.953370738 +0200
+@@ -159,7 +159,7 @@ DoubleIsFinite(double d)
+ // NOTE: '!!' casts an int to bool without spamming MSVC warning C4800.
+ return !!_finite(d);
+ #else
+- return finite(d);
++ return isfinite(d);
+ #endif
+ }
+
diff --git a/package/firefox/patches/patch-content_media_nsAudioStream_cpp b/package/firefox/patches/patch-content_media_nsAudioStream_cpp
deleted file mode 100644
index 1452b9b6b..000000000
--- a/package/firefox/patches/patch-content_media_nsAudioStream_cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- mozilla-1.9.2.orig/content/media/nsAudioStream.cpp 2010-04-02 18:02:19.000000000 +0200
-+++ mozilla-1.9.2/content/media/nsAudioStream.cpp 2010-06-11 21:28:33.522214080 +0200
-@@ -246,7 +246,7 @@ float nsAudioStream::GetPosition()
- #if defined(XP_WIN)
- positionType = SA_POSITION_WRITE_HARDWARE;
- #endif
-- PRInt64 position = 0;
-+ int64_t position = 0;
- if (sa_stream_get_position(static_cast<sa_stream_t*>(mAudioHandle),
- positionType, &position) == SA_SUCCESS) {
- return (position / float(mRate) / mChannels / sizeof(short));
diff --git a/package/firefox/patches/patch-gfx_qcms_iccread_c b/package/firefox/patches/patch-gfx_qcms_iccread_c
deleted file mode 100644
index ea9ab6234..000000000
--- a/package/firefox/patches/patch-gfx_qcms_iccread_c
+++ /dev/null
@@ -1,18 +0,0 @@
---- mozilla-1.9.2.orig/gfx/qcms/iccread.c 2010-04-02 18:02:27.000000000 +0200
-+++ mozilla-1.9.2/gfx/qcms/iccread.c 2010-04-30 14:00:52.430967966 +0200
-@@ -23,6 +23,7 @@
- #include <math.h>
- #include <assert.h>
- #include <stdlib.h>
-+#include <stdio.h>
- #include "qcmsint.h"
-
- //XXX: use a better typename
-@@ -771,7 +772,6 @@ void qcms_profile_release(qcms_profile *
- qcms_profile_fini(profile);
- }
-
--#include <stdio.h>
- qcms_profile* qcms_profile_from_file(FILE *file)
- {
- uint32_t length, remaining_length;
diff --git a/package/firefox/patches/patch-gfx_qcms_qcmstypes_h b/package/firefox/patches/patch-gfx_qcms_qcmstypes_h
deleted file mode 100644
index 80f68661a..000000000
--- a/package/firefox/patches/patch-gfx_qcms_qcmstypes_h
+++ /dev/null
@@ -1,26 +0,0 @@
---- 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-30 17:58:33.490975825 +0200
-@@ -11,22 +11,12 @@
- /* 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;
--
-+#include <stdint.h>
- #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-ipc_chromium_src_base_debug_util_posix_cc b/package/firefox/patches/patch-ipc_chromium_src_base_debug_util_posix_cc
deleted file mode 100644
index 833e94185..000000000
--- a/package/firefox/patches/patch-ipc_chromium_src_base_debug_util_posix_cc
+++ /dev/null
@@ -1,29 +0,0 @@
---- mozilla-1.9.2.orig/ipc/chromium/src/base/debug_util_posix.cc 2010-10-27 05:01:17.000000000 +0200
-+++ mozilla-1.9.2/ipc/chromium/src/base/debug_util_posix.cc 2010-11-12 11:53:10.614327269 +0100
-@@ -114,6 +114,9 @@ void DebugUtil::BreakDebugger() {
- }
-
- StackTrace::StackTrace() {
-+#ifdef CHROMIUM_MOZILLA_BUILD
-+ return;
-+#else
- const int kMaxCallers = 256;
-
- void* callers[kMaxCallers];
-@@ -128,11 +131,16 @@ StackTrace::StackTrace() {
- } else {
- trace_.resize(0);
- }
-+#endif
- }
-
- void StackTrace::PrintBacktrace() {
-+#ifdef CHROMIUM_MOZILLA_BUILD
-+ return;
-+#else
- fflush(stderr);
- backtrace_symbols_fd(&trace_[0], trace_.size(), STDERR_FILENO);
-+#endif
- }
-
- void StackTrace::OutputToStream(std::ostream* os) {
diff --git a/package/firefox/patches/patch-js_src_ctypes_CTypes_cpp b/package/firefox/patches/patch-js_src_ctypes_CTypes_cpp
new file mode 100644
index 000000000..0df200fbf
--- /dev/null
+++ b/package/firefox/patches/patch-js_src_ctypes_CTypes_cpp
@@ -0,0 +1,11 @@
+--- mozilla-2.0.orig/js/src/ctypes/CTypes.cpp 2011-03-19 00:33:47.000000000 +0100
++++ mozilla-2.0/js/src/ctypes/CTypes.cpp 2011-03-27 20:35:10.553370360 +0200
+@@ -464,7 +464,7 @@ static inline bool FloatIsFinite(jsdoubl
+ #ifdef WIN32
+ return _finite(f) != 0;
+ #else
+- return finite(f);
++ return isfinite(f);
+ #endif
+ }
+
diff --git a/package/firefox/patches/patch-js_src_jsnum_h b/package/firefox/patches/patch-js_src_jsnum_h
index af999878c..54c7064cf 100644
--- a/package/firefox/patches/patch-js_src_jsnum_h
+++ b/package/firefox/patches/patch-js_src_jsnum_h
@@ -1,6 +1,6 @@
---- 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)
+--- mozilla-2.0.orig/js/src/jsnum.h 2011-03-19 00:33:50.000000000 +0100
++++ mozilla-2.0/js/src/jsnum.h 2011-03-27 20:18:21.253370504 +0200
+@@ -101,7 +101,7 @@ JSDOUBLE_IS_FINITE(jsdouble d)
#ifdef WIN32
return _finite(d);
#else
diff --git a/package/firefox/patches/patch-modules_libpr0n_decoders_nsPNGDecoder_cpp b/package/firefox/patches/patch-modules_libpr0n_decoders_nsPNGDecoder_cpp
new file mode 100644
index 000000000..9534c92bd
--- /dev/null
+++ b/package/firefox/patches/patch-modules_libpr0n_decoders_nsPNGDecoder_cpp
@@ -0,0 +1,12 @@
+--- mozilla-2.0.orig/modules/libpr0n/decoders/nsPNGDecoder.cpp 2011-03-19 00:34:02.000000000 +0100
++++ mozilla-2.0/modules/libpr0n/decoders/nsPNGDecoder.cpp 2011-03-27 22:30:41.783370593 +0200
+@@ -386,7 +386,8 @@ PNGGetColorProfile(png_structp png_ptr,
+ // First try to see if iCCP chunk is present
+ if (png_get_valid(png_ptr, info_ptr, PNG_INFO_iCCP)) {
+ png_uint_32 profileLen;
+- char *profileData, *profileName;
++ png_byte *profileData;
++ char *profileName;
+ int compression;
+
+ png_get_iCCP(png_ptr, info_ptr, &profileName, &compression,
diff --git a/package/firefox/patches/patch-security_coreconf_Linux_mk b/package/firefox/patches/patch-security_coreconf_Linux_mk
index 26a3dc8f3..32aaf4633 100644
--- a/package/firefox/patches/patch-security_coreconf_Linux_mk
+++ b/package/firefox/patches/patch-security_coreconf_Linux_mk
@@ -1,5 +1,5 @@
---- mozilla-1.9.2.orig/security/coreconf/Linux.mk 2010-12-03 16:48:49.000000000 +0100
-+++ mozilla-1.9.2/security/coreconf/Linux.mk 2011-01-20 20:18:26.904905227 +0100
+--- mozilla-2.0.orig/security/coreconf/Linux.mk 2011-03-19 00:34:04.000000000 +0100
++++ mozilla-2.0/security/coreconf/Linux.mk 2011-03-28 13:44:58.221818344 +0200
@@ -46,9 +46,9 @@ ifeq ($(USE_PTHREADS),1)
IMPL_STRATEGY = _PTH
endif
diff --git a/package/firefox/patches/patch-security_coreconf_command_mk b/package/firefox/patches/patch-security_coreconf_command_mk
index fcf73b8a8..3b4ddc1be 100644
--- a/package/firefox/patches/patch-security_coreconf_command_mk
+++ b/package/firefox/patches/patch-security_coreconf_command_mk
@@ -1,5 +1,5 @@
---- mozilla-1.9.2.orig/security/coreconf/command.mk 2010-12-03 16:48:49.000000000 +0100
-+++ mozilla-1.9.2/security/coreconf/command.mk 2011-01-20 20:18:56.214904993 +0100
+--- mozilla-2.0.orig/security/coreconf/command.mk 2011-03-19 00:34:04.000000000 +0100
++++ mozilla-2.0/security/coreconf/command.mk 2011-03-28 13:45:21.461818772 +0200
@@ -48,7 +48,7 @@ LINK_EXE = $(LINK) $(OS_LFLAGS) $(L
CFLAGS = $(OPTIMIZER) $(OS_CFLAGS) $(XP_DEFINE) $(DEFINES) $(INCLUDES) \
$(XCFLAGS)
diff --git a/package/firefox/patches/patch-security_nss_lib_freebl_stubs_c b/package/firefox/patches/patch-security_nss_lib_freebl_stubs_c
deleted file mode 100644
index 233823c91..000000000
--- a/package/firefox/patches/patch-security_nss_lib_freebl_stubs_c
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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)
diff --git a/package/firefox/patches/patch-xpcom_threads_nsThread_cpp b/package/firefox/patches/patch-xpcom_threads_nsThread_cpp
new file mode 100644
index 000000000..ca4be566b
--- /dev/null
+++ b/package/firefox/patches/patch-xpcom_threads_nsThread_cpp
@@ -0,0 +1,33 @@
+--- mozilla-2.0.orig/xpcom/threads/nsThread.cpp 2011-03-19 00:34:14.000000000 +0100
++++ mozilla-2.0/xpcom/threads/nsThread.cpp 2011-03-27 21:47:15.633370362 +0200
+@@ -46,10 +46,13 @@
+ #include "prlog.h"
+ #include "nsThreadUtilsInternal.h"
+
++#include <features.h>
++
+ #define HAVE_UALARM _BSD_SOURCE || (_XOPEN_SOURCE >= 500 || \
+ _XOPEN_SOURCE && _XOPEN_SOURCE_EXTENDED) && \
+ !(_POSIX_C_SOURCE >= 200809L || _XOPEN_SOURCE >= 700)
+
++#if !defined(__UCLIBC__)
+ #if defined(XP_UNIX) && !defined(ANDROID) && !defined(DEBUG) && HAVE_UALARM \
+ && defined(_GNU_SOURCE)
+ # define MOZ_CANARY
+@@ -59,6 +62,7 @@
+ # include <fcntl.h>
+ # include "nsXULAppAPI.h"
+ #endif
++#endif
+
+ #include "mozilla/FunctionTimer.h"
+ #if defined(NS_FUNCTION_TIMER) && defined(_MSC_VER)
+@@ -562,7 +566,7 @@ void canary_alarm_handler (int signum)
+ const char msg[29] = "event took too long to run:\n";
+ // use write to be safe in the signal handler
+ write(Canary::sOutputFD, msg, sizeof(msg));
+- backtrace_symbols_fd(array, backtrace(array, 30), Canary::sOutputFD);
++ //backtrace_symbols_fd(array, backtrace(array, 30), Canary::sOutputFD);
+ }
+
+ #endif