firefox: update to version 45.0

10 files changed, 41 insertions, 44 deletions

diff --git a/package/firefox/Makefile b/package/firefox/Makefile
index 62dbcabe5..37ef8dbaa 100644
--- a/package/firefox/Makefile
+++ b/package/firefox/Makefile
@@ -4,9 +4,9 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		firefox
-PKG_VERSION:=		42.0
+PKG_VERSION:=		45.0
 PKG_RELEASE:=		1
-PKG_HASH:=		994a346699298277b64ec0cab72660b8d3e5b879a2ac79207576f7e6c33da3ae
+PKG_HASH:=		36ab0f09b1b1df071a8aafa673c6286d99c18dc06cecbb70d1bb2021fbf379f1
 PKG_DESCR:=		graphical webbrowser
 PKG_SECTION:=		x11/apps
 PKG_DEPENDS:=		alsa-lib glib libgtk2 libpng libtiff libxcursor libffi
@@ -104,7 +104,7 @@ CONFIGURE_ARGS+=	--enable-application=browser \
 			--disable-mathml \
 			--disable-jemalloc \
 			--disable-crashreporter \
-			--disable-printing \
+			--enable-printing \
 			--disable-pie \
 			--disable-updater \
 			--disable-xpcom-fastload \
diff --git a/package/firefox/files/firefox b/package/firefox/files/firefox
index 13b08fc85..cef374fe3 100755
--- a/package/firefox/files/firefox
+++ b/package/firefox/files/firefox
@@ -1,2 +1,2 @@
 #!/bin/sh
-env LD_LIBRARY_PATH=/usr/lib/firefox-42.0 /usr/lib/firefox-42.0/firefox
+env LD_LIBRARY_PATH=/usr/lib/firefox-45.0 /usr/lib/firefox-45.0/firefox
diff --git a/package/firefox/patches/patch-config_system-headers b/package/firefox/patches/patch-config_system-headers
new file mode 100644
index 000000000..6b0f69302
--- /dev/null
+++ b/package/firefox/patches/patch-config_system-headers
@@ -0,0 +1,11 @@
+--- firefox-45.0.orig/config/system-headers	2016-03-03 22:47:52.000000000 +0100
++++ firefox-45.0/config/system-headers	2016-03-14 19:05:49.143792141 +0100
+@@ -457,6 +457,8 @@ frame/req.h
+ freetype/freetype.h
+ freetype/ftcache.h
+ freetype/ftfntfmt.h
++freetype/ftfntfmt.h
++freetype/ftfntfmt.h
+ freetype/ftglyph.h
+ freetype/ftsynth.h
+ freetype/ftoutln.h
diff --git a/package/firefox/patches/patch-dom_media_webm_WebMDemuxer_cpp b/package/firefox/patches/patch-dom_media_webm_WebMDemuxer_cpp
deleted file mode 100644
index f8df2eb45..000000000
--- a/package/firefox/patches/patch-dom_media_webm_WebMDemuxer_cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- firefox-42.0.orig/dom/media/webm/WebMDemuxer.cpp	2015-10-29 23:17:57.000000000 +0100
-+++ firefox-42.0/dom/media/webm/WebMDemuxer.cpp	2015-12-08 05:28:13.471186350 +0100
-@@ -17,6 +17,7 @@
- #include "nsAutoRef.h"
- #include "NesteggPacketHolder.h"
- #include "XiphExtradata.h"
-+#include "prprf.h"
- 
- #include <algorithm>
- #include <stdint.h>
diff --git a/package/firefox/patches/patch-extensions_spellcheck_hunspell_src_hunspell_alloc_hooks_h b/package/firefox/patches/patch-extensions_spellcheck_hunspell_src_hunspell_alloc_hooks_h
deleted file mode 100644
index 5b361b846..000000000
--- a/package/firefox/patches/patch-extensions_spellcheck_hunspell_src_hunspell_alloc_hooks_h
+++ /dev/null
@@ -1,11 +0,0 @@
---- mozilla-release.orig/extensions/spellcheck/hunspell/src/hunspell_alloc_hooks.h	2013-09-11 01:15:00.000000000 +0200
-+++ mozilla-release/extensions/spellcheck/hunspell/src/hunspell_alloc_hooks.h	2013-10-24 11:28:30.000000000 +0200
-@@ -33,6 +33,8 @@
- 
- #ifndef alloc_hooks_h__
- #define alloc_hooks_h__
-+/* prevent free/calloc from sched.h to be included */
-+#undef _GNU_SOURCE
- 
- /**
-  * This file is force-included in hunspell code.  Its purpose is to add memory
diff --git a/package/firefox/patches/patch-gfx_angle_src_common_angleutils_cpp b/package/firefox/patches/patch-gfx_angle_src_common_angleutils_cpp
index 3839a6551..75bcd504e 100644
--- a/package/firefox/patches/patch-gfx_angle_src_common_angleutils_cpp
+++ b/package/firefox/patches/patch-gfx_angle_src_common_angleutils_cpp
@@ -1,7 +1,7 @@
---- mozilla-release.orig/gfx/angle/src/common/angleutils.cpp	2015-10-14 23:41:53.000000000 +0200
-+++ mozilla-release/gfx/angle/src/common/angleutils.cpp	2015-10-22 21:35:50.503893962 +0200
-@@ -8,6 +8,7 @@
- #include "debug.h"
+--- firefox-45.0.orig/gfx/angle/src/common/angleutils.cpp	2016-03-03 22:48:06.000000000 +0100
++++ firefox-45.0/gfx/angle/src/common/angleutils.cpp	2016-03-13 21:15:29.523245406 +0100
+@@ -9,6 +9,7 @@
+ 
  #include <stdio.h>
  #include <vector>
 +#include <cstdio>
diff --git a/package/firefox/patches/patch-js_src_Makefile_in b/package/firefox/patches/patch-js_src_Makefile_in
deleted file mode 100644
index b340774ee..000000000
--- a/package/firefox/patches/patch-js_src_Makefile_in
+++ /dev/null
@@ -1,11 +0,0 @@
---- mozilla-release.orig/js/src/Makefile.in	2015-10-14 23:41:38.000000000 +0200
-+++ mozilla-release/js/src/Makefile.in	2015-10-22 21:35:50.515893169 +0200
-@@ -16,7 +16,7 @@ run_for_side_effects := $(shell echo 'MA
- 
- ifdef JS_HAS_CTYPES
- ifdef MOZ_NATIVE_FFI
--LOCAL_INCLUDES = $(MOZ_FFI_CFLAGS)
-+LOCAL_INCLUDES = 
- endif
- 
- # Windows needs this to be linked with a static library.
diff --git a/package/firefox/patches/patch-xpcom_base_nsMemoryReporterManager_cpp b/package/firefox/patches/patch-xpcom_base_nsMemoryReporterManager_cpp
new file mode 100644
index 000000000..e13b23274
--- /dev/null
+++ b/package/firefox/patches/patch-xpcom_base_nsMemoryReporterManager_cpp
@@ -0,0 +1,18 @@
+--- firefox-45.0.orig/xpcom/base/nsMemoryReporterManager.cpp	2016-03-03 22:48:07.000000000 +0100
++++ firefox-45.0/xpcom/base/nsMemoryReporterManager.cpp	2016-03-15 08:42:15.629014068 +0100
+@@ -157,6 +157,7 @@ ResidentUniqueDistinguishedAmount(int64_
+ nsresult
+ SystemHeapSize(int64_t* aSizeOut)
+ {
++#if defined(__GLIBC__) && !defined(__UCLIBC__)
+     struct mallinfo info = mallinfo();
+ 
+     // The documentation in the glibc man page makes it sound like |uordblks|
+@@ -170,6 +171,7 @@ SystemHeapSize(int64_t* aSizeOut)
+     // shouldn't be a problem. Nonetheless, cast the |int|s to |size_t| before
+     // adding them to provide a small amount of extra overflow protection.
+     *aSizeOut = size_t(info.hblkhd) + size_t(info.uordblks);
++#endif
+     return NS_OK;
+ }
+ 
diff --git a/package/firefox/patches/patch-xpcom_ds_nsMathUtils_h b/package/firefox/patches/patch-xpcom_ds_nsMathUtils_h
index a22b709eb..3d4d0546b 100644
--- a/package/firefox/patches/patch-xpcom_ds_nsMathUtils_h
+++ b/package/firefox/patches/patch-xpcom_ds_nsMathUtils_h
@@ -1,6 +1,6 @@
---- mozilla-release.orig/xpcom/ds/nsMathUtils.h	2015-10-14 23:41:52.000000000 +0200
-+++ mozilla-release/xpcom/ds/nsMathUtils.h	2015-10-22 21:35:50.563890005 +0200
-@@ -105,12 +105,16 @@ NS_finite(double aNum)
+--- firefox-45.0.orig/xpcom/ds/nsMathUtils.h	2016-03-03 22:48:07.000000000 +0100
++++ firefox-45.0/xpcom/ds/nsMathUtils.h	2016-03-13 21:15:29.543246177 +0100
+@@ -103,12 +103,16 @@ NS_finite(double aNum)
  #ifdef WIN32
    // NOTE: '!!' casts an int to bool without spamming MSVC warning C4800.
    return !!_finite(aNum);
diff --git a/target/x86/uclibc-ng.config b/target/x86/uclibc-ng.config
index 03eeab7bc..ef24c8159 100644
--- a/target/x86/uclibc-ng.config
+++ b/target/x86/uclibc-ng.config
@@ -50,7 +50,7 @@ ARCH_USE_MMU=y
 UCLIBC_HAS_FLOATS=y
 UCLIBC_HAS_FPU=y
 DO_C99_MATH=y
-# DO_XSI_MATH is not set
+DO_XSI_MATH=y
 # UCLIBC_HAS_FENV is not set
 # UCLIBC_HAS_LONG_DOUBLE_MATH is not set
 KERNEL_HEADERS=""