From 9b6fb6a1812e999f738a7d076a24ed6bcaccb57c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Thu, 22 Jan 2015 16:40:13 -0200 Subject: iceweasel: enable WebIDE again but without nonfree Firefox OS installing and fix bug #652 -> https://labs.parabola.nu/issues/652 --- libre/iceweasel/PKGBUILD | 16 ++---- libre/iceweasel/devtools-appmanager-webide.patch | 72 ------------------------ libre/iceweasel/libre.patch | 34 +++++++++++ libre/iceweasel/vendor.js | 3 - 4 files changed, 39 insertions(+), 86 deletions(-) delete mode 100644 libre/iceweasel/devtools-appmanager-webide.patch diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index e3f8b9310..3b46f4742 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=2 +pkgrel=3 pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based on Mozilla Firefox." arch=(i686 x86_64 mips64el) @@ -52,19 +52,17 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2" $pkgname-install-dir.patch vendor.js rhbz-966424.patch - $pkgname-fixed-loading-icon.png - devtools-appmanager-webide.patch) + $pkgname-fixed-loading-icon.png) sha256sums=('7702b1873757c8ec2f911680ff63ded124ab7b3610ef5c1456581146451a641e' '0b59e3f72ac50475832fbd64055411bb81264526f06492f2a5801e4d859da7de' '831720c1efd6e67d54e70cf4e2b02f9554aa6c914315be6dd2ca837adbbdcabd' - '0eb8ee36d4dedc613000675b6a70e47e8971a51bdbf3d8cd70a56546e8db1959' + 'e3aa10890a54c312d7a8aa36e4371f78799a8bd7a1b887612fcd7223d2fe30bf' '93e3001ce152e1d142619e215a9ef07dd429943b99d21726c25da9ceb31e31cd' '84895ff873a89770c62c4568fd111ac92d540b4499b2b77258c6c88a929ef049' '3aea6676f1e53a09673b6ae219d281fc28054beb6002b09973611c02f827651d' - '549c2ddc27bec7dd92ee6a6fa768937b3a734a04944f87850812b59806fc2d74' + '09b1869f948df05c196a47883d61cad79c99020f9160d5ebe5bc827242138c57' 'd25c6e95d20ec622a51346897d986fdd97074023d6a02bee0533773a195f8233' - '68e3a5b47c6d175cc95b98b069a15205f027cab83af9e075818d38610feb6213' - 'fa8d6f5c51677fe385b990022845312ba879ec2daadde186de08583e07562c01') + '68e3a5b47c6d175cc95b98b069a15205f027cab83af9e075818d38610feb6213') prepare() { export DEBIAN_BUILD="mozilla-release" @@ -81,10 +79,6 @@ prepare() { 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" \ browser/base/content/abouthome diff --git a/libre/iceweasel/devtools-appmanager-webide.patch b/libre/iceweasel/devtools-appmanager-webide.patch deleted file mode 100644 index 4dbf43dee..000000000 --- a/libre/iceweasel/devtools-appmanager-webide.patch +++ /dev/null @@ -1,72 +0,0 @@ -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 2015-01-16 14:43:55.583334174 -0200 -+++ mozilla-release/browser/app/profile/firefox.js 2015-01-16 14:46:24.440893562 -0200 -@@ -1344,12 +1344,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 2015-01-09 02:38:16.000000000 -0200 -+++ mozilla-release/browser/devtools/webide/webide-prefs.js 2015-01-16 14:51:30.686269793 -0200 -@@ -2,32 +2,24 @@ - # 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); --#ifdef MOZ_DEV_EDITION --pref("devtools.webide.autoinstallFxdtAdapters", true); --#else -+pref("devtools.webide.showProjectEditor", false); -+pref("devtools.webide.templatesURL", ""); -+pref("devtools.webide.autoinstallADBHelper", false); - pref("devtools.webide.autoinstallFxdtAdapters", false); --#endif --pref("devtools.webide.restoreLastProject", true); --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.adaptersAddonURL", "https://ftp.mozilla.org/pub/mozilla.org/labs/fxdt-adapters/#OS#/fxdt-adapters-#OS#-latest.xpi"); --pref("devtools.webide.adaptersAddonID", "fxdevtools-adapters@mozilla.org"); --pref("devtools.webide.monitorWebSocketURL", "ws://localhost:9000"); -+pref("devtools.webide.restoreLastProject", false); -+pref("devtools.webide.addonsURL", ""); -+pref("devtools.webide.simulatorAddonsURL", ""); -+pref("devtools.webide.simulatorAddonID", ""); -+pref("devtools.webide.adbAddonURL", ""); -+pref("devtools.webide.adbAddonID", ""); -+pref("devtools.webide.adaptersAddonURL", ""); -+pref("devtools.webide.adaptersAddonID", ""); -+pref("devtools.webide.monitorWebSocketURL", ""); - pref("devtools.webide.lastConnectedRuntime", ""); - pref("devtools.webide.lastSelectedProject", ""); --pref("devtools.webide.widget.autoinstall", true); --#ifdef MOZ_DEV_EDITION --pref("devtools.webide.widget.enabled", true); --pref("devtools.webide.widget.inNavbarByDefault", true); --#else -+pref("devtools.webide.widget.autoinstall", false); - pref("devtools.webide.widget.enabled", false); - pref("devtools.webide.widget.inNavbarByDefault", false); --#endif - pref("devtools.webide.busyTimeout", 10000); diff --git a/libre/iceweasel/libre.patch b/libre/iceweasel/libre.patch index 5990ee31d..089be5913 100644 --- a/libre/iceweasel/libre.patch +++ b/libre/iceweasel/libre.patch @@ -668,6 +668,40 @@ diff -Nur mozilla-release.orig/browser/base/jar.mn mozilla-release/browser/base/ content/browser/aboutNetError.xhtml (content/aboutNetError.xhtml) +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 2015-01-09 02:38:16.000000000 -0200 ++++ mozilla-release/browser/devtools/webide/webide-prefs.js 2015-01-22 15:54:09.172617578 -0200 +@@ -4,21 +4,21 @@ + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + + 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.templatesURL", ""); ++pref("devtools.webide.autoinstallADBHelper", false); + #ifdef MOZ_DEV_EDITION + pref("devtools.webide.autoinstallFxdtAdapters", true); + #else + pref("devtools.webide.autoinstallFxdtAdapters", false); + #endif + pref("devtools.webide.restoreLastProject", true); +-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.adaptersAddonURL", "https://ftp.mozilla.org/pub/mozilla.org/labs/fxdt-adapters/#OS#/fxdt-adapters-#OS#-latest.xpi"); +-pref("devtools.webide.adaptersAddonID", "fxdevtools-adapters@mozilla.org"); ++pref("devtools.webide.addonsURL", ""); ++pref("devtools.webide.simulatorAddonsURL", ""); ++pref("devtools.webide.simulatorAddonID", ""); ++pref("devtools.webide.adbAddonURL", ""); ++pref("devtools.webide.adbAddonID", ""); ++pref("devtools.webide.adaptersAddonURL", ""); ++pref("devtools.webide.adaptersAddonID", ""); + pref("devtools.webide.monitorWebSocketURL", "ws://localhost:9000"); + pref("devtools.webide.lastConnectedRuntime", ""); + pref("devtools.webide.lastSelectedProject", ""); diff -Nur mozilla-release.orig/browser/locales/en-US/chrome/browser/aboutHome.dtd mozilla-release/browser/locales/en-US/chrome/browser/aboutHome.dtd --- mozilla-release.orig/browser/locales/en-US/chrome/browser/aboutHome.dtd 2015-01-09 02:38:16.000000000 -0200 +++ mozilla-release/browser/locales/en-US/chrome/browser/aboutHome.dtd 2015-01-16 15:03:01.408257268 -0200 diff --git a/libre/iceweasel/vendor.js b/libre/iceweasel/vendor.js index ea1431208..430f41604 100644 --- a/libre/iceweasel/vendor.js +++ b/libre/iceweasel/vendor.js @@ -47,6 +47,3 @@ pref("security.ssl3.ecdhe_ecdsa_rc4_128_sha", false); pref("security.ssl3.ecdhe_rsa_rc4_128_sha", false); pref("security.ssl3.rsa_rc4_128_md5", false); pref("security.ssl3.rsa_rc4_128_sha", false); -pref("security.ssl3.rsa_aes_128_sha", false); -pref("security.ssl3.rsa_aes_256_sha", false); -pref("security.ssl3.rsa_des_ede3_sha", false); -- cgit v1.2.3-2-g168b