summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2014-12-04 18:40:14 -0200
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2014-12-04 18:40:14 -0200
commitba6a1e699c9f438d9e96ba116671f5731d63b599 (patch)
tree9afa884adf30d3f0977fbd5ff86fcc26bc3dc935
parent985fbde35f2c12478848431e758554a4e40d503b (diff)
iceweasel: import changes from debian/browser.js.in to vendor.js
-rw-r--r--libre/iceweasel/PKGBUILD2
-rw-r--r--libre/iceweasel/vendor.js6
2 files changed, 7 insertions, 1 deletions
diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD
index 6ed6d74aa..2fa8a586b 100644
--- a/libre/iceweasel/PKGBUILD
+++ b/libre/iceweasel/PKGBUILD
@@ -60,7 +60,7 @@ md5sums=('67c5ab2f4551c2743e70a3bcb041bf66'
'b03a979a78484503ba8dddad4f2c96d1'
'fd8f61f2ae44e5b0e0b2c7b433695980'
'1c42509891cf6843660a5f3c69896e80'
- 'ab5cbf8fdfa94bef0272c16261f8127e'
+ '2e99ba1f020a4bae19260f4c321cf97d'
'16a112aaeee34ff3cae1fc1a521448a0'
'6e335a517c68488941340ee1c23f97b0')
diff --git a/libre/iceweasel/vendor.js b/libre/iceweasel/vendor.js
index 314d7b48a..fd7a153b5 100644
--- a/libre/iceweasel/vendor.js
+++ b/libre/iceweasel/vendor.js
@@ -38,3 +38,9 @@ pref("geo.wifi.uri", "");
// Disable Sponsored Tiles
pref("browser.newtabpage.directory.source", "data:application/json,{}");
pref("browser.newtabpage.directory.ping", "");
+
+// Avoid openh264 being downloaded.
+pref("media.gmp-manager.url.override", "data:text/plain,");
+
+// Disable openh264.
+pref("media.gmp-gmpopenh264.provider.enabled", false);