From owner-svn-ports-head@freebsd.org Mon Sep 19 21:58:40 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E2383BE0567; Mon, 19 Sep 2016 21:58:40 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BB0761F0E; Mon, 19 Sep 2016 21:58:40 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u8JLwdmr066317; Mon, 19 Sep 2016 21:58:39 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8JLwdOr066314; Mon, 19 Sep 2016 21:58:39 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201609192158.u8JLwdOr066314@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Mon, 19 Sep 2016 21:58:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r422464 - in head/www/firefox: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Sep 2016 21:58:41 -0000 Author: jbeich Date: Mon Sep 19 21:58:39 2016 New Revision: 422464 URL: https://svnweb.freebsd.org/changeset/ports/422464 Log: www/firefox: backport a few fixes - Gracefully fail HiDPI telemetry if disabled - Remove Widevine stub from about:addons#plugins MFH: 2016Q3 Added: head/www/firefox/files/patch-bug1299694 (contents, props changed) head/www/firefox/files/patch-bug1303380 (contents, props changed) Modified: head/www/firefox/Makefile (contents, props changed) Modified: head/www/firefox/Makefile ============================================================================== --- head/www/firefox/Makefile Mon Sep 19 21:17:59 2016 (r422463) +++ head/www/firefox/Makefile Mon Sep 19 21:58:39 2016 (r422464) @@ -4,7 +4,7 @@ PORTNAME= firefox DISTVERSION= 49.0 DISTVERSIONSUFFIX=.source -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ Added: head/www/firefox/files/patch-bug1299694 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/firefox/files/patch-bug1299694 Mon Sep 19 21:58:39 2016 (r422464) @@ -0,0 +1,31 @@ +commit 6ab2496 +Author: Chris Pearce +Date: Mon Sep 5 13:54:37 2016 +1200 + + Bug 1299694 - Ensure we don't enable Widevine unintentionally. r=glandium + + On FreeBSD the target.kernel etc checks in enable_eme are failing, + but we're still falling through to |return value|, and so Widevine + is being enabled. If we remove the |return value| from enable_eme + we at least make Widevine disabled where it's not supposed to be + enabled. + + MozReview-Commit-ID: D1h0IUidxhv +--- + toolkit/moz.configure | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git toolkit/moz.configure toolkit/moz.configure +index 0c98c7a..a00b6eb 100644 +--- toolkit/moz.configure ++++ toolkit/moz.configure +@@ -366,7 +366,8 @@ def enable_eme(value, target): + return value + elif value and value.origin != 'default': + die('%s is not supported on %s' % (value.format('--enable-eme'), target.alias)) +- return value ++ # Return the same type of OptionValue (Positive or Negative), with an empty tuple. ++ return value.__class__(()) + + @depends(enable_eme, fmp4) + def eme(value, fmp4): Added: head/www/firefox/files/patch-bug1303380 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/firefox/files/patch-bug1303380 Mon Sep 19 21:58:39 2016 (r422464) @@ -0,0 +1,26 @@ +commit c0fd0d3 +Author: Jared Wein +Date: Mon Sep 19 15:40:28 2016 -0400 + + Bug 1303380 - Wrap the telemetry code in _firstWindowLoaded with a try/catch to allow startup and migration code to run to completion if there is an exception writing to Telemetry. r=gijs + + MozReview-Commit-ID: DPfq6lZ4fM3 +--- + browser/components/nsBrowserGlue.js | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git browser/components/nsBrowserGlue.js browser/components/nsBrowserGlue.js +index eebbef2..20706fd 100644 +--- browser/components/nsBrowserGlue.js ++++ browser/components/nsBrowserGlue.js +@@ -931,7 +931,9 @@ BrowserGlue.prototype = { + } + if (SCALING_PROBE_NAME) { + let scaling = aWindow.devicePixelRatio * 100; +- Services.telemetry.getHistogramById(SCALING_PROBE_NAME).add(scaling); ++ try { ++ Services.telemetry.getHistogramById(SCALING_PROBE_NAME).add(scaling); ++ } catch (ex) {} + } + }, +