25269934 Upgrade Firefox to version 45.6.0 ESR s11u3-sru
authorPetr Sumbera <petr.sumbera@oracle.com>
Fri, 16 Dec 2016 05:51:33 -0800
branchs11u3-sru
changeset 7512 97c9ea61c209
parent 7510 9eeac2fae18e
child 7514 117bfb4fd803
25269934 Upgrade Firefox to version 45.6.0 ESR 25269954 problem in FIREFOX/BROWSER
components/desktop/firefox/Makefile
components/desktop/firefox/depend.mk
--- a/components/desktop/firefox/Makefile	Mon Dec 19 15:44:03 2016 -0800
+++ b/components/desktop/firefox/Makefile	Fri Dec 16 05:51:33 2016 -0800
@@ -32,20 +32,20 @@
 GCC_ROOT = /usr/gcc/4.8
 
 COMPONENT_NAME =		firefox
-COMPONENT_VERSION =		45.5.1esr
+COMPONENT_VERSION =		45.6.0esr
 COMPONENT_PROJECT_URL =		http://www.mozilla.com/firefox
 COMPONENT_SRC_NAME =		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_SRC = 		$(COMPONENT_SRC_NAME)
 COMPONENT_ARCHIVE =		$(COMPONENT_SRC_NAME).source.tar.xz
 COMPONENT_ARCHIVE_HASH = \
-    sha256:2796c22ab04fdd8529192118ce6cd9dee7ae88de0ed9317b4192da6eefac9db8
+    sha256:c1e7ddf6efb0f54c8071131b6395f4942a422c2ab70f2e9a81b588373d6fbf5b
 MOZILLA_FTP = 		        http://ftp.mozilla.org/pub/mozilla.org/$(COMPONENT_NAME)/releases/$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE_URL =		$(MOZILLA_FTP)/source/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB =		firefox/browser
 
-TPNO=				32893
+TPNO=				33006
 
-IPS_COMPONENT_VERSION =		45.5.1
+IPS_COMPONENT_VERSION =		45.6.0
 
 # There are a set of .xpi files (as given in the LANG_LIST definition below)
 # that we need. These are available under:
@@ -56,7 +56,7 @@
 # collide due to different files with identical .xpi names.
 COMPONENT_ARCHIVE_1 =           $(COMPONENT_SRC_NAME)-xpi.tar.gz
 COMPONENT_ARCHIVE_HASH_1 = \
-	sha256:6031264927ddaeeedd3fcff2137963c17701e9dd70fbf99c42c6a9be4bcea050
+	sha256:77b413a060f20fa9d1b35364d0918c21370ffcf593049b27bbb6533b32816d96
 COMPONENT_ARCHIVE_URL_1 =       $(INTERNAL_ARCHIVE_MIRROR)/$(COMPONENT_ARCHIVE_1)
 
 LANG_LIST = ar be bg ca cs da de el es-AR es-CL es-ES et fi \
@@ -111,7 +111,6 @@
 # Avoids bus error from xpcshell (libxul) as used later in build (S11 only).
 LD_MAP_NOEXDATA.sparc=
 
-CONFIGURE_ENV +=	YASM=$(COMPONENT_DIR)/../../yasm/build/$(MACH32)/yasm
 CONFIGURE_ENV +=	PKG_CONFIG_PATH=$(CONFIGURE_LIBDIR.$(BITS))/pkgconfig
 CONFIGURE_ENV +=	OS_DEFINES="-D__USE_LEGACY_PROTOTYPES__"
 # -L.../dist/lib needs to be set otherwise it will report missing libnss3.so, 
@@ -195,6 +194,9 @@
 REQUIRED_PACKAGES += codec/libogg
 REQUIRED_PACKAGES += codec/libvorbis
 REQUIRED_PACKAGES += codec/ogg-vorbis
+ifneq ($(MACH), sparc)
+REQUIRED_PACKAGES += developer/yasm
+endif
 REQUIRED_PACKAGES += library/desktop/atk
 REQUIRED_PACKAGES += library/desktop/cairo
 REQUIRED_PACKAGES += library/desktop/gdk-pixbuf
--- a/components/desktop/firefox/depend.mk	Mon Dec 19 15:44:03 2016 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-desktop/firefox:		yasm