From ff587257bc35c48d17b5b88e933b28355cf25b2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?=
 <emulatorman@parabola.nu>
Date: Fri, 19 Dec 2014 01:18:10 -0200
Subject: iceweasel-1:34.0.deb1-2: fix freedom issue #619 ->
 https://labs.parabola.nu/issues/619

---
 libre/iceweasel/PKGBUILD  | 4 ++--
 libre/iceweasel/vendor.js | 8 ++++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

(limited to 'libre')

diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD
index 2fa8a586b..3e448309e 100644
--- a/libre/iceweasel/PKGBUILD
+++ b/libre/iceweasel/PKGBUILD
@@ -24,7 +24,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 pkgname=iceweasel
 epoch=1
 pkgver=$_debver.$_debrel
-pkgrel=1
+pkgrel=2
 
 pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based on Mozilla Firefox."
 arch=(i686 x86_64 mips64el)
@@ -60,7 +60,7 @@ md5sums=('67c5ab2f4551c2743e70a3bcb041bf66'
          'b03a979a78484503ba8dddad4f2c96d1'
          'fd8f61f2ae44e5b0e0b2c7b433695980'
          '1c42509891cf6843660a5f3c69896e80'
-         '2e99ba1f020a4bae19260f4c321cf97d'
+         '01d3f73ccc5153182ac07b2d14b54fa6'
          '16a112aaeee34ff3cae1fc1a521448a0'
          '6e335a517c68488941340ee1c23f97b0')
 
diff --git a/libre/iceweasel/vendor.js b/libre/iceweasel/vendor.js
index fd7a153b5..f84f623d2 100644
--- a/libre/iceweasel/vendor.js
+++ b/libre/iceweasel/vendor.js
@@ -44,3 +44,11 @@ pref("media.gmp-manager.url.override", "data:text/plain,");
 
 // Disable openh264.
 pref("media.gmp-gmpopenh264.provider.enabled", false);
+
+// Make sure that WebIDE avoid installing nonfree Firefox OS in development tools
+pref("devtools.webide.adbAddonID"; "");
+pref("devtools.webide.adbAddonURL"; "");
+pref("devtools.webide.addonsURL"; "");
+pref("devtools.webide.autoinstallADBHelper"; "false");
+pref("devtools.webide.simulatorAddonID"; "");
+pref("devtools.webide.simulatorAddonsURL"; "");
-- 
cgit v1.2.3-2-g168b