iceweasel: disable appmanager/webide

3 files changed, 62 insertions, 11 deletions

diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD
index 3e448309e..cea378297 100644
--- a/libre/iceweasel/PKGBUILD
+++ b/libre/iceweasel/PKGBUILD
@@ -52,7 +52,8 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2"
         $pkgname-install-dir.patch
         vendor.js
         rhbz-966424.patch
-        $pkgname-fixed-loading-icon.png)
+        $pkgname-fixed-loading-icon.png
+        devtools-appmanager-webide.patch)
 md5sums=('67c5ab2f4551c2743e70a3bcb041bf66'
          '5d72813950fdcf47a38b2f0eb7ebe33d'
          '5eca2c1dbdd9c043b24de39cd05d6e8f'
@@ -60,9 +61,10 @@ md5sums=('67c5ab2f4551c2743e70a3bcb041bf66'
          'b03a979a78484503ba8dddad4f2c96d1'
          'fd8f61f2ae44e5b0e0b2c7b433695980'
          '1c42509891cf6843660a5f3c69896e80'
-         '01d3f73ccc5153182ac07b2d14b54fa6'
+         '2e99ba1f020a4bae19260f4c321cf97d'
          '16a112aaeee34ff3cae1fc1a521448a0'
-         '6e335a517c68488941340ee1c23f97b0')
+         '6e335a517c68488941340ee1c23f97b0'
+         '5e00db4323ee0191a8c0d68b4c6795f6')
 
 prepare() {
   export DEBIAN_BUILD="mozilla-release"
@@ -78,6 +80,10 @@ prepare() {
   rm -v debian/patches/l10n/Place-google-and-gmail-before-yandex.patch || true
 
   quilt push -av
+
+  # Disable appmanager/webide
+  # Note: to enable appmanager/webide is necessary to use a 100% free "Firefox OS" distribution and ADBHelper Parabola package.
+  patch -Np1 -i "$srcdir/devtools-appmanager-webide.patch"
  
   # Put gnu_headshadow.png on the source code
   install -m644 "$srcdir/gnu_headshadow.png" \
diff --git a/libre/iceweasel/devtools-appmanager-webide.patch b/libre/iceweasel/devtools-appmanager-webide.patch
new file mode 100644
index 000000000..373c34ceb
--- /dev/null
+++ b/libre/iceweasel/devtools-appmanager-webide.patch
@@ -0,0 +1,53 @@
+diff -Nur mozilla-release.orig/browser/app/profile/firefox.js mozilla-release/browser/app/profile/firefox.js
+--- mozilla-release.orig/browser/app/profile/firefox.js	2014-11-26 00:17:06.000000000 -0200
++++ mozilla-release/browser/app/profile/firefox.js	2014-12-19 13:30:18.447609374 -0200
+@@ -1303,12 +1303,14 @@
+ pref("devtools.commands.dir", "");
+ 
+ // Enable the app manager
+-pref("devtools.appmanager.enabled", true);
+-pref("devtools.appmanager.lastTab", "help");
+-pref("devtools.appmanager.manifestEditor.enabled", true);
++// Note: to enable appmanager is necessary to use a 100% free "Firefox OS" distribution.
++pref("devtools.appmanager.enabled", false);
++pref("devtools.appmanager.lastTab", "");
++pref("devtools.appmanager.manifestEditor.enabled", false);
+ 
+ // Enable DevTools WebIDE by default
+-pref("devtools.webide.enabled", true);
++// Note: to enable webide is necessary to use a 100% free "Firefox OS" distribution and ADBHelper Parabola package.
++pref("devtools.webide.enabled", false);
+ 
+ // Toolbox preferences
+ pref("devtools.toolbox.footer.height", 250);
+diff -Nur mozilla-release.orig/browser/devtools/webide/webide-prefs.js mozilla-release/browser/devtools/webide/webide-prefs.js
+--- mozilla-release.orig/browser/devtools/webide/webide-prefs.js	2014-11-26 00:17:07.000000000 -0200
++++ mozilla-release/browser/devtools/webide/webide-prefs.js	2014-12-19 13:30:28.444671229 -0200
+@@ -2,16 +2,17 @@
+ # This Source Code Form is subject to the terms of the Mozilla Public
+ # License, v. 2.0. If a copy of the MPL was not distributed with this
+ # file, You can obtain one at http://mozilla.org/MPL/2.0/.
++# Note: to enable webide is necessary to use a 100% free "Firefox OS" distribution and ADBHelper Parabola package.
+ 
+-pref("devtools.webide.showProjectEditor", true);
+-pref("devtools.webide.templatesURL", "https://code.cdn.mozilla.net/templates/list.json");
+-pref("devtools.webide.autoinstallADBHelper", true);
++pref("devtools.webide.showProjectEditor", false);
++pref("devtools.webide.templatesURL", "");
++pref("devtools.webide.autoinstallADBHelper", false);
+ pref("devtools.webide.lastprojectlocation", "");
+-pref("devtools.webide.restoreLastProject", true);
++pref("devtools.webide.restoreLastProject", false);
+ pref("devtools.webide.enableLocalRuntime", false);
+-pref("devtools.webide.addonsURL", "https://ftp.mozilla.org/pub/mozilla.org/labs/fxos-simulator/index.json");
+-pref("devtools.webide.simulatorAddonsURL", "https://ftp.mozilla.org/pub/mozilla.org/labs/fxos-simulator/#VERSION#/#OS#/fxos_#SLASHED_VERSION#_simulator-#OS#-latest.xpi");
+-pref("devtools.webide.simulatorAddonID", "fxos_#SLASHED_VERSION#_simulator@mozilla.org");
+-pref("devtools.webide.adbAddonURL", "https://ftp.mozilla.org/pub/mozilla.org/labs/fxos-simulator/adb-helper/#OS#/adbhelper-#OS#-latest.xpi");
+-pref("devtools.webide.adbAddonID", "adbhelper@mozilla.org");
+-pref("devtools.webide.monitorWebSocketURL", "ws://localhost:9000");
++pref("devtools.webide.addonsURL", "");
++pref("devtools.webide.simulatorAddonsURL", "");
++pref("devtools.webide.simulatorAddonID", "");
++pref("devtools.webide.adbAddonURL", "");
++pref("devtools.webide.adbAddonID", "");
++pref("devtools.webide.monitorWebSocketURL", "");
diff --git a/libre/iceweasel/vendor.js b/libre/iceweasel/vendor.js
index f84f623d2..fd7a153b5 100644
--- a/libre/iceweasel/vendor.js
+++ b/libre/iceweasel/vendor.js
@@ -44,11 +44,3 @@ 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"; "");