firefox: update to 49.0.2

1 files changed, 29 insertions, 31 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