summaryrefslogtreecommitdiff
path: root/www/firefox/files/patch-bug1299694
diff options
context:
space:
mode:
authorJan Beich <jbeich@FreeBSD.org>2016-11-02 01:42:30 +0000
committerJan Beich <jbeich@FreeBSD.org>2016-11-02 01:42:30 +0000
commit74e1bc62bd8f8fedafe93ec3efc61be86e27f7ab (patch)
tree171dc9211a3eac82863466179ee9da413dd65f85 /www/firefox/files/patch-bug1299694
parentwww/firefox-esr: update to 45.5esr (diff)
www/firefox: update to 50.0 (rc1)
More candidates are likely to come before the official announcement (aka the rush hour) scheduled on 2016-11-15. This one intended to pick up upstream security fixes earlier while looking for downstream regressions. Changes: https://www.mozilla.org/firefox/50.0/releasenotes/ Security: d1853110-07f4-4645-895b-6fd462ad0589 MFH: 2016Q4 (piling up)
Notes
Notes: svn path=/head/; revision=425099
Diffstat (limited to 'www/firefox/files/patch-bug1299694')
-rw-r--r--www/firefox/files/patch-bug129969431
1 files changed, 0 insertions, 31 deletions
diff --git a/www/firefox/files/patch-bug1299694 b/www/firefox/files/patch-bug1299694
deleted file mode 100644
index 2742c32b4f4a..000000000000
--- a/www/firefox/files/patch-bug1299694
+++ /dev/null
@@ -1,31 +0,0 @@
-commit 6ab2496
-Author: Chris Pearce <cpearce@mozilla.com>
-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):