summaryrefslogtreecommitdiff
path: root/package/firefox
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2010-11-13 00:31:52 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2010-11-13 00:31:52 +0100
commit3e9ec766c9b289becc53fba5fc57eb20723eeab7 (patch)
tree265634e99e345211208f28c6a996b22ccfedff4b /package/firefox
parentb6a5c9e0b1ed79e56e7dc8b3a0b2a61856fda576 (diff)
parentd29b7059e0e3dacc3e051c310eabaecabe19a8d2 (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/firefox')
-rw-r--r--package/firefox/Makefile11
-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
4 files changed, 49 insertions, 7 deletions
diff --git a/package/firefox/Makefile b/package/firefox/Makefile
index 2126892dd..163d740f6 100644
--- a/package/firefox/Makefile
+++ b/package/firefox/Makefile
@@ -4,16 +4,16 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= firefox
-PKG_VERSION:= 3.6.10
+PKG_VERSION:= 3.6.12
PKG_RELEASE:= 1
-PKG_MD5SUM:= 0ee5f14fd8be07513d16131027ebcb61
+PKG_MD5SUM:= 80f4d83f23a7c45fc3f1904964ea2a5a
PKG_DESCR:= graphical webbrowser
PKG_SECTION:= x11/apps
PKG_DEPENDS:= libpthread alsa-lib dbus-glib glib libgtk+ libnotify
PKG_DEPENDS+= nspr nss libjpeg atk pango cairo libxt libx11 libstdcxx
PKG_DEPENDS+= libxdamage libxfixes libidl
PKG_BUILDDEP:= alsa-lib dbus-glib glib gtk+ libnotify libIDL libX11
-PKG_BUILDDEP+= nspr nss jpeg libXt
+PKG_BUILDDEP+= nspr nss jpeg libXt fontconfig
PKG_URL:= http://www.mozilla.org/
PKG_SITES:= http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${PKG_VERSION}/source/
@@ -38,7 +38,9 @@ endif
CONFIGURE_ENV+= CROSS_COMPILE=1 HOST_CC="${HOSTCC}" HOST_CFLAGS="${HOSTCFLAGS}" \
HOST_CXX="${HOSTCXX}" HOST_CXXFLAGS="${HOSTCXXFLAGS}" \
HOST_LIBIDL_CONFIG="/usr/bin/libIDL-config-2" \
- ac_cv_thread_keyword=no
+ CPPFLAGS="-I${STAGING_DIR}/usr/include/freetype2" \
+ ac_cv_thread_keyword=no \
+ ac_cv_sizeof_int_p=4
CONFIGURE_ARGS+= --enable-application=browser \
--with-system-zlib \
--with-system-jpeg \
@@ -49,6 +51,7 @@ CONFIGURE_ARGS+= --enable-application=browser \
--with-glib-prefix=${STAGING_DIR}/usr \
--enable-libxul \
--disable-tests \
+ --disable-libconic \
--disable-static \
--disable-gnomeui \
--disable-gnomevfs \
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) {