firefox: update to latest stable version, runtime tested on IBM X40

7 files changed, 62 insertions, 20 deletions

diff --git a/package/firefox/Makefile b/package/firefox/Makefile
index d31deba4a..27540b63a 100644
--- a/package/firefox/Makefile
+++ b/package/firefox/Makefile
@@ -4,9 +4,9 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		firefox
-PKG_VERSION:=		41.0.2
+PKG_VERSION:=		42.0
 PKG_RELEASE:=		1
-PKG_HASH:=		ff00689f4d2ff54c5eb7b3aa367560a3645800eb0c96e73a795e461461b1970e
+PKG_HASH:=		994a346699298277b64ec0cab72660b8d3e5b879a2ac79207576f7e6c33da3ae
 PKG_DESCR:=		graphical webbrowser
 PKG_SECTION:=		x11/apps
 PKG_DEPENDS:=		alsa-lib glib libgtk2 libpng libtiff libxcursor libffi
@@ -23,11 +23,9 @@ PKG_SITES:=		http://releases.mozilla.org/pub/mozilla.org/firefox/releases/$(PKG_
 PKG_NOPARALLEL:=	1
 
 PKG_ARCH_DEPENDS:=	arm mips mips64 x86 x86_64
-PKG_HOST_DEPENDS:=	!netbsd !freebsd !openbsd !cygwin
 PKG_SYSTEM_DEPENDS:=	solidrun-imx6 ibm-x40 lemote-yeelong qemu-i686 qemu-x86_64 raspberry-pi raspberry-pi2
 
 DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).source.tar.xz
-WRKDIST=		$(WRKDIR)/mozilla-release
 WRKBUILD=		$(WRKDIR)/$(PKG_NAME)-obj
 
 include $(ADK_TOPDIR)/mk/package.mk
@@ -41,7 +39,6 @@ else
 CONFIGURE_ARGS+=	--disable-debug --disable-logging
 endif
 
-
 CONFIGURE_ENV+=		CROSS_COMPILE=1 \
 			PYTHON="$(PYTHON)" \
 			HOST_CC="$(HOST_CC)" \
@@ -50,7 +47,8 @@ CONFIGURE_ENV+=		CROSS_COMPILE=1 \
 			HOST_LDFLAGS="$(HOST_LDLAGS)" \
 			HOST_CXX="$(HOST_CXX)" \
 			HOST_CXXFLAGS="$(HOST_CXXFLAGS)" \
-			HOST_RANLIB="ranlib" HOST_AR="ar" \
+			HOST_RANLIB="ranlib" \
+			HOST_AR="ar" \
 			CPPFLAGS="-I$(STAGING_TARGET_DIR)/usr/include/freetype2" \
 			ac_cv_sqlite_secure_delete=yes \
 			ac_cv_sqlite_threadsafe=yes \
@@ -122,15 +120,20 @@ endif
 XAKE_FLAGS+=		OS_RELEASE="2.6" HOST_CC=$(HOST_CC) HOST_LDFLAGS=$(HOST_LDFLAGS)
 XAKE_FLAGS+=            ARCHFLAG="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) $(TARGET_LDFLAGS) -lnss3 -lnssutil3 -lsmime3 -lssl3 -fPIC"
 
+pre-configure:
+	$(SED) '/^freetype\/ftcache.h/a freetype\/ftfntfmt.h' $(WRKSRC)/config/system-headers
+
 firefox-install:
-	$(INSTALL_DIR) $(IDIR_FIREFOX)/etc
 	$(INSTALL_DIR) $(IDIR_FIREFOX)/usr/bin
 	$(INSTALL_DIR) $(IDIR_FIREFOX)/usr/lib
 	$(CP) $(WRKINST)/usr/lib/firefox-$(PKG_VERSION) \
 		$(IDIR_FIREFOX)/usr/lib
-	$(CP) ./files/xinitrc \
-		$(IDIR_FIREFOX)/etc
 	$(INSTALL_BIN) ./files/firefox \
 		$(IDIR_FIREFOX)/usr/bin
+ifeq ($(ADK_APPLIANCE_FIREFOX),y)
+	$(INSTALL_DIR) $(IDIR_FIREFOX)/etc
+	$(CP) ./files/xinitrc \
+		$(IDIR_FIREFOX)/etc
+endif
 
 include $(ADK_TOPDIR)/mk/pkg-bottom.mk
diff --git a/package/firefox/files/firefox b/package/firefox/files/firefox
index 30470334a..13b08fc85 100755
--- a/package/firefox/files/firefox
+++ b/package/firefox/files/firefox
@@ -1,2 +1,2 @@
 #!/bin/sh
-env LD_LIBRARY_PATH=/usr/lib/firefox-35.0 /usr/lib/firefox-35.0/firefox
+env LD_LIBRARY_PATH=/usr/lib/firefox-42.0 /usr/lib/firefox-42.0/firefox
diff --git a/package/firefox/patches/patch-dom_media_webm_WebMDemuxer_cpp b/package/firefox/patches/patch-dom_media_webm_WebMDemuxer_cpp
new file mode 100644
index 000000000..f8df2eb45
--- /dev/null
+++ b/package/firefox/patches/patch-dom_media_webm_WebMDemuxer_cpp
@@ -0,0 +1,10 @@
+--- 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-tools_profiler_core_platform-linux_cc b/package/firefox/patches/patch-tools_profiler_core_platform-linux_cc
new file mode 100644
index 000000000..da8f08abf
--- /dev/null
+++ b/package/firefox/patches/patch-tools_profiler_core_platform-linux_cc
@@ -0,0 +1,11 @@
+--- firefox-42.0.orig/tools/profiler/core/platform-linux.cc	2015-10-29 23:18:01.000000000 +0100
++++ firefox-42.0/tools/profiler/core/platform-linux.cc	2015-12-17 05:41:35.091485672 +0100
+@@ -57,7 +57,7 @@
+ #include <fcntl.h>      // open
+ #include <unistd.h>     // sysconf
+ #include <semaphore.h>
+-#ifdef __GLIBC__
++#if defined(__GLIBC__) && !defined(__UCLIBC__)
+ #include <execinfo.h>   // backtrace, backtrace_symbols
+ #endif  // def __GLIBC__
+ #include <strings.h>    // index
diff --git a/package/firefox/patches/patch-tools_profiler_local_debug_info_symbolizer_cc b/package/firefox/patches/patch-tools_profiler_local_debug_info_symbolizer_cc
deleted file mode 100644
index 12d413718..000000000
--- a/package/firefox/patches/patch-tools_profiler_local_debug_info_symbolizer_cc
+++ /dev/null
@@ -1,10 +0,0 @@
---- mozilla-release.orig/tools/profiler/local_debug_info_symbolizer.cc	2013-09-11 01:15:26.000000000 +0200
-+++ mozilla-release/tools/profiler/local_debug_info_symbolizer.cc	2013-10-23 16:28:38.000000000 +0200
-@@ -3,6 +3,7 @@
-  * License, v. 2.0. If a copy of the MPL was not distributed with this
-  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
- 
-+#include <sys/types.h>
- #include "PlatformMacros.h"
- #include "nsAutoPtr.h"
- 
diff --git a/package/firefox/patches/patch-tools_profiler_lul_LulElf_cpp b/package/firefox/patches/patch-tools_profiler_lul_LulElf_cpp
new file mode 100644
index 000000000..8e50fdbba
--- /dev/null
+++ b/package/firefox/patches/patch-tools_profiler_lul_LulElf_cpp
@@ -0,0 +1,12 @@
+--- firefox-42.0.orig/tools/profiler/lul/LulElf.cpp	2015-10-29 23:18:01.000000000 +0100
++++ firefox-42.0/tools/profiler/lul/LulElf.cpp	2015-12-17 06:09:09.809776525 +0100
+@@ -66,6 +66,9 @@
+ #include "LulElfInt.h"
+ #include "LulMainInt.h"
+ 
++#ifndef NT_GNU_BUILD_ID
++#define NT_GNU_BUILD_ID 3
++#endif
+ 
+ #if defined(LUL_PLAT_arm_android) && !defined(SHT_ARM_EXIDX)
+ // bionic and older glibsc don't define it
diff --git a/package/firefox/patches/patch-xpcom_io_nsLocalFileUnix_cpp b/package/firefox/patches/patch-xpcom_io_nsLocalFileUnix_cpp
new file mode 100644
index 000000000..32345a436
--- /dev/null
+++ b/package/firefox/patches/patch-xpcom_io_nsLocalFileUnix_cpp
@@ -0,0 +1,16 @@
+--- firefox-42.0.orig/xpcom/io/nsLocalFileUnix.cpp	2015-10-29 23:18:01.000000000 +0100
++++ firefox-42.0/xpcom/io/nsLocalFileUnix.cpp	2015-12-17 18:31:49.639751737 +0100
+@@ -1407,8 +1407,13 @@ nsLocalFile::GetDiskSpaceAvailable(int64
+       && dq.dqb_bhardlimit) {
+     int64_t QuotaSpaceAvailable = 0;
+     // dqb_bhardlimit is count of BLOCK_SIZE blocks, dqb_curspace is bytes
++#if defined(__UCLIBC__)
++    if ((BLOCK_SIZE * dq.dqb_bhardlimit) > dq.dqb_curblocks)
++      QuotaSpaceAvailable = int64_t(fs_buf.F_BSIZE * (dq.dqb_bhardlimit - dq.dqb_curblocks));
++#else
+     if ((BLOCK_SIZE * dq.dqb_bhardlimit) > dq.dqb_curspace)
+       QuotaSpaceAvailable = int64_t(BLOCK_SIZE * dq.dqb_bhardlimit - dq.dqb_curspace);
++#endif
+     if (QuotaSpaceAvailable < *aDiskSpaceAvailable) {
+       *aDiskSpaceAvailable = QuotaSpaceAvailable;
+     }