summaryrefslogtreecommitdiff
path: root/package/firefox/patches
diff options
context:
space:
mode:
Diffstat (limited to 'package/firefox/patches')
-rw-r--r--package/firefox/patches/patch-configure6
-rw-r--r--package/firefox/patches/patch-content_base_src_nsContentSink_cpp10
-rw-r--r--package/firefox/patches/patch-ipc_chromium_src_base_debug_util_posix_cc29
3 files changed, 42 insertions, 3 deletions
diff --git a/package/firefox/patches/patch-configure b/package/firefox/patches/patch-configure
index 28035c66a..0127a7bab 100644
--- a/package/firefox/patches/patch-configure
+++ b/package/firefox/patches/patch-configure
@@ -1,5 +1,5 @@
---- mozilla-1.9.2.orig/configure 2010-07-23 00:00:19.000000000 +0200
-+++ mozilla-1.9.2/configure 2010-07-30 09:52:43.000000000 +0200
+--- mozilla-1.9.2.orig/configure 2010-10-27 05:09:28.000000000 +0200
++++ mozilla-1.9.2/configure 2010-11-11 22:26:20.594995948 +0100
@@ -3970,7 +3970,7 @@ else
echo "$ac_t""yes" 1>&6
fi
@@ -9,7 +9,7 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-@@ -21285,8 +21285,8 @@ if test -n "$CROSS_COMPILE"; then
+@@ -21465,8 +21465,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
diff --git a/package/firefox/patches/patch-content_base_src_nsContentSink_cpp b/package/firefox/patches/patch-content_base_src_nsContentSink_cpp
new file mode 100644
index 000000000..a97306351
--- /dev/null
+++ b/package/firefox/patches/patch-content_base_src_nsContentSink_cpp
@@ -0,0 +1,10 @@
+--- 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-ipc_chromium_src_base_debug_util_posix_cc b/package/firefox/patches/patch-ipc_chromium_src_base_debug_util_posix_cc
new file mode 100644
index 000000000..833e94185
--- /dev/null
+++ b/package/firefox/patches/patch-ipc_chromium_src_base_debug_util_posix_cc
@@ -0,0 +1,29 @@
+--- 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) {