From ba6a1e699c9f438d9e96ba116671f5731d63b599 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@parabola.nu>
Date: Thu, 4 Dec 2014 18:40:14 -0200
Subject: iceweasel: import changes from debian/browser.js.in to vendor.js

---
 libre/iceweasel/PKGBUILD  | 2 +-
 libre/iceweasel/vendor.js | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'libre')

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);
-- 
cgit v1.2.3