Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 16 Jul 2015 06:06:00 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r392273 - in head: Mk Mk/Uses multimedia/gmp-api multimedia/openh264 security/ca_root_nss security/nss www/firefox www/firefox-esr www/firefox-esr-i18n www/firefox-esr/files www/firefox...
Message-ID:  <201507160606.t6G660Ir014993@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Thu Jul 16 06:05:59 2015
New Revision: 392273
URL: https://svnweb.freebsd.org/changeset/ports/392273

Log:
  - Update NSS and ca_root_nss to 3.19.2
  - Update Firefox and gmp-api to 39.0
  - Update Firefox ESR and libxul to 38.1.0
  
  Changes:	https://developer.mozilla.org/docs/Mozilla/Projects/NSS/NSS_3.19.2_release_notes
  Changes:	https://www.mozilla.org/firefox/39.0/releasenotes/
  Changes:	https://www.mozilla.org/firefox/38.1.0/releasenotes/
  MFH:		2015Q3
  Security:	https://vuxml.freebsd.org/freebsd/44d9daee-940c-4179-86bb-6e3ffd617869.html

Added:
  head/www/firefox-esr/files/patch-bug1041268   (contents, props changed)
  head/www/firefox-esr/files/patch-bug1073117   (contents, props changed)
  head/www/firefox-esr/files/patch-bug1138845   (contents, props changed)
  head/www/firefox-esr/files/patch-bug1143686   (contents, props changed)
  head/www/firefox-esr/files/patch-bug1144643   (contents, props changed)
  head/www/firefox-esr/files/patch-media-libstagefright-foundation-AString.cpp   (contents, props changed)
  head/www/firefox-esr/files/patch-system-openh264   (contents, props changed)
  head/www/libxul/files/patch-bug1041268   (contents, props changed)
  head/www/libxul/files/patch-bug1073117   (contents, props changed)
  head/www/libxul/files/patch-bug1138845   (contents, props changed)
  head/www/libxul/files/patch-bug1143686   (contents, props changed)
  head/www/libxul/files/patch-bug1144643   (contents, props changed)
  head/www/libxul/files/patch-media-libstagefright-foundation-AString.cpp   (contents, props changed)
  head/www/libxul/files/patch-system-openh264   (contents, props changed)
Deleted:
  head/www/firefox-esr/files/patch-bug1013675
  head/www/firefox-esr/files/patch-bug1015547
  head/www/firefox-esr/files/patch-bug1021171
  head/www/firefox-esr/files/patch-bug1026828
  head/www/firefox-esr/files/patch-bug1041381
  head/www/firefox-esr/files/patch-bug1041795
  head/www/firefox-esr/files/patch-bug1046224
  head/www/firefox-esr/files/patch-bug1061736
  head/www/firefox-esr/files/patch-bug1067377
  head/www/firefox-esr/files/patch-bug1073709
  head/www/firefox-esr/files/patch-bug1082199
  head/www/firefox-esr/files/patch-bug1103858
  head/www/firefox-esr/files/patch-bug1125579
  head/www/firefox-esr/files/patch-bug1125580
  head/www/firefox-esr/files/patch-bug858919
  head/www/firefox-esr/files/patch-bug961264
  head/www/firefox/files/patch-bug1138845
  head/www/firefox/files/patch-bug1143411
  head/www/firefox/files/patch-bug1143686
  head/www/firefox/files/patch-bug1144643
  head/www/libxul/files/patch-bug1013675
  head/www/libxul/files/patch-bug1015547
  head/www/libxul/files/patch-bug1021171
  head/www/libxul/files/patch-bug1026828
  head/www/libxul/files/patch-bug1041381
  head/www/libxul/files/patch-bug1041795
  head/www/libxul/files/patch-bug1046224
  head/www/libxul/files/patch-bug1061736
  head/www/libxul/files/patch-bug1067377
  head/www/libxul/files/patch-bug1073709
  head/www/libxul/files/patch-bug1082199
  head/www/libxul/files/patch-bug1103858
  head/www/libxul/files/patch-bug1125579
  head/www/libxul/files/patch-bug1125580
  head/www/libxul/files/patch-bug858919
  head/www/libxul/files/patch-bug961264
Modified:
  head/Mk/Uses/gecko.mk
  head/Mk/bsd.gecko.mk
  head/multimedia/gmp-api/Makefile
  head/multimedia/gmp-api/distinfo
  head/multimedia/openh264/Makefile
  head/security/ca_root_nss/Makefile
  head/security/ca_root_nss/distinfo
  head/security/nss/Makefile
  head/security/nss/distinfo
  head/www/firefox-esr-i18n/Makefile
  head/www/firefox-esr-i18n/Makefile.lang
  head/www/firefox-esr-i18n/distinfo
  head/www/firefox-esr/Makefile
  head/www/firefox-esr/distinfo
  head/www/firefox-esr/files/patch-bug1013882
  head/www/firefox-esr/files/patch-bug1021761
  head/www/firefox-esr/files/patch-bug1130155
  head/www/firefox-esr/files/patch-bug702179
  head/www/firefox-esr/files/patch-bug779713
  head/www/firefox-esr/files/patch-bug826985
  head/www/firefox-esr/files/patch-bug847568
  head/www/firefox-esr/files/patch-ijg-libjpeg
  head/www/firefox-esr/files/patch-z-bug517422
  head/www/firefox-i18n/Makefile
  head/www/firefox-i18n/distinfo
  head/www/firefox/Makefile
  head/www/firefox/distinfo
  head/www/firefox/files/patch-bug1013882
  head/www/firefox/files/patch-bug1073117
  head/www/firefox/files/patch-bug779713
  head/www/firefox/files/patch-bug826985
  head/www/firefox/files/patch-system-openh264
  head/www/libxul/Makefile
  head/www/libxul/distinfo
  head/www/libxul/files/patch-bug1013882
  head/www/libxul/files/patch-bug1021761
  head/www/libxul/files/patch-bug1130155
  head/www/libxul/files/patch-bug702179
  head/www/libxul/files/patch-bug779713
  head/www/libxul/files/patch-bug826985
  head/www/libxul/files/patch-bug847568
  head/www/libxul/files/patch-ijg-libjpeg
  head/www/libxul/files/patch-z-bug517422
  head/www/linux-firefox/Makefile
  head/www/linux-firefox/distinfo
  head/www/linux-firefox/pkg-plist

Modified: head/Mk/Uses/gecko.mk
==============================================================================
--- head/Mk/Uses/gecko.mk	Thu Jul 16 05:29:22 2015	(r392272)
+++ head/Mk/Uses/gecko.mk	Thu Jul 16 06:05:59 2015	(r392273)
@@ -31,18 +31,18 @@ GECKO_CONFING?=	${LOCALBASE}/bin/${GECKO
 XPIDL?=		${LOCALBASE}/lib/${GECKO}/xpidl
 XPIDL_INCL?=	`${GECKO_CONFIG} --idlflags`
 
-BUILD_DEPENDS+=	libxul>=31:${PORTSDIR}/www/libxul
-RUN_DEPENDS+=	libxul>=31:${PORTSDIR}/www/libxul
+BUILD_DEPENDS+=	libxul>=38:${PORTSDIR}/www/libxul
+RUN_DEPENDS+=	libxul>=38:${PORTSDIR}/www/libxul
 
 .elif ${gecko_ARGS:Mfirefox}
 
-_GECKO_DEFAULT_VERSION=	31
-_GECKO_VERSIONS=		31 38
+_GECKO_DEFAULT_VERSION=	38
+_GECKO_VERSIONS=		38 39
 _GECKO_TYPE=	firefox
 
 # Dependence lines for different Firefox versions
-31_DEPENDS=		${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox-esr
-38_DEPENDS=		${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox
+38_DEPENDS=		${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox-esr
+39_DEPENDS=		${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox
 
 .if exists(${LOCALBASE}/bin/firefox)
 _GECKO_INSTALLED_VER!=	${LOCALBASE}/bin/firefox --version 2>/dev/null

Modified: head/Mk/bsd.gecko.mk
==============================================================================
--- head/Mk/bsd.gecko.mk	Thu Jul 16 05:29:22 2015	(r392272)
+++ head/Mk/bsd.gecko.mk	Thu Jul 16 06:05:59 2015	(r392273)
@@ -161,8 +161,8 @@ icu_LIB_DEPENDS=		libicui18n.so:${PORTSD
 icu_MOZ_OPTIONS=		--with-system-icu --with-intl-api
 
 -jpeg_BUILD_DEPENDS=yasm:${PORTSDIR}/devel/yasm
-# XXX depends on ports/180159 or package flavor support
-#jpeg_LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/libjpeg-turbo
+# XXX JCS_EXTENSIONS API is currently disabled by r371283
+# XXX Remove files/patch-ijg-libjpeg once -turbo is default
 jpeg_USES=		jpeg
 jpeg_MOZ_OPTIONS=	--with-system-jpeg=${LOCALBASE}
 

Modified: head/multimedia/gmp-api/Makefile
==============================================================================
--- head/multimedia/gmp-api/Makefile	Thu Jul 16 05:29:22 2015	(r392272)
+++ head/multimedia/gmp-api/Makefile	Thu Jul 16 06:05:59 2015	(r392273)
@@ -2,8 +2,7 @@
 
 PORTNAME=	gmp-api
 DISTVERSIONPREFIX=	Firefox
-DISTVERSION=	38 # tracking www/firefox
-PORTREVISION=	1
+DISTVERSION=	39 # tracking www/firefox
 CATEGORIES=	multimedia
 
 MAINTAINER=	gecko@FreeBSD.org

Modified: head/multimedia/gmp-api/distinfo
==============================================================================
--- head/multimedia/gmp-api/distinfo	Thu Jul 16 05:29:22 2015	(r392272)
+++ head/multimedia/gmp-api/distinfo	Thu Jul 16 06:05:59 2015	(r392273)
@@ -1,2 +1,2 @@
-SHA256 (mozilla-gmp-api-Firefox38_GH0.tar.gz) = 6b156afe850c0d6faf0492ca5feeff4358e50ddc5ce3022ddcc6905a5bd21c80
-SIZE (mozilla-gmp-api-Firefox38_GH0.tar.gz) = 16209
+SHA256 (mozilla-gmp-api-Firefox39_GH0.tar.gz) = ecb461af06f4d8f1c16330e78e73775f5656767ced77ac2b5e4bb9413ca86ec4
+SIZE (mozilla-gmp-api-Firefox39_GH0.tar.gz) = 16363

Modified: head/multimedia/openh264/Makefile
==============================================================================
--- head/multimedia/openh264/Makefile	Thu Jul 16 05:29:22 2015	(r392272)
+++ head/multimedia/openh264/Makefile	Thu Jul 16 06:05:59 2015	(r392273)
@@ -3,7 +3,7 @@
 PORTNAME=	openh264
 PORTVERSION=	1.4.0
 DISTVERSIONPREFIX=v
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia
 
 MAINTAINER=	gecko@FreeBSD.org

Modified: head/security/ca_root_nss/Makefile
==============================================================================
--- head/security/ca_root_nss/Makefile	Thu Jul 16 05:29:22 2015	(r392272)
+++ head/security/ca_root_nss/Makefile	Thu Jul 16 06:05:59 2015	(r392273)
@@ -2,7 +2,6 @@
 
 PORTNAME=	ca_root_nss
 PORTVERSION=	${VERSION_NSS}
-PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	MOZILLA/security/nss/releases/${DISTNAME:tu:C/[-.]/_/g}_RTM/src
 DISTNAME=	nss-${VERSION_NSS}${NSS_SUFFIX}
@@ -18,7 +17,7 @@ OPTIONS_DEFAULT=	ETCSYMLINK
 OPTIONS_SUB=		yes
 
 ETCSYMLINK_DESC=	Add symlink to /etc/ssl/cert.pem
-ETCSYMLINK_CONFLICTS=	ca-roots-[0-9]*
+ETCSYMLINK_CONFLICTS_INSTALL=	ca-roots-[0-9]*
 
 USES=		perl5
 USE_PERL5=	build
@@ -33,7 +32,7 @@ PLIST_SUB+=	CERTDIR=${CERTDIR}
 # !!!  Please DO NOT submit patches for new version until it has !!!
 # !!!  been committed there first.                               !!!
 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-VERSION_NSS=	3.19.1
+VERSION_NSS=	3.19.2
 #NSS_SUFFIX=	.with.ckbi.1.98
 CERTDATA_TXT_PATH=	nss-${VERSION_NSS}/nss/lib/ckfw/builtins/certdata.txt
 BUNDLE_PROCESSOR=	MAca-bundle.pl

Modified: head/security/ca_root_nss/distinfo
==============================================================================
--- head/security/ca_root_nss/distinfo	Thu Jul 16 05:29:22 2015	(r392272)
+++ head/security/ca_root_nss/distinfo	Thu Jul 16 06:05:59 2015	(r392273)
@@ -1,2 +1,2 @@
-SHA256 (nss-3.19.1.tar.gz) = b7be709551ec13206d8e3e8c065b894fa981c11573115e9478fa051029c52fff
-SIZE (nss-3.19.1.tar.gz) = 6953537
+SHA256 (nss-3.19.2.tar.gz) = 1306663e8f61d8449ad8cbcffab743a604dcd9f6f34232c210847c51dce2c9ae
+SIZE (nss-3.19.2.tar.gz) = 6953657

Modified: head/security/nss/Makefile
==============================================================================
--- head/security/nss/Makefile	Thu Jul 16 05:29:22 2015	(r392272)
+++ head/security/nss/Makefile	Thu Jul 16 06:05:59 2015	(r392273)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	nss
-PORTVERSION=	3.19.1
+PORTVERSION=	3.19.2
 #DISTVERSIONSUFFIX=	.with.ckbi.1.93
 CATEGORIES=	security
 MASTER_SITES=	MOZILLA/security/${PORTNAME}/releases/${DISTNAME:tu:C/[-.]/_/g}_RTM/src

Modified: head/security/nss/distinfo
==============================================================================
--- head/security/nss/distinfo	Thu Jul 16 05:29:22 2015	(r392272)
+++ head/security/nss/distinfo	Thu Jul 16 06:05:59 2015	(r392273)
@@ -1,2 +1,2 @@
-SHA256 (nss-3.19.1.tar.gz) = b7be709551ec13206d8e3e8c065b894fa981c11573115e9478fa051029c52fff
-SIZE (nss-3.19.1.tar.gz) = 6953537
+SHA256 (nss-3.19.2.tar.gz) = 1306663e8f61d8449ad8cbcffab743a604dcd9f6f34232c210847c51dce2c9ae
+SIZE (nss-3.19.2.tar.gz) = 6953657

Modified: head/www/firefox-esr-i18n/Makefile
==============================================================================
--- head/www/firefox-esr-i18n/Makefile	Thu Jul 16 05:29:22 2015	(r392272)
+++ head/www/firefox-esr-i18n/Makefile	Thu Jul 16 06:05:59 2015	(r392273)
@@ -2,10 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	firefox
-PORTVERSION=	31.7.0
+PORTVERSION=	38.1.0
 CATEGORIES=	www
 MASTER_SITES=	MOZILLA/${PORTNAME:S|-i18n||}/releases/${DISTVERSION}esr/linux-i686/xpi \
-		MOZILLA/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}esr-candidates/build2/linux-i686/xpi
+		MOZILLA/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}esr-candidates/build1/linux-i686/xpi
 PKGNAMEPREFIX=
 PKGNAMESUFFIX=	-esr-i18n
 DISTFILES=	${FIREFOX_I18N_:S/$/.xpi/}

Modified: head/www/firefox-esr-i18n/Makefile.lang
==============================================================================
--- head/www/firefox-esr-i18n/Makefile.lang	Thu Jul 16 05:29:22 2015	(r392272)
+++ head/www/firefox-esr-i18n/Makefile.lang	Thu Jul 16 06:05:59 2015	(r392273)
@@ -1,13 +1,13 @@
 # Created by: Koji Yokota <yokota@res.otaru-uc.ac.jp>
 # $FreeBSD$
 
-FIREFOX_I18N_ALL_=	ach af an ar as ast be bg bn-BD bn-IN br bs ca cs	\
-			csb cy da de el en-GB en-US en-ZA eo es-AR es-CL	\
+FIREFOX_I18N_ALL_=	ach af an ar as ast az be bg bn-BD bn-IN br bs ca cs	\
+			cy da de dsb el en-GB en-US en-ZA eo es-AR es-CL	\
 			es-ES es-MX et eu fa ff fi fr fy-NL ga-IE gd gl		\
 			gu-IN he hi-IN hr hsb hu hy-AM id is it ja kk km	\
-			kn ko ku lij lt lv mai mk ml mr ms nb-NO nl nn-NO	\
+			kn ko lij lt lv mai mk ml mr ms nb-NO nl nn-NO	\
 			or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq	\
-			sr sv-SE ta te th tr uk vi xh zh-CN zh-TW zu
+			sr sv-SE ta te th tr uk vi xh zh-CN zh-TW
 
 .if defined(FIREFOX_I18N_ALL) || defined(PACKAGE_BUILDING) || target(package)
 FIREFOX_I18N=   ${FIREFOX_I18N_ALL_}
@@ -30,6 +30,9 @@ FIREFOX_I18N+=  as
 .if ${PORT_OPTIONS:MLANG_AST}
 FIREFOX_I18N+=  ast
 .endif
+.if ${PORT_OPTIONS:MLANG_AZ}
+FIREFOX_I18N+=  az
+.endif
 .if ${PORT_OPTIONS:MLANG_BE}
 FIREFOX_I18N+=  be
 .endif
@@ -66,6 +69,9 @@ FIREFOX_I18N+=  da
 .if ${PORT_OPTIONS:MLANG_DE}
 FIREFOX_I18N+=  de
 .endif
+.if ${PORT_OPTIONS:MLANG_DSB}
+FIREFOX_I18N+=  dsb
+.endif
 .if ${PORT_OPTIONS:MLANG_EL}
 FIREFOX_I18N+=  el
 .endif

Modified: head/www/firefox-esr-i18n/distinfo
==============================================================================
--- head/www/firefox-esr-i18n/distinfo	Thu Jul 16 05:29:22 2015	(r392272)
+++ head/www/firefox-esr-i18n/distinfo	Thu Jul 16 06:05:59 2015	(r392273)
@@ -1,178 +1,176 @@
-SHA256 (xpi/firefox-31.7.0/ach.xpi) = a46aab04cc4f8e7c310d18f25b281e618e318c3c42c664e0801fc8dfd7d7c448
-SIZE (xpi/firefox-31.7.0/ach.xpi) = 445326
-SHA256 (xpi/firefox-31.7.0/af.xpi) = 9b90171ca31d767403cf874b96895e49ba71114bcef4f0f48125ef8062bf1ad8
-SIZE (xpi/firefox-31.7.0/af.xpi) = 431089
-SHA256 (xpi/firefox-31.7.0/an.xpi) = 4a0ba3d16c1ea336297d19ec810b74427744ff49dd9eed790594e7e2948ff638
-SIZE (xpi/firefox-31.7.0/an.xpi) = 407151
-SHA256 (xpi/firefox-31.7.0/ar.xpi) = a2c08b2724a2582e432bc3442b650a30491efed3b434d790bfd03af66f1182fb
-SIZE (xpi/firefox-31.7.0/ar.xpi) = 459824
-SHA256 (xpi/firefox-31.7.0/as.xpi) = 837e0bbb261f288d765d64a5ba320cebb53d6b85fc64e4a5cb5866cec6d393dc
-SIZE (xpi/firefox-31.7.0/as.xpi) = 448568
-SHA256 (xpi/firefox-31.7.0/ast.xpi) = 53182a51b3b39f14af5742eb23a2d6392c8982e99baf2fd874ff5f592c536c72
-SIZE (xpi/firefox-31.7.0/ast.xpi) = 352340
-SHA256 (xpi/firefox-31.7.0/be.xpi) = a9fbbbe0f55e3a66b23f39a607caa86cc3a2d75618bf421049ce8a0fc989b0f1
-SIZE (xpi/firefox-31.7.0/be.xpi) = 378668
-SHA256 (xpi/firefox-31.7.0/bg.xpi) = a5b3ca6b806c7fd3abc2012a54d7a711dc4b5dc0e74feee7db64d4d12a9f090b
-SIZE (xpi/firefox-31.7.0/bg.xpi) = 438061
-SHA256 (xpi/firefox-31.7.0/bn-BD.xpi) = 35ec629d0252a452689e2081013d47ef472e8d690c6d400489adca943a816028
-SIZE (xpi/firefox-31.7.0/bn-BD.xpi) = 472626
-SHA256 (xpi/firefox-31.7.0/bn-IN.xpi) = 74e81096becea929294b831ca9ae5d27885873ce0c1fc55ac10bd3e7c898c67a
-SIZE (xpi/firefox-31.7.0/bn-IN.xpi) = 462593
-SHA256 (xpi/firefox-31.7.0/br.xpi) = 787d8460434e0404d3b41aec55874433a1b62393ceda146c12ca69e3e08de1e0
-SIZE (xpi/firefox-31.7.0/br.xpi) = 389704
-SHA256 (xpi/firefox-31.7.0/bs.xpi) = 55c147fb777304da501c93c5f9118eecf96a355b112bce2b7d1d481a7246718a
-SIZE (xpi/firefox-31.7.0/bs.xpi) = 429014
-SHA256 (xpi/firefox-31.7.0/ca.xpi) = 98442d2eca73b4e49a2316b1229c245e95d9e44c1548a2dd59967da9a2ca1d12
-SIZE (xpi/firefox-31.7.0/ca.xpi) = 403575
-SHA256 (xpi/firefox-31.7.0/cs.xpi) = d5a667efd1b3ae7f7f019c60d9783c2df7ccc31b26d192a0dd6135f1ddd53002
-SIZE (xpi/firefox-31.7.0/cs.xpi) = 390979
-SHA256 (xpi/firefox-31.7.0/csb.xpi) = 244cb21b264752c1c51d3b633822a409854e7805ebf3238d64505f9a9ea07de3
-SIZE (xpi/firefox-31.7.0/csb.xpi) = 383695
-SHA256 (xpi/firefox-31.7.0/cy.xpi) = 894d27928c7c8be1889a400d950e6cfd750612256d48523a16ab78cc3a62705a
-SIZE (xpi/firefox-31.7.0/cy.xpi) = 390727
-SHA256 (xpi/firefox-31.7.0/da.xpi) = 2c04601b1a1927d70cf08429d641f056b7cd9bc5a0b0b4af2cf41da39fbab056
-SIZE (xpi/firefox-31.7.0/da.xpi) = 397747
-SHA256 (xpi/firefox-31.7.0/de.xpi) = 0942a9e3108c73904248f5883031db8c9b1533ad7d1fb99b56278c10412252a5
-SIZE (xpi/firefox-31.7.0/de.xpi) = 395165
-SHA256 (xpi/firefox-31.7.0/el.xpi) = 9338bd6441506040fbf43dde73751010a897117850da56a7f74eafb49ecae868
-SIZE (xpi/firefox-31.7.0/el.xpi) = 442982
-SHA256 (xpi/firefox-31.7.0/en-GB.xpi) = 62a0eab5307fd1bf8edeb650f88e2b5583bc97d3ad09d055fcceded267f70e16
-SIZE (xpi/firefox-31.7.0/en-GB.xpi) = 390119
-SHA256 (xpi/firefox-31.7.0/en-US.xpi) = b465b5352d1598225a9d2bc84e54db540e5965618cc4cdaab88fe1c1ef2e8058
-SIZE (xpi/firefox-31.7.0/en-US.xpi) = 422788
-SHA256 (xpi/firefox-31.7.0/en-ZA.xpi) = 5402bbc92fb8b7953acf7ff9a2a4bb92d7113e94d92c782687825c303325a0d3
-SIZE (xpi/firefox-31.7.0/en-ZA.xpi) = 388527
-SHA256 (xpi/firefox-31.7.0/eo.xpi) = 37793b813547b052751b18cbd8413644d98753bef9cc9de9ce0c319b996300e3
-SIZE (xpi/firefox-31.7.0/eo.xpi) = 431831
-SHA256 (xpi/firefox-31.7.0/es-AR.xpi) = 6c5865f4d479449a0a9b825231c859df0d6a275c81afb39a6d8ecbc12b24a462
-SIZE (xpi/firefox-31.7.0/es-AR.xpi) = 399937
-SHA256 (xpi/firefox-31.7.0/es-CL.xpi) = 936f49302395973a8fccf344ab121e5d3caf6a9a4713ea28fa74b2e3475d2172
-SIZE (xpi/firefox-31.7.0/es-CL.xpi) = 342808
-SHA256 (xpi/firefox-31.7.0/es-ES.xpi) = 16930441fccf01cb56f74e847820374203ee10e3621e0bc727b60faf647b1ea7
-SIZE (xpi/firefox-31.7.0/es-ES.xpi) = 335880
-SHA256 (xpi/firefox-31.7.0/es-MX.xpi) = 19e1c14ea4b2964b2c482be44444864be37e7afbb25347b2c61b6a73aea46205
-SIZE (xpi/firefox-31.7.0/es-MX.xpi) = 402672
-SHA256 (xpi/firefox-31.7.0/et.xpi) = 7b3aabcd02422a86e990cf3d122fa833493275d433cab826b062ad0c389ddbae
-SIZE (xpi/firefox-31.7.0/et.xpi) = 390360
-SHA256 (xpi/firefox-31.7.0/eu.xpi) = 08da23a46160d70f1f267176c367ab42e7d9309a3694aab127f02092846d4032
-SIZE (xpi/firefox-31.7.0/eu.xpi) = 412999
-SHA256 (xpi/firefox-31.7.0/fa.xpi) = 9f320fb90856afeda61ed6ef231c7f08a5f286cc1a3e1ccb648e00bc83b9ca0d
-SIZE (xpi/firefox-31.7.0/fa.xpi) = 460857
-SHA256 (xpi/firefox-31.7.0/ff.xpi) = 186e83c5d270013ece23c060db9b688d86d5fa411e1e43180147964344a4fa08
-SIZE (xpi/firefox-31.7.0/ff.xpi) = 400143
-SHA256 (xpi/firefox-31.7.0/fi.xpi) = a735827f8b51d44d2dbf06dc60694e5c495120d2cd30a06a141f265c6e2a5559
-SIZE (xpi/firefox-31.7.0/fi.xpi) = 392740
-SHA256 (xpi/firefox-31.7.0/fr.xpi) = c87f0a11b32b0d9232aebed8c8db11653b7a1f6e4cff349cd55605c984b5e353
-SIZE (xpi/firefox-31.7.0/fr.xpi) = 406462
-SHA256 (xpi/firefox-31.7.0/fy-NL.xpi) = 06f65abe1aad68faf55dffbe60b8cec4c6dbf9ed49a8e0b6e829bc35cdae668f
-SIZE (xpi/firefox-31.7.0/fy-NL.xpi) = 401930
-SHA256 (xpi/firefox-31.7.0/ga-IE.xpi) = c2d7f32ffa5f7a4eb0f9fd793c5ce2bd4dae08f7fba57b0bfc9f9a5c276db1b9
-SIZE (xpi/firefox-31.7.0/ga-IE.xpi) = 410077
-SHA256 (xpi/firefox-31.7.0/gd.xpi) = d6507eaefcf693abdf44df8ab8ff31af1453064543e41324fd535f77792fa3b8
-SIZE (xpi/firefox-31.7.0/gd.xpi) = 403014
-SHA256 (xpi/firefox-31.7.0/gl.xpi) = 7492fa58143cb2e31377165e0f62a31ba5a6d6b93f44dbea7a196c1fe6c35117
-SIZE (xpi/firefox-31.7.0/gl.xpi) = 390599
-SHA256 (xpi/firefox-31.7.0/gu-IN.xpi) = 09b503b94a67ee8b7f031375f6e3247544e6e58f47b1077931f6022117f12eca
-SIZE (xpi/firefox-31.7.0/gu-IN.xpi) = 423504
-SHA256 (xpi/firefox-31.7.0/he.xpi) = fc459d3c9b7c4989b78f9f9ef3f56b7a3130b04ddcf4af199e63f531ff3369ef
-SIZE (xpi/firefox-31.7.0/he.xpi) = 427629
-SHA256 (xpi/firefox-31.7.0/hi-IN.xpi) = 1fe8ffc2781376657a2190ce67c3cb0f8d661a941ff14d2a11360feb898963da
-SIZE (xpi/firefox-31.7.0/hi-IN.xpi) = 441402
-SHA256 (xpi/firefox-31.7.0/hr.xpi) = 7233b1981e2b4333c4d92fc1b354e29abd426b5c2cad8157ceae9836e874f0e7
-SIZE (xpi/firefox-31.7.0/hr.xpi) = 424371
-SHA256 (xpi/firefox-31.7.0/hsb.xpi) = 78f17b9699469f7aa33adb332e6a86865d78a4bb41e61aaaf9632de06d6c93fc
-SIZE (xpi/firefox-31.7.0/hsb.xpi) = 413076
-SHA256 (xpi/firefox-31.7.0/hu.xpi) = 98d7f3c03c8c0e25ac904edc9b7744adaf1b7001b887c496cf731b66e4da30f4
-SIZE (xpi/firefox-31.7.0/hu.xpi) = 398644
-SHA256 (xpi/firefox-31.7.0/hy-AM.xpi) = be183e444d88a9d84c7f7d9f8f39805036f90cbd33cdb1157cf0a620dc510d5f
-SIZE (xpi/firefox-31.7.0/hy-AM.xpi) = 478743
-SHA256 (xpi/firefox-31.7.0/id.xpi) = c059b5bca06f2073dc68f7068f99b6d3d52291f07bdb2a5527c62d64f787d40e
-SIZE (xpi/firefox-31.7.0/id.xpi) = 378301
-SHA256 (xpi/firefox-31.7.0/is.xpi) = ff432dd9cda5aa362806be2b93a44ae343860e56ad871c12b808eab3ce95e4b2
-SIZE (xpi/firefox-31.7.0/is.xpi) = 427327
-SHA256 (xpi/firefox-31.7.0/it.xpi) = 63b7031dc95cb7938f796f8273aca84959dc4c1b06457186d39d2314437135d9
-SIZE (xpi/firefox-31.7.0/it.xpi) = 330905
-SHA256 (xpi/firefox-31.7.0/ja.xpi) = c6e5d30f36831608bbb001a30dd20d36357a8f812208caef3b3672f15d03869d
-SIZE (xpi/firefox-31.7.0/ja.xpi) = 421664
-SHA256 (xpi/firefox-31.7.0/kk.xpi) = 4134807f0682c4e3b531050d6152c95a3cd207bbf6266ae668e40af5a404b44d
-SIZE (xpi/firefox-31.7.0/kk.xpi) = 439116
-SHA256 (xpi/firefox-31.7.0/km.xpi) = 425742f17f805c4fb8bcffe2f634687a4430e9a0a97af14e3e66d81930349d86
-SIZE (xpi/firefox-31.7.0/km.xpi) = 506476
-SHA256 (xpi/firefox-31.7.0/kn.xpi) = 21dde9bc0907a3f3d6eccb62209512c4e923e9578f99d3cfa38b9fc0f5749166
-SIZE (xpi/firefox-31.7.0/kn.xpi) = 458891
-SHA256 (xpi/firefox-31.7.0/ko.xpi) = d1815717ff979a4f4d752860d7584afddc8598c5870e9827866b0ab5ef8ec6c5
-SIZE (xpi/firefox-31.7.0/ko.xpi) = 402815
-SHA256 (xpi/firefox-31.7.0/ku.xpi) = fbae0d3034d27f604dadc2f1f9d47faa919429951ef0fddc3acb27cc54c761fb
-SIZE (xpi/firefox-31.7.0/ku.xpi) = 420260
-SHA256 (xpi/firefox-31.7.0/lij.xpi) = 64b6cbc1afed4d403e1dc138adb00ee5a0d9f510aeb0203ee5a55ae0c12a54df
-SIZE (xpi/firefox-31.7.0/lij.xpi) = 385864
-SHA256 (xpi/firefox-31.7.0/lt.xpi) = e427e278896af7049be1a2ba0921fe040a0f28ea6db88b9776e61c9aa1f7c1f2
-SIZE (xpi/firefox-31.7.0/lt.xpi) = 435431
-SHA256 (xpi/firefox-31.7.0/lv.xpi) = 808561e54dcbcfc2c5d4340b8981c26c32ffaaff41981c24987985b3e5237836
-SIZE (xpi/firefox-31.7.0/lv.xpi) = 398576
-SHA256 (xpi/firefox-31.7.0/mai.xpi) = c0028b9cb674795770485754d827e33d326c7b088faa07ae0533eedb4c4b0a98
-SIZE (xpi/firefox-31.7.0/mai.xpi) = 444885
-SHA256 (xpi/firefox-31.7.0/mk.xpi) = 9e2b8adbe49312fff3f4f4f466253c55ff475d77ee621ed1ec90d3f6db132f21
-SIZE (xpi/firefox-31.7.0/mk.xpi) = 475483
-SHA256 (xpi/firefox-31.7.0/ml.xpi) = 7c84d8089f4a191597ba04043f1ed06b495afa8493db7b9069b3b8e8431f1019
-SIZE (xpi/firefox-31.7.0/ml.xpi) = 466254
-SHA256 (xpi/firefox-31.7.0/mr.xpi) = 8fde662d065db623971f5ca3259edbda653b269a85089d7da61b59a2ac1028bf
-SIZE (xpi/firefox-31.7.0/mr.xpi) = 451292
-SHA256 (xpi/firefox-31.7.0/ms.xpi) = cf842b609e2c0196e38ef566cb6cd440d9d98aa406ee19e73ba9be199b3e5137
-SIZE (xpi/firefox-31.7.0/ms.xpi) = 436230
-SHA256 (xpi/firefox-31.7.0/nb-NO.xpi) = 614e4819e7542455d53f5fa1d477e7bbaca34f9a60f381f310f469f8eb7a6585
-SIZE (xpi/firefox-31.7.0/nb-NO.xpi) = 392006
-SHA256 (xpi/firefox-31.7.0/nl.xpi) = 25fa21b6f5b9226bc98b564c6ea4597def332bf45287245b946406901176c85c
-SIZE (xpi/firefox-31.7.0/nl.xpi) = 390885
-SHA256 (xpi/firefox-31.7.0/nn-NO.xpi) = 1da9ed892eef144fc24f36d8d357e909bebf1add25f39bc18d9eb3b3752676e6
-SIZE (xpi/firefox-31.7.0/nn-NO.xpi) = 386281
-SHA256 (xpi/firefox-31.7.0/or.xpi) = c6609d74a5ad5c26f47557431f284ec22218f6482a1da09e6a82a5be81ff6746
-SIZE (xpi/firefox-31.7.0/or.xpi) = 464749
-SHA256 (xpi/firefox-31.7.0/pa-IN.xpi) = b190e43dc00acb59269a64ef34871d326296b526b3ebc4efbdf6a7d2d9cd35ae
-SIZE (xpi/firefox-31.7.0/pa-IN.xpi) = 439326
-SHA256 (xpi/firefox-31.7.0/pl.xpi) = 594ad2d1bc2ad972da2e1b6a04cff08d31664293c766bfaeac5339efc85b57e3
-SIZE (xpi/firefox-31.7.0/pl.xpi) = 374747
-SHA256 (xpi/firefox-31.7.0/pt-BR.xpi) = b5713f2dfe91eee8eaa6628592165eaa134bfa0f61b741bfe31fd9b321d309b9
-SIZE (xpi/firefox-31.7.0/pt-BR.xpi) = 405565
-SHA256 (xpi/firefox-31.7.0/pt-PT.xpi) = abb6214eca83b79f83b042597d222e06474acc6252d389d5ba2c651a9e5ce03a
-SIZE (xpi/firefox-31.7.0/pt-PT.xpi) = 386344
-SHA256 (xpi/firefox-31.7.0/rm.xpi) = 14812365a8427dacc135cbedd51aa9f05cdeae79ae534e733c90156871bdce44
-SIZE (xpi/firefox-31.7.0/rm.xpi) = 399285
-SHA256 (xpi/firefox-31.7.0/ro.xpi) = 37101737210648a141e39bdd45b6a09d6bd1c7c91921fce6e18e06c960786a75
-SIZE (xpi/firefox-31.7.0/ro.xpi) = 439388
-SHA256 (xpi/firefox-31.7.0/ru.xpi) = f26cd9d88445e805ad9001e64c6fc090e4e2a9a38a6a1a3a4db16d4d2f86af85
-SIZE (xpi/firefox-31.7.0/ru.xpi) = 367898
-SHA256 (xpi/firefox-31.7.0/si.xpi) = 9b65abd0a84e28cd02fec01f57601dec37e62ee79364ee1e9afcf56c051e872f
-SIZE (xpi/firefox-31.7.0/si.xpi) = 463224
-SHA256 (xpi/firefox-31.7.0/sk.xpi) = 79af6394fb242a2381c22d530661c8e4aa49f79072547270d1666623cd234376
-SIZE (xpi/firefox-31.7.0/sk.xpi) = 413802
-SHA256 (xpi/firefox-31.7.0/sl.xpi) = 5adbabcf3f9df45ece596da1866551abd308f93a14d4c2d2872cb93b3d00a365
-SIZE (xpi/firefox-31.7.0/sl.xpi) = 387134
-SHA256 (xpi/firefox-31.7.0/son.xpi) = f6fe46997da6c63a2622df2ae8fcd162df761cc13f02f12e19a5827bd5b3d5d9
-SIZE (xpi/firefox-31.7.0/son.xpi) = 395144
-SHA256 (xpi/firefox-31.7.0/sq.xpi) = 4b11e3c0f1b709193df7ac617f09502224fa90891c64456bf3b09f64081f7366
-SIZE (xpi/firefox-31.7.0/sq.xpi) = 431136
-SHA256 (xpi/firefox-31.7.0/sr.xpi) = 7cec3903511642d0f18d681f9c8db88d7a515a0d4bc41c3b47b639f900888394
-SIZE (xpi/firefox-31.7.0/sr.xpi) = 425903
-SHA256 (xpi/firefox-31.7.0/sv-SE.xpi) = e90efaef588b44c2aa8ed7243930fe749c8804ac29f27505cdb4f16578c47ece
-SIZE (xpi/firefox-31.7.0/sv-SE.xpi) = 399026
-SHA256 (xpi/firefox-31.7.0/ta.xpi) = 1eb3703416367ca99e10779fc9cdbfd2b521c33d841cdc5e37a780c8995ffeab
-SIZE (xpi/firefox-31.7.0/ta.xpi) = 447685
-SHA256 (xpi/firefox-31.7.0/te.xpi) = 6e8b188de46947a0021db9bea2f559d00c2fed6c6fdd359d3c6ed43ae9e672c8
-SIZE (xpi/firefox-31.7.0/te.xpi) = 462591
-SHA256 (xpi/firefox-31.7.0/th.xpi) = c5f507998c17c120af9659fabdb0573e807784fb482c86d559cd3001cfb584c4
-SIZE (xpi/firefox-31.7.0/th.xpi) = 478126
-SHA256 (xpi/firefox-31.7.0/tr.xpi) = 846f9802aacfb0d6a873a9cfbc7854fce33b2f59311f1c85d91d7a929bab2255
-SIZE (xpi/firefox-31.7.0/tr.xpi) = 417370
-SHA256 (xpi/firefox-31.7.0/uk.xpi) = 5e988550f6722b30362f1e69675e18259e8bb20439747ce37a4fde9fd429a5d8
-SIZE (xpi/firefox-31.7.0/uk.xpi) = 428002
-SHA256 (xpi/firefox-31.7.0/vi.xpi) = 3e6aa2a99aef4613d6dcc5b912ebe2a017d2f7cae3494429484441a0d501b319
-SIZE (xpi/firefox-31.7.0/vi.xpi) = 413375
-SHA256 (xpi/firefox-31.7.0/xh.xpi) = fe7fbc65ab6d572a7bb9c3133ddd6ea1772171ac3e1ce43528c07ebc78a2f8b5
-SIZE (xpi/firefox-31.7.0/xh.xpi) = 397875
-SHA256 (xpi/firefox-31.7.0/zh-CN.xpi) = 20aa5d265b0d275c63fceea28257e100ce788598b4e18e448083ce02d50f8dff
-SIZE (xpi/firefox-31.7.0/zh-CN.xpi) = 419630
-SHA256 (xpi/firefox-31.7.0/zh-TW.xpi) = 5752bf1f8f6618bfd039cfd378d43a29d37270e4deb26474ee86b4cd4275e993
-SIZE (xpi/firefox-31.7.0/zh-TW.xpi) = 412520
-SHA256 (xpi/firefox-31.7.0/zu.xpi) = 012bb28adb83356fc8367556f8cc397c2d0fbcd552ff56c5e146cb48653c822b
-SIZE (xpi/firefox-31.7.0/zu.xpi) = 433216
+SHA256 (xpi/firefox-38.1.0/ach.xpi) = d8d0439db26597a0d869e5467bb849bc77c1786b0c2df3a16cf91801523cbebb
+SIZE (xpi/firefox-38.1.0/ach.xpi) = 477969
+SHA256 (xpi/firefox-38.1.0/af.xpi) = 1a4c6835db2ba384767f6ceddf021a30b61c1d29f17577cf2f7330e3358c9ff7
+SIZE (xpi/firefox-38.1.0/af.xpi) = 483325
+SHA256 (xpi/firefox-38.1.0/an.xpi) = dbecee3b6d22ff49680d412a338a8e94d6f759c62110cb55ed6aa21f11537a0a
+SIZE (xpi/firefox-38.1.0/an.xpi) = 461422
+SHA256 (xpi/firefox-38.1.0/ar.xpi) = 47eef2d1bfa6e5594cd8835bddca7bfd5019aac1553b54b05c1c749fad659dda
+SIZE (xpi/firefox-38.1.0/ar.xpi) = 516495
+SHA256 (xpi/firefox-38.1.0/as.xpi) = 1628e61d5bb7e7c4cbdff288ca2e6d8623578ccf12797e63b27864e68be21c1c
+SIZE (xpi/firefox-38.1.0/as.xpi) = 509574
+SHA256 (xpi/firefox-38.1.0/ast.xpi) = bfe8b26cffb80f7cc0824dc08546f31d54da190bf8fd342b12204ecdc85977e7
+SIZE (xpi/firefox-38.1.0/ast.xpi) = 397202
+SHA256 (xpi/firefox-38.1.0/az.xpi) = a29a1f0362aa53c7ea42e500478d2218e6e3e356c7305b249c65f078218fb272
+SIZE (xpi/firefox-38.1.0/az.xpi) = 489152
+SHA256 (xpi/firefox-38.1.0/be.xpi) = ff7583b04c4e57128f0165ecd94488bca77cf4a84bf0284f313f9aca2c885faf
+SIZE (xpi/firefox-38.1.0/be.xpi) = 441056
+SHA256 (xpi/firefox-38.1.0/bg.xpi) = 5096d0dc1ff5e547fb07906e0a3183b3117a6453311fb28afa991db5c34c95d1
+SIZE (xpi/firefox-38.1.0/bg.xpi) = 487819
+SHA256 (xpi/firefox-38.1.0/bn-BD.xpi) = 2ca791e8a573f76f60698b3b634cf9c0768eee657ba6e99f65c0f8979e152216
+SIZE (xpi/firefox-38.1.0/bn-BD.xpi) = 528688
+SHA256 (xpi/firefox-38.1.0/bn-IN.xpi) = b664469d76782fe549f582b79cb88d8350d439038ee1eaa7a7388fd5b3cb1eff
+SIZE (xpi/firefox-38.1.0/bn-IN.xpi) = 527927
+SHA256 (xpi/firefox-38.1.0/br.xpi) = 57ee679bb3532a0e9289827d4fb421598683ea8168656889edddcff1e21bb6b9
+SIZE (xpi/firefox-38.1.0/br.xpi) = 441962
+SHA256 (xpi/firefox-38.1.0/bs.xpi) = 92b42a21fdd59775f65f13316e875f93f7478695aa70ab02016f3145c79a3aea
+SIZE (xpi/firefox-38.1.0/bs.xpi) = 485305
+SHA256 (xpi/firefox-38.1.0/ca.xpi) = 53c42f1501f90ddd9259ca255baae8a7ea6a1055fa88acc0cd1de9d8a20db2b9
+SIZE (xpi/firefox-38.1.0/ca.xpi) = 458091
+SHA256 (xpi/firefox-38.1.0/cs.xpi) = a23e9ea357bd08c5029d31d6865516efc5ff3aa8504dae8dc316af5efc859fa9
+SIZE (xpi/firefox-38.1.0/cs.xpi) = 446725
+SHA256 (xpi/firefox-38.1.0/cy.xpi) = 464c9b57d03fbaff4a6241dfa492623a338018a609e2289defeba196ab454b95
+SIZE (xpi/firefox-38.1.0/cy.xpi) = 444384
+SHA256 (xpi/firefox-38.1.0/da.xpi) = 2b339c9a73067076f4ca8b28d9d8543064be5616dd4db50cf0bf1ed0e4cea3c2
+SIZE (xpi/firefox-38.1.0/da.xpi) = 450762
+SHA256 (xpi/firefox-38.1.0/de.xpi) = bb0aca584ae740caa4cd2adeab2de09670c38ec8dd0241512318201b3ed6d761
+SIZE (xpi/firefox-38.1.0/de.xpi) = 451628
+SHA256 (xpi/firefox-38.1.0/dsb.xpi) = 921ff1abd17da602be91dcd9ddf7f0655bb97231840ac72f964252bacfdcfcf9
+SIZE (xpi/firefox-38.1.0/dsb.xpi) = 470923
+SHA256 (xpi/firefox-38.1.0/el.xpi) = 96e8b36888ccadce8d576208a76ab6522c3148c501bc35549e25bce545c11a01
+SIZE (xpi/firefox-38.1.0/el.xpi) = 498369
+SHA256 (xpi/firefox-38.1.0/en-GB.xpi) = 3f80590f27a73d5cb50b56b7658c38f4378f0bb1b84d3da4c2e0cd9a7b8f4120
+SIZE (xpi/firefox-38.1.0/en-GB.xpi) = 437845
+SHA256 (xpi/firefox-38.1.0/en-US.xpi) = 36fe4e6fc9b319f65b81ab0f9f8eda2b185ff175b6d4999799489365154142e6
+SIZE (xpi/firefox-38.1.0/en-US.xpi) = 469718
+SHA256 (xpi/firefox-38.1.0/en-ZA.xpi) = 6d3a854cffcb9a6ff37a6ae4b2b9a91da3fd16914ea4cd70f69ad3039b960ceb
+SIZE (xpi/firefox-38.1.0/en-ZA.xpi) = 439925
+SHA256 (xpi/firefox-38.1.0/eo.xpi) = ac159c4a6b9dfb3b838dd757350cdfa92d7322c772e46bf79fbfce8d7e03b433
+SIZE (xpi/firefox-38.1.0/eo.xpi) = 488369
+SHA256 (xpi/firefox-38.1.0/es-AR.xpi) = 7410081864264d57267ffb4795aac402a72d30e369e4aa6ec2df6501c77ead8f
+SIZE (xpi/firefox-38.1.0/es-AR.xpi) = 453982
+SHA256 (xpi/firefox-38.1.0/es-CL.xpi) = f5979bcfc6576cd6796a555617966c4f7c42d90bba52dc281824d09f7ca2ba01
+SIZE (xpi/firefox-38.1.0/es-CL.xpi) = 384678
+SHA256 (xpi/firefox-38.1.0/es-ES.xpi) = 87e28415879608af646ab9a531108c74b18a8b94f7a472439841ed7b79240537
+SIZE (xpi/firefox-38.1.0/es-ES.xpi) = 374072
+SHA256 (xpi/firefox-38.1.0/es-MX.xpi) = aa8e47ac74821a900eac826459e9fefb0eb8c0de77ee1b5246a55e23a369f4b8
+SIZE (xpi/firefox-38.1.0/es-MX.xpi) = 457049
+SHA256 (xpi/firefox-38.1.0/et.xpi) = 76e0e0480e62cc5187e6cf97845d61d835a16b883582cd8a27ef2b6e74c3d69c
+SIZE (xpi/firefox-38.1.0/et.xpi) = 443228
+SHA256 (xpi/firefox-38.1.0/eu.xpi) = ecac2d452d2a4e4165970a1aed2a0ae6bff8212c0d6dc0687e5782758d5d72d9
+SIZE (xpi/firefox-38.1.0/eu.xpi) = 466554
+SHA256 (xpi/firefox-38.1.0/fa.xpi) = 90bbd088bff3a41dfc752f695f0184e68d5621ffdaa17536a989067bc2f4f7de
+SIZE (xpi/firefox-38.1.0/fa.xpi) = 518281
+SHA256 (xpi/firefox-38.1.0/ff.xpi) = cb840656488d9044aa2042805f95458720fbcbb19e6fbd8beca197a9101817d1
+SIZE (xpi/firefox-38.1.0/ff.xpi) = 454586
+SHA256 (xpi/firefox-38.1.0/fi.xpi) = 6d1a14149420b2d851673c58308cff8b5218a4e9835b60d5a5274d2edf367635
+SIZE (xpi/firefox-38.1.0/fi.xpi) = 444852
+SHA256 (xpi/firefox-38.1.0/fr.xpi) = 8e416c8c930e09adb020ede16d420fd94a4e0e169d3a40213e33db94dee44d6b
+SIZE (xpi/firefox-38.1.0/fr.xpi) = 461401
+SHA256 (xpi/firefox-38.1.0/fy-NL.xpi) = f6f06bac70b7edd570510deed989e3184d08a42a7e49a7e7960ed1f6a705e0a0
+SIZE (xpi/firefox-38.1.0/fy-NL.xpi) = 455537
+SHA256 (xpi/firefox-38.1.0/ga-IE.xpi) = 39ae1a583ac7be57fb3631e98734008823fe735ac679a173efe8729ef66e295c
+SIZE (xpi/firefox-38.1.0/ga-IE.xpi) = 469623
+SHA256 (xpi/firefox-38.1.0/gd.xpi) = c38b1152552c91e0531eb4536b2727bc72c1c9397679d8b42003dbf7dab1be7d
+SIZE (xpi/firefox-38.1.0/gd.xpi) = 454616
+SHA256 (xpi/firefox-38.1.0/gl.xpi) = d8ad198ce7afef708e7974384cac5b646efa58c1b914c0e58a0c19569276ac9d
+SIZE (xpi/firefox-38.1.0/gl.xpi) = 448924
+SHA256 (xpi/firefox-38.1.0/gu-IN.xpi) = dc03e9021e27b9c5d41be2c9e569da7165176f2139872fc5694500edd71e7102
+SIZE (xpi/firefox-38.1.0/gu-IN.xpi) = 477980
+SHA256 (xpi/firefox-38.1.0/he.xpi) = 4d67723435a899817745f8141c7671fd8c0ed899db6b9fc040a7cf77a997113a
+SIZE (xpi/firefox-38.1.0/he.xpi) = 486784
+SHA256 (xpi/firefox-38.1.0/hi-IN.xpi) = 3404e4a912049d583508619d92fb37663629cddc09f91f2c6f6e007fcbd1a281
+SIZE (xpi/firefox-38.1.0/hi-IN.xpi) = 508166
+SHA256 (xpi/firefox-38.1.0/hr.xpi) = 98487a75721efbb651b30d94fc00edac8962ca4aa0f356c714aae1761ed1650b
+SIZE (xpi/firefox-38.1.0/hr.xpi) = 478271
+SHA256 (xpi/firefox-38.1.0/hsb.xpi) = b36779a40c56839cb9b6a78eca688704dcc5c202921493726640805580b7bf6e
+SIZE (xpi/firefox-38.1.0/hsb.xpi) = 468719
+SHA256 (xpi/firefox-38.1.0/hu.xpi) = 93ace7ddee6b87c2a3cdfeedce151ced7354d3504d0d7e1aee8f2368094cabc0
+SIZE (xpi/firefox-38.1.0/hu.xpi) = 453554
+SHA256 (xpi/firefox-38.1.0/hy-AM.xpi) = 8c6a5918df7c1bdd36cdf9a5fe44400c53e2e8998dc910ad71ff29178299d63b
+SIZE (xpi/firefox-38.1.0/hy-AM.xpi) = 534264
+SHA256 (xpi/firefox-38.1.0/id.xpi) = f37f250ba26bdf7cdb1f3d47a6bf7f7feb90ebd82da1a55ff4f11932af1da1e5
+SIZE (xpi/firefox-38.1.0/id.xpi) = 431488
+SHA256 (xpi/firefox-38.1.0/is.xpi) = fa4eca6ec46e110683178b282f4bd3cc6b47b315e4ddbd34cd99b8c00676b297
+SIZE (xpi/firefox-38.1.0/is.xpi) = 485128
+SHA256 (xpi/firefox-38.1.0/it.xpi) = 42948d7424e1554ce71e34d34c63b1bd3b94bf067845b8826576591aeeba3bb9
+SIZE (xpi/firefox-38.1.0/it.xpi) = 368409
+SHA256 (xpi/firefox-38.1.0/ja.xpi) = 456e16ba61c0bb904cbfb3d05b184d6fc9d7cac7f346c7b38d9fe230af96e96d
+SIZE (xpi/firefox-38.1.0/ja.xpi) = 479113
+SHA256 (xpi/firefox-38.1.0/kk.xpi) = 0c10adeca506e653e464285b1feaf049d79dbcb45e1820dfe6cbb13198422c5a
+SIZE (xpi/firefox-38.1.0/kk.xpi) = 503567
+SHA256 (xpi/firefox-38.1.0/km.xpi) = b94aff6d6093856b1726b1aa8d6ffa0ad2db3a897ea9ad6a5589fbffac6580a9
+SIZE (xpi/firefox-38.1.0/km.xpi) = 565673
+SHA256 (xpi/firefox-38.1.0/kn.xpi) = 72d4b3da5a920975904ba4f17b55826685ec71ffc4e952a946142210e2ae95eb
+SIZE (xpi/firefox-38.1.0/kn.xpi) = 533464
+SHA256 (xpi/firefox-38.1.0/ko.xpi) = 4caa6c2e11b1c0d9184cc688fcb5f9534ab74a1d87c2d7624a83c0fc1ea4699d
+SIZE (xpi/firefox-38.1.0/ko.xpi) = 460853
+SHA256 (xpi/firefox-38.1.0/lij.xpi) = 75c704a30c99d4bd6b0a99945709dd88c86b8859ffe448ed59b0b9af51c76c7b
+SIZE (xpi/firefox-38.1.0/lij.xpi) = 444237
+SHA256 (xpi/firefox-38.1.0/lt.xpi) = 0a4c45516ba00ab84b2744690ff4e70ef624825238fa4c4cd6345db68be158e5
+SIZE (xpi/firefox-38.1.0/lt.xpi) = 486451
+SHA256 (xpi/firefox-38.1.0/lv.xpi) = 3f88098b580f7591a9a435ba93f06e73f6adb312d9a19ad4b756768b93bd3b1b
+SIZE (xpi/firefox-38.1.0/lv.xpi) = 467197
+SHA256 (xpi/firefox-38.1.0/mai.xpi) = 27473c24c7f66a9ed31ccda36d04bf98cc81f699bdfe4c5958de0abd9c5c6824
+SIZE (xpi/firefox-38.1.0/mai.xpi) = 514665
+SHA256 (xpi/firefox-38.1.0/mk.xpi) = 6e2d2ac3b859eedc499041e2961cc1bf4b92316dd59526f14ff694fb4c2067b4
+SIZE (xpi/firefox-38.1.0/mk.xpi) = 529204
+SHA256 (xpi/firefox-38.1.0/ml.xpi) = f4d488f0207854450945af1230b70db6773bd94bad6804fdba4215bba921734f
+SIZE (xpi/firefox-38.1.0/ml.xpi) = 528919
+SHA256 (xpi/firefox-38.1.0/mr.xpi) = dd9caa414cc4ba76ec4161b246612cb008585b5662b4c911d1ca7058e86a54a5
+SIZE (xpi/firefox-38.1.0/mr.xpi) = 505961
+SHA256 (xpi/firefox-38.1.0/ms.xpi) = 00c98155bc447385340e2c1b08ecfac7f4405b8b843c0603ab39a65b037f49e3
+SIZE (xpi/firefox-38.1.0/ms.xpi) = 489872
+SHA256 (xpi/firefox-38.1.0/nb-NO.xpi) = 9b17997524d839b610e60b42cae25c512ea93f3fedad473e723a91289f839ca5
+SIZE (xpi/firefox-38.1.0/nb-NO.xpi) = 444176
+SHA256 (xpi/firefox-38.1.0/nl.xpi) = 8d1532bbbb2a843babfd5b46909f0af1457fc8c9c14145b693ad0ff91b3e90ef
+SIZE (xpi/firefox-38.1.0/nl.xpi) = 443993
+SHA256 (xpi/firefox-38.1.0/nn-NO.xpi) = 732a5be1501711e2aed2a5073dd6a3726095b8d3940765e4b368c74c2ad32c59
+SIZE (xpi/firefox-38.1.0/nn-NO.xpi) = 438451
+SHA256 (xpi/firefox-38.1.0/or.xpi) = 1297c29d98f2b1952d05f50417ba383c28505dd316ab8fd7179be6f6805ba892
+SIZE (xpi/firefox-38.1.0/or.xpi) = 527048
+SHA256 (xpi/firefox-38.1.0/pa-IN.xpi) = d3ee939b7914194a87f5ea3b24e569c3c9486ca3d0b997e8303c2c9c42b3bf76
+SIZE (xpi/firefox-38.1.0/pa-IN.xpi) = 493722
+SHA256 (xpi/firefox-38.1.0/pl.xpi) = 8b88410da0376d2c14ccc3e3c0eb8a0031d60d048aebba176100854a17bc16b4
+SIZE (xpi/firefox-38.1.0/pl.xpi) = 406566
+SHA256 (xpi/firefox-38.1.0/pt-BR.xpi) = f1b89e40d210497e3a7ef45b7acbf42c9d0b0b7990efd35d94f04fd0247dfc53
+SIZE (xpi/firefox-38.1.0/pt-BR.xpi) = 459812
+SHA256 (xpi/firefox-38.1.0/pt-PT.xpi) = 23e456c3550b31d7596956dd9739ef317ae742137419d426a4326f277e1c0206
+SIZE (xpi/firefox-38.1.0/pt-PT.xpi) = 439974
+SHA256 (xpi/firefox-38.1.0/rm.xpi) = f305e7a119c349ec71d4000517f315867f8174147dbbf6178a715e27e9aca29b
+SIZE (xpi/firefox-38.1.0/rm.xpi) = 446286
+SHA256 (xpi/firefox-38.1.0/ro.xpi) = cd38ec29af9fbbc27ad61330d2804d57f999c98cebccf6333aa58d55c4e1db87
+SIZE (xpi/firefox-38.1.0/ro.xpi) = 494078
+SHA256 (xpi/firefox-38.1.0/ru.xpi) = b2c612a33a7e7126343644b3931749cd9de1421f8bb1aad283087f0ede074c31
+SIZE (xpi/firefox-38.1.0/ru.xpi) = 414418
+SHA256 (xpi/firefox-38.1.0/si.xpi) = 02de4fd1753d33e6b0c1d81dce2beec09dd01c1bff2c0e82864ec0700971bb68
+SIZE (xpi/firefox-38.1.0/si.xpi) = 537392
+SHA256 (xpi/firefox-38.1.0/sk.xpi) = 2fb1510e200824e455dee3492c8de7c0dd6bc4925307c5069d454fdc9513ca9b
+SIZE (xpi/firefox-38.1.0/sk.xpi) = 469436
+SHA256 (xpi/firefox-38.1.0/sl.xpi) = d5f5ae891561d7ea891f9eaeee4a417e76159f8ee2b6402580d71e155de5bf23
+SIZE (xpi/firefox-38.1.0/sl.xpi) = 441593
+SHA256 (xpi/firefox-38.1.0/son.xpi) = 9fa1b158b3ca08335ca6c9bcf70fd76e6b4baab6cfdb667475188aaacc2f2193
+SIZE (xpi/firefox-38.1.0/son.xpi) = 449266
+SHA256 (xpi/firefox-38.1.0/sq.xpi) = 94d82f9dcf552f6e696e14d17ea9da388de8f5231e72bed6a0eef8b7426f6097
+SIZE (xpi/firefox-38.1.0/sq.xpi) = 486075
+SHA256 (xpi/firefox-38.1.0/sr.xpi) = f63271245f4919db7b86e9740a5128f50db750fe747e98343b1641291e7be1d3
+SIZE (xpi/firefox-38.1.0/sr.xpi) = 479418
+SHA256 (xpi/firefox-38.1.0/sv-SE.xpi) = 724e6ed7ad69ea5a612185851d1bcc39eb46e9cdaaee9032609637516b2fb4fc
+SIZE (xpi/firefox-38.1.0/sv-SE.xpi) = 452631
+SHA256 (xpi/firefox-38.1.0/ta.xpi) = f0fc43a9cfde17cb71a3c1adef1ec4ae53201d0246528216f7c62fa93d5ca621
+SIZE (xpi/firefox-38.1.0/ta.xpi) = 506605
+SHA256 (xpi/firefox-38.1.0/te.xpi) = 47024b3c034826560b19281b5346d3c79b46b86c308d15c98acc5898545c47a5
+SIZE (xpi/firefox-38.1.0/te.xpi) = 526252
+SHA256 (xpi/firefox-38.1.0/th.xpi) = f99a2d738ee379bde70fc472626611365054eb25165c613824180d8ee7d53454
+SIZE (xpi/firefox-38.1.0/th.xpi) = 534269
+SHA256 (xpi/firefox-38.1.0/tr.xpi) = c7eac37f05b3a4afc073e85c9a065f343cc40b0cdba17fb8dd7219bc175c7723
+SIZE (xpi/firefox-38.1.0/tr.xpi) = 481075
+SHA256 (xpi/firefox-38.1.0/uk.xpi) = 6c68750ac5d4dab03b6c93d7694d8a8c430e95d9ad103a86c2477089fd678d99
+SIZE (xpi/firefox-38.1.0/uk.xpi) = 493312
+SHA256 (xpi/firefox-38.1.0/vi.xpi) = 874f22b8c19d7fe417496c6916b150c7d51a7021e5e73809a542799238c194fd
+SIZE (xpi/firefox-38.1.0/vi.xpi) = 467503
+SHA256 (xpi/firefox-38.1.0/xh.xpi) = 53aca9e35a77091be291a3d2246ada0110d71e0451018c20d9a8c1f40dd2b2ae
+SIZE (xpi/firefox-38.1.0/xh.xpi) = 450241
+SHA256 (xpi/firefox-38.1.0/zh-CN.xpi) = 0dbc3ac200290bdb5514c2076f5a1459442b4e3ee235ef29216384f2ad06d61f
+SIZE (xpi/firefox-38.1.0/zh-CN.xpi) = 488276
+SHA256 (xpi/firefox-38.1.0/zh-TW.xpi) = e3ec89fe112a80d424e25934d21de61efbde5e6680ce2aece0c37a04d96be91c
+SIZE (xpi/firefox-38.1.0/zh-TW.xpi) = 467843

Modified: head/www/firefox-esr/Makefile
==============================================================================
--- head/www/firefox-esr/Makefile	Thu Jul 16 05:29:22 2015	(r392272)
+++ head/www/firefox-esr/Makefile	Thu Jul 16 06:05:59 2015	(r392273)
@@ -2,42 +2,41 @@
 # $FreeBSD$
 
 PORTNAME=	firefox
-DISTVERSION=	31.7.0
+DISTVERSION=	38.1.0
 DISTVERSIONSUFFIX=esr.source
-PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \
-		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}esr-candidates/build2/source
+		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}esr-candidates/build1/source
 PKGNAMESUFFIX=	-esr
 
 MAINTAINER=	gecko@FreeBSD.org
 COMMENT=	Web browser based on the browser portion of Mozilla
 
-BUILD_DEPENDS=	nspr>=4.10.6:${PORTSDIR}/devel/nspr \
-		nss>=3.16.2.3:${PORTSDIR}/security/nss \
+BUILD_DEPENDS=	nspr>=4.10.8:${PORTSDIR}/devel/nspr \
+		nss>=3.19.2:${PORTSDIR}/security/nss \
 		libevent2>=2.0.21_2:${PORTSDIR}/devel/libevent2 \
 		cairo>=1.12.16_1,2:${PORTSDIR}/graphics/cairo \
 		soundtouch>=1.8.0:${PORTSDIR}/audio/soundtouch \
 		harfbuzz>=0.9.25:${PORTSDIR}/print/harfbuzz \
 		graphite2>=1.2.4:${PORTSDIR}/graphics/graphite2 \
-		libvorbis>=1.3.5:${PORTSDIR}/audio/libvorbis \
-		opus>=1.1:${PORTSDIR}/audio/opus \
+		libvorbis>=1.3.4:${PORTSDIR}/audio/libvorbis \
 		libvpx>=1.3.0:${PORTSDIR}/multimedia/libvpx \
-		sqlite3>=3.8.4.2:${PORTSDIR}/databases/sqlite3 \
+		sqlite3>=3.8.9:${PORTSDIR}/databases/sqlite3 \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
 		v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat \
 		autoconf-2.13:${PORTSDIR}/devel/autoconf213 \
 		zip:${PORTSDIR}/archivers/zip \
 		unzip:${PORTSDIR}/archivers/unzip
+#		opus>=1.1:${PORTSDIR}/audio/opus \
 
 LIB_DEPENDS=	libv4l2.so:${PORTSDIR}/multimedia/libv4l
 
 USE_GECKO=	gecko
 CPE_PRODUCT=	${PORTNAME}_esr
-CONFLICTS=	firefox-3[02-9].* firefox-2[0-35-9].*
+CONFLICTS_INSTALL=	firefox-4[0-4].* firefox-3[02-9].* firefox-2[0-35-9].*
 MOZ_PKGCONFIG_FILES=	# empty
-USE_MOZILLA=	# empty
+USE_MOZILLA=	-opus
 MOZILLA_NAME=	Firefox
 
 USE_QT5=	# empty
@@ -52,10 +51,15 @@ MOZ_OPTIONS=	--program-transform-name='s
 		--enable-application=browser \
 		--enable-official-branding
 
+OPTIONS_DEFAULT=	GTK2
+
+OPTIONS_SINGLE+=	TOOLKIT
+OPTIONS_SINGLE_TOOLKIT=	GTK2 GTK3
+
 .include "${.CURDIR}/../../www/firefox/Makefile.options"
 .include <bsd.port.pre.mk>
 
-WRKSRC:=	${WRKDIR}/mozilla-esr31
+WRKSRC:=	${WRKDIR}/mozilla-esr38
 
 .if ${PORT_OPTIONS:MALSA}
 RUN_DEPENDS+=	alsa-lib>=1.0.27.2_1:${PORTSDIR}/audio/alsa-lib
@@ -65,6 +69,10 @@ RUN_DEPENDS+=	alsa-lib>=1.0.27.2_1:${POR
 RUN_DEPENDS+=	gstreamer1-libav>=1.2.4_1:${PORTSDIR}/multimedia/gstreamer1-libav
 .endif
 
+.if ${PORT_OPTIONS:MGTK3}
+BUILD_DEPENDS+=	gtk3>=3.14.6:${PORTSDIR}/x11-toolkits/gtk30
+.endif
+
 post-extract:
 	@${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON}|' -e 's|@MOZILLA@|${MOZILLA}|' \
 		-e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|' \

Modified: head/www/firefox-esr/distinfo
==============================================================================
--- head/www/firefox-esr/distinfo	Thu Jul 16 05:29:22 2015	(r392272)
+++ head/www/firefox-esr/distinfo	Thu Jul 16 06:05:59 2015	(r392273)
@@ -1,2 +1,2 @@
-SHA256 (firefox-31.7.0esr.source.tar.bz2) = 8523c10ecb318f278a251d90e2161c07c7431796d4387fe9091dfa4e633474b6
-SIZE (firefox-31.7.0esr.source.tar.bz2) = 147772244
+SHA256 (firefox-38.1.0esr.source.tar.bz2) = 85eb5f916aa47a92cf50803dcb35e7fa3a9da29abf5fc91cbb6a70bbbc2618ff
+SIZE (firefox-38.1.0esr.source.tar.bz2) = 180392775

Modified: head/www/firefox-esr/files/patch-bug1013882
==============================================================================
--- head/www/firefox-esr/files/patch-bug1013882	Thu Jul 16 05:29:22 2015	(r392272)
+++ head/www/firefox-esr/files/patch-bug1013882	Thu Jul 16 06:05:59 2015	(r392273)
@@ -30,14 +30,14 @@ diff --git browser/installer/package-man
 index b509fd4..195345c 100644
 --- browser/installer/package-manifest.in
 +++ browser/installer/package-manifest.in
-@@ -583,7 +583,7 @@
- @BINPATH@/components/MozKeyboard.js
- @BINPATH@/components/InputMethod.manifest
+@@ -608,7 +608,7 @@
+ @RESPATH@/components/MozKeyboard.js
+ @RESPATH@/components/InputMethod.manifest
  
 -#ifdef MOZ_DEBUG
 +#if defined(ENABLE_TESTS) && defined(MOZ_DEBUG)
- @BINPATH@/components/TestInterfaceJS.js
- @BINPATH@/components/TestInterfaceJS.manifest
+ @RESPATH@/components/TestInterfaceJS.js
+ @RESPATH@/components/TestInterfaceJS.manifest
  #endif
 diff --git mobile/android/installer/Makefile.in mobile/android/installer/Makefile.in
 index 96dceab..3528ad6 100644

Modified: head/www/firefox-esr/files/patch-bug1021761
==============================================================================
--- head/www/firefox-esr/files/patch-bug1021761	Thu Jul 16 05:29:22 2015	(r392272)
+++ head/www/firefox-esr/files/patch-bug1021761	Thu Jul 16 06:05:59 2015	(r392273)
@@ -218,12 +218,12 @@ index a962553..1f780f4 100644
    assert(p);
  
    pthread_mutex_unlock(&stm->mutex);
-@@ -313,10 +360,10 @@ alsa_refill_stream(cubeb_stream * stm)
-     return ERROR;
-   }
-   if (got > 0) {
--    snd_pcm_sframes_t wrote = snd_pcm_writei(stm->pcm, p, got);
-+    snd_pcm_sframes_t wrote = WRAP(snd_pcm_writei)(stm->pcm, p, got);
+@@ -327,10 +374,10 @@ alsa_refill_stream(cubeb_stream * stm)
+         b[i] *= stm->volume;
+       }
+     }
+-    wrote = snd_pcm_writei(stm->pcm, p, got);
++    wrote = WRAP(snd_pcm_writei)(stm->pcm, p, got);
      if (wrote == -EPIPE) {
 -      snd_pcm_recover(stm->pcm, wrote, 1);
 -      wrote = snd_pcm_writei(stm->pcm, p, got);
@@ -533,42 +533,51 @@ index a962553..1f780f4 100644
    assert((nfds_t) r == stm->nfds);
  
    r = pthread_cond_init(&stm->cond, NULL);
-@@ -937,12 +1043,12 @@ alsa_get_max_channel_count(cubeb * ctx, uint32_t * max_channels)
+@@ -895,7 +1001,7 @@ alsa_stream_destroy(cubeb_stream * stm)
+   pthread_mutex_lock(&stm->mutex);
+   if (stm->pcm) {
+     if (stm->state == DRAINING) {
+-      snd_pcm_drain(stm->pcm);
++      WRAP(snd_pcm_drain)(stm->pcm);
+     }
+     alsa_locked_pcm_close(stm->pcm);
+     stm->pcm = NULL;
+@@ -938,12 +1044,12 @@ alsa_get_max_channel_count(cubeb * ctx, uint32_t * max_channels)
      return CUBEB_ERROR;
    }
  
--  rv = snd_pcm_hw_params_any(stm->pcm, hw_params);
-+  rv = WRAP(snd_pcm_hw_params_any)(stm->pcm, hw_params);
-   if (rv < 0) {
+-  r = snd_pcm_hw_params_any(stm->pcm, hw_params);
++  r = WRAP(snd_pcm_hw_params_any)(stm->pcm, hw_params);
+   if (r < 0) {
      return CUBEB_ERROR;
    }
  
--  rv = snd_pcm_hw_params_get_channels_max(hw_params, max_channels);
-+  rv = WRAP(snd_pcm_hw_params_get_channels_max)(hw_params, max_channels);
-   if (rv < 0) {
+-  r = snd_pcm_hw_params_get_channels_max(hw_params, max_channels);
++  r = WRAP(snd_pcm_hw_params_get_channels_max)(hw_params, max_channels);
+   if (r < 0) {
      return CUBEB_ERROR;
    }
-@@ -962,34 +1068,34 @@ alsa_get_preferred_sample_rate(cubeb * ctx, uint32_t * rate) {
+@@ -963,34 +1069,34 @@ alsa_get_preferred_sample_rate(cubeb * ctx, uint32_t * rate) {
  
    /* get a pcm, disabling resampling, so we get a rate the
     * hardware/dmix/pulse/etc. supports. */
--  rv = snd_pcm_open(&pcm, "", SND_PCM_STREAM_PLAYBACK | SND_PCM_NO_AUTO_RESAMPLE, 0);
-+  rv = WRAP(snd_pcm_open)(&pcm, "", SND_PCM_STREAM_PLAYBACK | SND_PCM_NO_AUTO_RESAMPLE, 0);
-   if (rv < 0) {
+-  r = snd_pcm_open(&pcm, "default", SND_PCM_STREAM_PLAYBACK | SND_PCM_NO_AUTO_RESAMPLE, 0);
++  r = WRAP(snd_pcm_open)(&pcm, "default", SND_PCM_STREAM_PLAYBACK | SND_PCM_NO_AUTO_RESAMPLE, 0);
+   if (r < 0) {
      return CUBEB_ERROR;
    }
  
--  rv = snd_pcm_hw_params_any(pcm, hw_params);
-+  rv = WRAP(snd_pcm_hw_params_any)(pcm, hw_params);
-   if (rv < 0) {
+-  r = snd_pcm_hw_params_any(pcm, hw_params);
++  r = WRAP(snd_pcm_hw_params_any)(pcm, hw_params);
+   if (r < 0) {
 -    snd_pcm_close(pcm);
 +    WRAP(snd_pcm_close)(pcm);
      return CUBEB_ERROR;
    }
  
--  rv = snd_pcm_hw_params_get_rate(hw_params, rate, &dir);
-+  rv = WRAP(snd_pcm_hw_params_get_rate)(hw_params, rate, &dir);
-   if (rv >= 0) {
+-  r = snd_pcm_hw_params_get_rate(hw_params, rate, &dir);
++  r = WRAP(snd_pcm_hw_params_get_rate)(hw_params, rate, &dir);
+   if (r >= 0) {
      /* There is a default rate: use it. */
 -    snd_pcm_close(pcm);
 +    WRAP(snd_pcm_close)(pcm);
@@ -578,9 +587,9 @@ index a962553..1f780f4 100644
    /* Use a common rate, alsa may adjust it based on hw/etc. capabilities. */
    *rate = 44100;
  
--  rv = snd_pcm_hw_params_set_rate_near(pcm, hw_params, rate, NULL);
-+  rv = WRAP(snd_pcm_hw_params_set_rate_near)(pcm, hw_params, rate, NULL);
-   if (rv < 0) {
+-  r = snd_pcm_hw_params_set_rate_near(pcm, hw_params, rate, NULL);
++  r = WRAP(snd_pcm_hw_params_set_rate_near)(pcm, hw_params, rate, NULL);
+   if (r < 0) {
 -    snd_pcm_close(pcm);
 +    WRAP(snd_pcm_close)(pcm);
      return CUBEB_ERROR;
@@ -634,7 +643,7 @@ new file mode 100644
 index 0000000..5e38e27
 --- /dev/null
 +++ media/libcubeb/src/cubeb_oss.c
-@@ -0,0 +1,397 @@
+@@ -0,0 +1,402 @@
 +/*
 + * Copyright © 2014 Mozilla Foundation
 + *
@@ -1030,7 +1039,12 @@ index 0000000..5e38e27
 +  .stream_start = oss_stream_start,
 +  .stream_stop = oss_stream_stop,
 +  .stream_get_position = oss_stream_get_position,
-+  .stream_get_latency = oss_stream_get_latency
++  .stream_get_latency = oss_stream_get_latency,
++  .stream_set_volume = oss_stream_set_volume,
++  .stream_set_panning = oss_stream_set_panning,
++  .stream_get_current_device = NULL,
++  .stream_device_destroy = NULL,
++  .stream_register_device_changed_callback = NULL
 +};
 diff --git media/libcubeb/src/moz.build media/libcubeb/src/moz.build
 index 8b7a0dd..31212ce 100644
@@ -1056,36 +1070,33 @@ index 8b7a0dd..31212ce 100644
 +CFLAGS += CONFIG['MOZ_OSS_CFLAGS']
  CFLAGS += CONFIG['MOZ_ALSA_CFLAGS']
  CFLAGS += CONFIG['MOZ_PULSEAUDIO_CFLAGS']
-diff --git media/webrtc/signaling/test/Makefile.in media/webrtc/signaling/test/Makefile.in
+diff --git media/webrtc/signaling/test/moz.build media/webrtc/signaling/test/moz.build
 index 991f03f..3d99eb5 100644
---- media/webrtc/signaling/test/Makefile.in
-+++ media/webrtc/signaling/test/Makefile.in
-@@ -26,9 +26,9 @@ ifdef JS_SHARED_LIBRARY
- LIBS += $(MOZ_JS_LIBS)
- endif
- 
--ifdef MOZ_ALSA
-+ifdef MOZ_OSS
- LIBS += \
--  $(MOZ_ALSA_LIBS) \
-+  $(MOZ_OSS_LIBS) \
-   $(NULL)
- endif
+--- media/webrtc/signaling/test/moz.build
++++ media/webrtc/signaling/test/moz.build
+@@ -112,8 +112,8 @@ if CONFIG['JS_SHARED_LIBRARY']:
+ OS_LIBS += CONFIG['MOZ_WEBRTC_X11_LIBS']
+ OS_LIBS += CONFIG['REALTIME_LIBS']
+ 
+-if CONFIG['MOZ_ALSA']:
+-    OS_LIBS += CONFIG['MOZ_ALSA_LIBS']
++if CONFIG['MOZ_OSS']:
++    OS_LIBS += CONFIG['MOZ_OSS_LIBS']
  
-diff --git toolkit/library/libxul.mk toolkit/library/libxul.mk
+ if CONFIG['MOZ_NATIVE_JPEG']:
+     OS_LIBS += CONFIG['MOZ_JPEG_LIBS']
+diff --git toolkit/library/moz.build toolkit/library/moz.build
 index e191f13..4fb268a 100644
---- toolkit/library/libxul.mk
-+++ toolkit/library/libxul.mk
-@@ -146,9 +146,9 @@ OS_LIBS += $(call EXPAND_LIBNAME,secur32
- endif
- endif
- 
--ifdef MOZ_ALSA
--EXTRA_DSO_LDOPTS += $(MOZ_ALSA_LIBS)
--endif
-+ifdef MOZ_OSS
-+EXTRA_DSO_LDOPTS += $(MOZ_OSS_LIBS)
-+endif
+--- toolkit/library/moz.build
++++ toolkit/library/moz.build
+@@ -234,8 +234,8 @@ if CONFIG['MOZ_NATIVE_LIBVPX']:
+ if not CONFIG['MOZ_TREE_PIXMAN']:
+     OS_LIBS += CONFIG['MOZ_PIXMAN_LIBS']
+ 
+-if CONFIG['MOZ_ALSA']:
+-    OS_LIBS += CONFIG['MOZ_ALSA_LIBS']
++if CONFIG['MOZ_OSS']:
++    OS_LIBS += CONFIG['MOZ_OSS_LIBS']
  
- ifdef HAVE_CLOCK_MONOTONIC
- EXTRA_DSO_LDOPTS += $(REALTIME_LIBS)
+ if CONFIG['HAVE_CLOCK_MONOTONIC']:
+     OS_LIBS += CONFIG['REALTIME_LIBS']

Added: head/www/firefox-esr/files/patch-bug1041268
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/firefox-esr/files/patch-bug1041268	Thu Jul 16 06:05:59 2015	(r392273)
@@ -0,0 +1,26 @@
+diff --git media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer.cc media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer.cc
+index 97f69d3..77a50b3 100644
+--- media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer.cc
++++ media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer.cc
+@@ -18,7 +18,7 @@ ScreenCapturer* ScreenCapturer::Create() {
+   return Create(DesktopCaptureOptions::CreateDefault());
+ }
+ 
+-#if defined(WEBRTC_LINUX)
++#if defined(WEBRTC_LINUX) || defined(WEBRTC_BSD)
+ ScreenCapturer* ScreenCapturer::CreateWithXDamage(
+     bool use_update_notifications) {
+   DesktopCaptureOptions options;
+diff --git media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer.h media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer.h
+index a8d40a7..177a6c1 100644
+--- media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer.h
++++ media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer.h
+@@ -74,7 +74,7 @@ class ScreenCapturer : public DesktopCapturer {
+   static ScreenCapturer* Create(const DesktopCaptureOptions& options);
+   static ScreenCapturer* Create();
+ 
+-#if defined(WEBRTC_LINUX)
++#if defined(WEBRTC_LINUX) || defined(WEBRTC_BSD)
+   // Creates platform-specific capturer and instructs it whether it should use
+   // X DAMAGE support.
+   static ScreenCapturer* CreateWithXDamage(bool use_x_damage);

Added: head/www/firefox-esr/files/patch-bug1073117
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/firefox-esr/files/patch-bug1073117	Thu Jul 16 06:05:59 2015	(r392273)
@@ -0,0 +1,877 @@
+diff --git widget/gtk/gtk2drawing.c widget/gtk/gtk2drawing.c
+index 34f22af..1b950ab 100644
+--- widget/gtk/gtk2drawing.c
++++ widget/gtk/gtk2drawing.c
+@@ -831,7 +831,7 @@ moz_gtk_get_focus_outline_size(gint* focus_h_width, gint* focus_v_width)
+     return MOZ_GTK_SUCCESS;
+ }
+ 
+-gint
++static gint
+ moz_gtk_widget_get_focus(GtkWidget* widget, gboolean* interior_focus,
+                          gint* focus_width, gint* focus_pad) 
+ {
+@@ -928,7 +928,7 @@ moz_gtk_splitter_get_metrics(gint orientation, gint* size)
+     return MOZ_GTK_SUCCESS;
+ }
+ 
+-gint
++static gint
+ moz_gtk_button_get_inner_border(GtkWidget* widget, GtkBorder* inner_border)
+ {
+     static const GtkBorder default_inner_border = { 1, 1, 1, 1 };
+diff --git widget/gtk/gtk3drawing.c widget/gtk/gtk3drawing.c
+index 08a58d6..7fef6fa 100644
+--- widget/gtk/gtk3drawing.c
++++ widget/gtk/gtk3drawing.c
+@@ -65,6 +65,7 @@ static GtkWidget* gScrolledWindowWidget;
+ static style_prop_t style_prop_func;
+ static gboolean have_arrow_scaling;
+ static gboolean checkbox_check_state;
++static gboolean notebook_has_tab_gap;
+ static gboolean is_initialized;
+ 
+ #define ARROW_UP      0
+@@ -725,6 +726,14 @@ moz_gtk_init()
+     else
+         checkbox_check_state = GTK_STATE_FLAG_ACTIVE;
+ 
++    if(!gtk_check_version(3, 12, 0)) {
++        ensure_tab_widget();
++        gtk_widget_style_get(gTabWidget, "has-tab-gap", &notebook_has_tab_gap, NULL);
++    }
++    else {
++        notebook_has_tab_gap = TRUE;
++    }
++
+     /* Add style property to GtkEntry.
+      * Adding the style property to the normal GtkEntry class means that it
+      * will work without issues inside GtkComboBox and for Spinbuttons. */
+@@ -762,37 +771,17 @@ moz_gtk_radio_get_metrics(gint* indicator_size, gint* indicator_spacing)
+ gint
+ moz_gtk_get_focus_outline_size(gint* focus_h_width, gint* focus_v_width)
+ {
+-    gboolean interior_focus;
+-    gint focus_width = 0;
++    GtkBorder border;
++    GtkBorder padding;
++    GtkStyleContext *style;
+ 
+     ensure_entry_widget();
+-    gtk_widget_style_get(gEntryWidget,
+-                         "interior-focus", &interior_focus,
+-                         "focus-line-width", &focus_width,
+-                         NULL);
+-    if (interior_focus) {
+-        GtkBorder border;
+-        GtkStyleContext *style = gtk_widget_get_style_context(gEntryWidget);
+-        gtk_style_context_get_border(style, 0, &border);
+-        *focus_h_width = border.left + focus_width;
+-        *focus_v_width = border.top + focus_width;
+-    } else {
+-        *focus_h_width = focus_width;
+-        *focus_v_width = focus_width;
+-    }
+-    return MOZ_GTK_SUCCESS;
+-}
+-
+-gint
+-moz_gtk_widget_get_focus(GtkWidget* widget, gboolean* interior_focus,
+-                         gint* focus_width, gint* focus_pad) 
+-{
+-    gtk_widget_style_get (widget,
+-                          "interior-focus", interior_focus,
+-                          "focus-line-width", focus_width,
+-                          "focus-padding", focus_pad,
+-                          NULL);
++    style = gtk_widget_get_style_context(gEntryWidget);
+ 
++    gtk_style_context_get_border(style, 0, &border);
++    gtk_style_context_get_padding(style, 0, &padding);
++    *focus_h_width = border.left + padding.left;
++    *focus_v_width = border.top + padding.top;
+     return MOZ_GTK_SUCCESS;
+ }
+ 
+@@ -880,24 +860,6 @@ moz_gtk_splitter_get_metrics(gint orientation, gint* size)
+     return MOZ_GTK_SUCCESS;
+ }
+ 
+-gint
+-moz_gtk_button_get_inner_border(GtkWidget* widget, GtkBorder* inner_border)
+-{
+-    static const GtkBorder default_inner_border = { 1, 1, 1, 1 };
+-    GtkBorder *tmp_border;
+-
+-    gtk_widget_style_get (widget, "inner-border", &tmp_border, NULL);
+-
+-    if (tmp_border) {
+-        *inner_border = *tmp_border;
+-        gtk_border_free(tmp_border);
+-    }
+-    else
+-        *inner_border = default_inner_border;
+-
+-    return MOZ_GTK_SUCCESS;
+-}
+-
+ static gint
+ moz_gtk_button_paint(cairo_t *cr, GdkRectangle* rect,
+                      GtkWidgetState* state,
+@@ -908,19 +870,8 @@ moz_gtk_button_paint(cairo_t *cr, GdkRectangle* rect,
+     GtkStyleContext* style = gtk_widget_get_style_context(widget);    
+     gint x = rect->x, y=rect->y, width=rect->width, height=rect->height;
+ 
+-    gboolean interior_focus;
+-    gint focus_width, focus_pad;
+-
+-    moz_gtk_widget_get_focus(widget, &interior_focus, &focus_width, &focus_pad);
+     gtk_widget_set_direction(widget, direction);
+-
+-    if (!interior_focus && state->focused) {
+-        x += focus_width + focus_pad;
+-        y += focus_width + focus_pad;

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201507160606.t6G660Ir014993>