icecat: enable App Manager again and fix bug #652 -> https://labs.parabola.nu/issues/652

3 files changed, 4 insertions, 30 deletions

diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index 1df3561d1..ecc2b688c 100644
--- a/libre/icecat/PKGBUILD
+++ b/libre/icecat/PKGBUILD
@@ -14,7 +14,7 @@ _pgo=true
 
 pkgname=icecat
 pkgver=31.2.0
-pkgrel=3
+pkgrel=4
 
 pkgdesc="GNU IceCat, the standalone web browser based on Mozilla Firefox."
 arch=(i686 x86_64 mips64el)
@@ -40,8 +40,7 @@ source=("http://ftp.gnu.org/gnu/gnuzilla/$pkgver/$pkgname-$pkgver.tar.xz"
         $pkgname-install-dir.patch
         vendor.js
         rhbz-966424.patch
-        $pkgname-fixed-loading-icon.png
-        devtools-appmanager.patch)
+        $pkgname-fixed-loading-icon.png)
 sha256sums=('b0c532e7b768230b66e5fb43bebfe300c344842806db088ee0467cc01c9d290b'
             'e0779596c2aafa0f77f09094a218940b1dc5120cd6425d4ea1e8c96be44711ff'
             '92d7ea9feb8d2814d1abaf5cf4012983a2fb9cc56b26a5d7c7c3898aedf06fb4'
@@ -49,10 +48,9 @@ sha256sums=('b0c532e7b768230b66e5fb43bebfe300c344842806db088ee0467cc01c9d290b'
             '93e3001ce152e1d142619e215a9ef07dd429943b99d21726c25da9ceb31e31cd'
             'c2c636fc65e7f6506a7305b930ad403100bc0b51401bd7d6567b48df3654f82e'
             '5bdab2de5520fb4d3dbc453d9f73d20e0e077bf652bc780fc17184ba6c718a47'
-            '228b35a740dc13533bdf00dcf478076ef05b181d017f30e7f75cd3976f763548'
+            '536e82133ba06faccd31620c742dd2b95f1c2e0331934bb8ff17843436dc2142'
             'd25c6e95d20ec622a51346897d986fdd97074023d6a02bee0533773a195f8233'
-            '68e3a5b47c6d175cc95b98b069a15205f027cab83af9e075818d38610feb6213'
-            '2de82fc3d651362f06c2ec4a30d504198732bb54602a5d81c35159767ce40195')
+            '68e3a5b47c6d175cc95b98b069a15205f027cab83af9e075818d38610feb6213')
 
 prepare() {
   export GNU_BUILD="gnuzilla-release"
@@ -60,10 +58,6 @@ prepare() {
   mv $pkgname-$pkgver "$srcdir/$GNU_BUILD"
   cd "$srcdir/$GNU_BUILD"
 
-  # Disable appmanager
-  # Note: to enable appmanager is necessary to use a 100% free "Firefox OS" distribution and ADBHelper Parabola package.
-  patch -Np1 -i "$srcdir/devtools-appmanager.patch"
-
   # Put gnu_headshadow.png on the source code
   install -m644 "$srcdir/gnu_headshadow.png" \
     browser/base/content/abouthome
diff --git a/libre/icecat/devtools-appmanager.patch b/libre/icecat/devtools-appmanager.patch
deleted file mode 100644
index 0770abc31..000000000
--- a/libre/icecat/devtools-appmanager.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -Nur a/browser/app/profile/icecat.js b/browser/app/profile/icecat.js
---- a/browser/app/profile/icecat.js	2014-10-21 09:53:09.000000000 -0200
-+++ b/browser/app/profile/icecat.js	2014-12-19 14:33:04.453900819 -0200
-@@ -1235,9 +1235,10 @@
- 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);
- 
- // Toolbox preferences
- pref("devtools.toolbox.footer.height", 250);
diff --git a/libre/icecat/vendor.js b/libre/icecat/vendor.js
index 7762db0dd..9eab9721b 100644
--- a/libre/icecat/vendor.js
+++ b/libre/icecat/vendor.js
@@ -33,6 +33,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);