firefox: update to 49.0.2

9 files changed, 85 insertions, 74 deletions

diff --git a/package/firefox/Makefile b/package/firefox/Makefile
index 429534a68..947e35f15 100644
--- a/package/firefox/Makefile
+++ b/package/firefox/Makefile
@@ -4,26 +4,28 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		firefox
-PKG_VERSION:=		45.0
+PKG_VERSION:=		49.0.2
 PKG_RELEASE:=		1
-PKG_HASH:=		36ab0f09b1b1df071a8aafa673c6286d99c18dc06cecbb70d1bb2021fbf379f1
+PKG_HASH:=		67abe9202958c36bf60454c91065953aa8f6ede83ea1c0e9cdb870c3fc3d56d0
 PKG_DESCR:=		graphical webbrowser
 PKG_SECTION:=		x11/apps
-PKG_DEPENDS:=		alsa-lib glib libgtk2 libpng libtiff libxcursor libffi
+PKG_DEPENDS:=		alsa-lib glib libgtk2 libgtk3 libpng libtiff libxcursor libffi
 PKG_DEPENDS+=		nspr nss libjpeg-turbo libatk pango cairo libxt libx11 hicolor-icon-theme
-PKG_DEPENDS+=		libxdamage libxfixes libidl libsqlite libxcomposite gdk-pixbuf
-PKG_DEPENDS+=		harfbuzz mesa libvpx libbz2 ca-certificates libevent
-PKG_BUILDDEP:=		alsa-lib glib libgtk2 libIDL libX11 mesa libtiff gdk-pixbuf
+PKG_DEPENDS+=		libxdamage libxfixes libidl libsqlite libxcomposite gdk-pixbuf libdbus
+PKG_DEPENDS+=		harfbuzz mesa libvpx libbz2 ca-certificates libevent at-spi2-atk at-spi2-core
+PKG_BUILDDEP:=		alsa-lib glib libgtk2 libgtk3 libIDL libX11 mesa libtiff gdk-pixbuf
 PKG_BUILDDEP+=		nspr nss libjpeg-turbo libXt fontconfig sqlite atk libpng hicolor-icon-theme
 PKG_BUILDDEP+=		libvpx pango gettext-tiny bzip2 libevent bzip2-host python2-host yasm-host
-PKG_BUILDDEP+=		zip-host
+PKG_BUILDDEP+=		zip-host autoconf-old-host
 PKG_NEEDS:=		threads c++
 PKG_URL:=		http://www.mozilla.org/
 PKG_SITES:=		http://releases.mozilla.org/pub/mozilla.org/firefox/releases/$(PKG_VERSION)/source/
-PKG_NOPARALLEL:=	1
+
+PKG_CFLINE_FIREFOX:=	select ADK_PACKAGE_CAIRO_WITH_TEE@
+PKG_CFLINE_FIREFOX+=	select ADK_PACKAGE_CAIRO_WITH_XRENDER
 
 PKG_ARCH_DEPENDS:=	arm mips mips64 x86 x86_64
-PKG_SYSTEM_DEPENDS:=	solidrun-imx6 ibm-x40 lemote-yeelong qemu-i686 qemu-x86_64 raspberry-pi raspberry-pi2
+PKG_SYSTEM_DEPENDS:=	solidrun-imx6 ibm-x40 lemote-yeelong qemu-i686 qemu-x86_64 raspberry-pi raspberry-pi2 raspberry-pi3
 
 DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).source.tar.xz
 WRKBUILD=		$(WRKDIR)/$(PKG_NAME)-obj
@@ -33,13 +35,14 @@ include $(ADK_TOPDIR)/mk/python.mk
 
 $(eval $(call PKG_template,FIREFOX,firefox,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
 
+CONFIG_STYLE:=		minimal
 ifeq ($(ADK_DEBUG),y)
-CONFIGURE_ARGS+=	--enable-debug --enable-logging
+CONFIGURE_ARGS+=	--enable-debug
 else
-CONFIGURE_ARGS+=	--disable-debug --disable-logging
+CONFIGURE_ARGS+=	--disable-debug
 endif
 
-CONFIGURE_ENV+=		CROSS_COMPILE=1 \
+CONFIGURE_ENV+=		CROSS_COMPILE=1 OS_ARCH=Linux OS_TARGET=Linux OS_TEST=$(ADK_TARGET_ARCH) \
 			PYTHON="$(PYTHON)" \
 			HOST_CC="$(HOST_CC)" \
 			HOST_CPPFLAGS="$(HOST_CPPFLAGS)" \
@@ -49,15 +52,15 @@ CONFIGURE_ENV+=		CROSS_COMPILE=1 \
 			HOST_CXXFLAGS="$(HOST_CXXFLAGS)" \
 			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 \
 			ac_cv_sqlite_enable_fts3=yes \
 			ac_cv_sqlite_enable_unlock_notify=yes \
 			ac_cv_sqlite_dbstat_vtab=yes
-CONFIGURE_ARGS+=	--enable-application=browser \
+CONFIGURE_ARGS+=	--prefix=/usr \
+			--target=$(GNU_TARGET_NAME) \
+			--enable-application=browser \
 			--enable-official-branding \
-			--with-system-icu \
 			--with-system-zlib \
 			--with-system-bz2 \
 			--with-system-png \
@@ -66,49 +69,36 @@ CONFIGURE_ARGS+=	--enable-application=browser \
 			--with-system-jpeg \
 			--with-system-nss \
 			--with-system-nspr \
-			--with-system-pango \
 			--with-system-libvpx \
 			--with-system-libevent=$(STAGING_TARGET_DIR)/usr \
+			--disable-tree-freetype \
 			--enable-system-ffi \
 			--enable-system-sqlite \
 			--enable-webrtc \
-			--disable-libnotify \
-			--with-libIDL-prefix=$(STAGING_TARGET_DIR)/usr \
-			--with-glib-prefix=$(STAGING_TARGET_DIR)/usr \
 			--enable-chrome-format=jar \
 			--enable-necko-protocols=all \
-			--enable-libxul \
 			--enable-alsa \
 			--disable-profiling \
 			--disable-jprof \
-			--disable-shark \
 			--disable-systrace \
 			--disable-pulseaudio \
 			--disable-gio \
 			--disable-gold \
 			--disable-gconf \
 			--disable-accessibility \
-			--disable-smil \
 			--disable-dbus \
 			--disable-gamepad \
-			--disable-gstreamer \
 			--disable-strip \
 			--disable-install-strip \
 			--disable-tests \
-			--disable-libconic \
-			--disable-static \
 			--disable-gnomeui \
-			--disable-gnomevfs \
 			--disable-optimize \
 			--disable-necko-wifi \
-			--disable-svg \
-			--disable-mathml \
 			--disable-jemalloc \
 			--disable-crashreporter \
-			--enable-printing \
+			--disable-printing \
 			--disable-pie \
 			--disable-updater \
-			--disable-xpcom-fastload \
 			--disable-url-classifier \
 			--disable-safe-browsing \
 			--disable-elf-hack 
@@ -117,12 +107,20 @@ ifeq ($(ADK_TARGET_SYSTEM_LEMOTE_YEELONG),y)
 TARGET_CFLAGS:=		$(subst Os,g3,$(TARGET_CFLAGS))
 endif
 
-XAKE_FLAGS+=		OS_RELEASE="2.6" HOST_CC=$(HOST_CC) HOST_LDFLAGS=$(HOST_LDFLAGS)
+XAKE_FLAGS+=		CROSS_COMPILE=1 OS_ARCH="Linux" OS_TEST="$(ADK_TARGET_ARCH)" OS_RELEASE="2.6" 
+XAKE_FLAGS+=		HOST_CC=$(HOST_CC) HOST_LDFLAGS=$(HOST_LDFLAGS)
 XAKE_FLAGS+=            ARCHFLAG="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) $(TARGET_LDFLAGS) -lnss3 -lnssutil3 -lsmime3 -lssl3 -fPIC"
 
+post-extract:
+	rm $(WRKSRC)/image/ClippedImage.cpp.rej
+
 pre-configure:
 	$(SED) '/^freetype\/ftcache.h/a freetype\/ftfntfmt.h' $(WRKSRC)/config/system-headers
 
+post-configure:
+	touch $(WRKSRC)/configure
+	touch $(WRKBUILD)/config.status
+
 firefox-install:
 	$(INSTALL_DIR) $(IDIR_FIREFOX)/usr/bin
 	$(INSTALL_DIR) $(IDIR_FIREFOX)/usr/lib
diff --git a/package/firefox/files/firefox b/package/firefox/files/firefox
index cef374fe3..0ef6ebafa 100755
--- a/package/firefox/files/firefox
+++ b/package/firefox/files/firefox
@@ -1,2 +1,2 @@
 #!/bin/sh
-env LD_LIBRARY_PATH=/usr/lib/firefox-45.0 /usr/lib/firefox-45.0/firefox
+env LD_LIBRARY_PATH=/usr/lib/firefox-49.0.2 /usr/lib/firefox-49.0.2/firefox
diff --git a/package/firefox/files/mozconfig b/package/firefox/files/mozconfig
new file mode 100644
index 000000000..0b9caf6ca
--- /dev/null
+++ b/package/firefox/files/mozconfig
@@ -0,0 +1,37 @@
+ac_add_options --disable-dbus
+ac_add_options --disable-necko-wifi
+ac_add_options --disable-pulseaudio
+ac_add_options --disable-gconf
+ac_add_options --enable-system-sqlite
+ac_add_options --with-system-libevent
+ac_add_options --with-system-libvpx
+ac_add_options --with-system-nspr
+ac_add_options --with-system-nss
+ac_add_options --with-system-icu
+# Stripping is now enabled by default.
+# Uncomment these lines if you need to run a debugger
+ac_add_options --disable-strip
+ac_add_options --disable-install-strip
+ac_add_options --disable-crashreporter
+ac_add_options --disable-updater
+ac_add_options --disable-tests
+ac_add_options --disable-optimize
+
+ac_add_options --enable-gio
+ac_add_options --enable-official-branding
+ac_add_options --enable-safe-browsing
+ac_add_options --enable-url-classifier
+
+# From firefox-40, using system cairo causes firefox to crash
+# frequently when it is doing background rendering in a tab.
+#ac_add_options --enable-system-cairo
+ac_add_options --enable-system-ffi
+ac_add_options --enable-system-pixman
+
+ac_add_options --with-pthreads
+
+ac_add_options --with-system-bz2
+ac_add_options --with-system-jpeg
+ac_add_options --with-system-png
+ac_add_options --with-system-zlib
+
diff --git a/package/firefox/patches/patch-config_system-headers b/package/firefox/patches/patch-config_system-headers
deleted file mode 100644
index 6b0f69302..000000000
--- a/package/firefox/patches/patch-config_system-headers
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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-gfx_2d_Logging_h b/package/firefox/patches/patch-gfx_2d_Logging_h
deleted file mode 100644
index 78da23499..000000000
--- a/package/firefox/patches/patch-gfx_2d_Logging_h
+++ /dev/null
@@ -1,12 +0,0 @@
---- mozilla-release.orig/gfx/2d/Logging.h	2015-10-14 23:41:53.000000000 +0200
-+++ mozilla-release/gfx/2d/Logging.h	2015-10-22 21:47:47.852599070 +0200
-@@ -11,9 +11,7 @@
- #include <stdio.h>
- #include <vector>
- 
--#ifdef MOZ_LOGGING
- #include "mozilla/Logging.h"
--#endif
- 
- #if defined(MOZ_WIDGET_GONK) || defined(MOZ_WIDGET_ANDROID)
- #include "nsDebug.h"
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 75bcd504e..77b0ac628 100644
--- a/package/firefox/patches/patch-gfx_angle_src_common_angleutils_cpp
+++ b/package/firefox/patches/patch-gfx_angle_src_common_angleutils_cpp
@@ -1,10 +1,10 @@
---- 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 @@
+--- firefox-49.0.1.orig/gfx/angle/src/common/angleutils.cpp	2016-07-25 22:22:05.000000000 +0200
++++ firefox-49.0.1/gfx/angle/src/common/angleutils.cpp	2016-10-01 23:24:47.412037504 +0200
+@@ -11,6 +11,7 @@
  
- #include <stdio.h>
+ #include <limits>
  #include <vector>
 +#include <cstdio>
  
- size_t FormatStringIntoVector(const char *fmt, va_list vararg, std::vector<char>& outBuffer)
+ namespace angle
  {
diff --git a/package/firefox/patches/patch-old-configure_in b/package/firefox/patches/patch-old-configure_in
new file mode 100644
index 000000000..2d4d13b9c
--- /dev/null
+++ b/package/firefox/patches/patch-old-configure_in
@@ -0,0 +1,10 @@
+--- firefox-49.0.1.orig/old-configure.in	2016-09-05 22:12:50.000000000 +0200
++++ firefox-49.0.1/old-configure.in	2016-10-01 23:25:33.657828298 +0200
+@@ -6,7 +6,6 @@ dnl file, You can obtain one at http://m
+ 
+ dnl Process this file with autoconf to produce a configure script.
+ dnl ========================================================
+-AC_PREREQ(2.13)
+ AC_INIT(config/config.mk)
+ AC_CONFIG_AUX_DIR(${srcdir}/build/autoconf)
+ AC_CANONICAL_SYSTEM
diff --git a/package/firefox/patches/patch-toolkit_crashreporter_google-breakpad_src_common_stabs_reader_h b/package/firefox/patches/patch-toolkit_crashreporter_google-breakpad_src_common_stabs_reader_h
deleted file mode 100644
index 5130adea9..000000000
--- a/package/firefox/patches/patch-toolkit_crashreporter_google-breakpad_src_common_stabs_reader_h
+++ /dev/null
@@ -1,11 +0,0 @@
---- mozilla-release.orig/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.h	2013-09-11 01:15:25.000000000 +0200
-+++ mozilla-release/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.h	2013-10-24 11:58:13.000000000 +0200
-@@ -53,7 +53,7 @@
- #include <config.h>
- #endif
- 
--#ifdef HAVE_A_OUT_H
-+#if 0
- #include <a.out.h>
- #endif
- #ifdef HAVE_MACH_O_NLIST_H
diff --git a/package/firefox/patches/patch-xpcom_base_nsMemoryReporterManager_cpp b/package/firefox/patches/patch-xpcom_base_nsMemoryReporterManager_cpp
index e13b23274..44c7c5f54 100644
--- a/package/firefox/patches/patch-xpcom_base_nsMemoryReporterManager_cpp
+++ b/package/firefox/patches/patch-xpcom_base_nsMemoryReporterManager_cpp
@@ -1,5 +1,5 @@
---- 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
+--- firefox-49.0.1.orig/xpcom/base/nsMemoryReporterManager.cpp	2016-09-05 22:12:57.000000000 +0200
++++ firefox-49.0.1/xpcom/base/nsMemoryReporterManager.cpp	2016-10-01 23:24:47.432038288 +0200
 @@ -157,6 +157,7 @@ ResidentUniqueDistinguishedAmount(int64_
  nsresult
  SystemHeapSize(int64_t* aSizeOut)
@@ -15,4 +15,4 @@
 +#endif
      return NS_OK;
  }
- 
+ #endif