icecat: make searx the default search engine and drop mips64el support

2 files changed, 91 insertions, 81 deletions

diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index 7d09e42c7..db70b8c2c 100644
--- a/libre/icecat/PKGBUILD
+++ b/libre/icecat/PKGBUILD
@@ -18,7 +18,7 @@ pkgver=${_pkgver//-/_}
 pkgrel=5
 
 pkgdesc="GNU IceCat, the standalone web browser based on Mozilla Firefox."
-arch=(i686 x86_64 mips64el)
+arch=(i686 x86_64)
 license=(MPL GPL LGPL)
 depends=(alsa-lib dbus-glib desktop-file-utils gtk2 hicolor-icon-theme hunspell icu=55.1 libevent libvpx=1.4.0 libxt mime-types mozilla-common mozilla-searchplugins nss sqlite startup-notification)
 makedepends=(diffutils gst-plugins-base-libs imake inetutils libpulse mesa python2 unzip yasm zip)
@@ -48,7 +48,7 @@ sha256sums=('370087d0adadf8b1c1e6a9920e26488a8902b9dc461d305f258fddb26a129d87'
             'SKIP'
             '541532698e04563ac60cb4d6c75891a8eec828df8dc19e2c20c6f84e560efb56'
             '92d7ea9feb8d2814d1abaf5cf4012983a2fb9cc56b26a5d7c7c3898aedf06fb4'
-            '8082a8a5adf21c50fa77650c74adcd6fedbf7bedcdb6b8ae29529ca96adeb05d'
+            'df92188c828c104bd52e4eb090fbf3ffd745d890f9252edbf6be6edc6d5ba790'
             '93e3001ce152e1d142619e215a9ef07dd429943b99d21726c25da9ceb31e31cd'
             '52df9ffeb52166ed4abd9a132ee4a9017b9c4980f0725ba383610ccfb06d4745'
             '5bdab2de5520fb4d3dbc453d9f73d20e0e077bf652bc780fc17184ba6c718a47'
@@ -115,31 +115,6 @@ prepare() {
     cat "$srcdir/mozconfig.pgo" >> .mozconfig
   fi
 
-  # From js on abslibre-mips64el.git
-  if [ "$CARCH" = "mips64el" ]; then
-      msg "Force disabling JIT."
-      sed -ri 's/#define ENABLE_(JIT|ASSEMBLER) 1/#define ENABLE_\1 0/' \
-          js/src/assembler/wtf/Platform.h
-      sed -ri 's/ENABLE_(JIT|ASSEMBLER)=1/ENABLE_\1=0/' js/src/Makefile.{in,ref}
-
-      echo "ac_add_options --disable-methodjit" >> .mozconfig
-      echo "ac_add_options --disable-tracejit" >> .mozconfig
-  fi
-
-  # This is a bug, we should fix it
-  if [ "$CARCH" = "mips64el" ]; then
-      # Fix MIPS N32 support.
-      sed -i 's/defined(_ABIO32)/(defined(_ABIO32) || defined(_ABIN32))/' \
-          js/src/assembler/wtf/Platform.h
-      # Disable JIT.
-      sed -ri 's/#define ENABLE_(JIT|ASSEMBLER) 1/#define ENABLE_\1 0/' \
-          js/src/assembler/wtf/Platform.h
-      sed -ri 's/ENABLE_(JIT|ASSEMBLER)=1/ENABLE_\1=0/' js/src/Makefile.in
-      echo 'ac_add_options --disable-methodjit' >> .mozconfig
-      echo 'ac_add_options --disable-tracejit' >> .mozconfig
-      echo 'ac_add_options --disable-jemalloc' >> .mozconfig
-  fi
-
   # Fixing for libvpx >= 1.4.0
   sed -i 's|IMG_FMT_I420|VPX_IMG_FMT_I420|;
           s|PLANE_U|VPX_PLANE_U|;
diff --git a/libre/icecat/libre.patch b/libre/icecat/libre.patch
index 16f77f72e..8138985ad 100644
--- a/libre/icecat/libre.patch
+++ b/libre/icecat/libre.patch
@@ -1,6 +1,6 @@
 diff -Nur a/browser/app/profile/icecat.js b/browser/app/profile/icecat.js
---- a/browser/app/profile/icecat.js	2014-10-09 12:56:31.000000000 -0200
-+++ b/browser/app/profile/icecat.js	2014-10-21 14:05:40.131766712 -0200
+--- a/browser/app/profile/icecat.js	2015-07-13 19:14:27.000000000 -0300
++++ b/browser/app/profile/icecat.js	2015-08-18 02:36:42.167590967 -0300
 @@ -281,11 +281,6 @@
  pref("browser.slowStartup.timeThreshold", 50000);
  pref("browser.slowStartup.maxSamples", 5);
@@ -13,9 +13,21 @@ diff -Nur a/browser/app/profile/icecat.js b/browser/app/profile/icecat.js
  pref("browser.enable_automatic_image_resizing", true);
  pref("browser.chrome.site_icons", true);
  pref("browser.chrome.favicons", true);
+@@ -1746,11 +1741,6 @@
+ pref("pfs.datasource.url", "http://gnuzilla.gnu.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%");
+ pref("pfs.filehint.url", "http://gnuzilla.gnu.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%");
+ 
+-// I'm feeling Ducky.
+-pref("keyword.URL", "https://duckduckgo.com/html?t=gnu&q=!+");
+-pref("browser.search.defaultenginename", "DuckDuckGo");
+-pref("browser.search.order.extra.duckduckgo", "DuckDuckGo");
+-
+ // https://directory.fsf.org/wiki/Disable_DHE
+ pref("security.ssl3.dhe_rsa_aes_128_sha", false);
+ pref("security.ssl3.dhe_rsa_aes_256_sha", false);
 diff -Nur a/browser/base/content/abouthome/aboutHome.css b/browser/base/content/abouthome/aboutHome.css
---- a/browser/base/content/abouthome/aboutHome.css	2014-10-09 12:53:31.000000000 -0200
-+++ b/browser/base/content/abouthome/aboutHome.css	2014-10-21 14:11:09.936570764 -0200
+--- a/browser/base/content/abouthome/aboutHome.css	2015-07-13 19:10:24.000000000 -0300
++++ b/browser/base/content/abouthome/aboutHome.css	2015-08-18 02:37:30.095295232 -0300
 @@ -49,11 +49,6 @@
    background-repeat: no-repeat;
  }
@@ -34,7 +46,7 @@ diff -Nur a/browser/base/content/abouthome/aboutHome.css b/browser/base/content/
    height: 28px;
 -  width: 70px;
 -  min-width: 70px;
-+  width: 47px;
++  width: 28px;
  }
  
  #searchText {
@@ -158,9 +170,9 @@ diff -Nur a/browser/base/content/abouthome/aboutHome.css b/browser/base/content/
  }
  
 diff -Nur a/browser/base/content/abouthome/aboutHome.js b/browser/base/content/abouthome/aboutHome.js
---- a/browser/base/content/abouthome/aboutHome.js	2014-10-09 12:53:31.000000000 -0200
-+++ b/browser/base/content/abouthome/aboutHome.js	2014-10-21 14:21:10.012011384 -0200
-@@ -3,149 +3,44 @@
+--- a/browser/base/content/abouthome/aboutHome.js	2015-07-13 19:10:24.000000000 -0300
++++ b/browser/base/content/abouthome/aboutHome.js	2015-08-18 02:40:01.024730697 -0300
+@@ -3,149 +3,54 @@
   * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
  
  const SEARCH_ENGINES = {
@@ -290,41 +302,51 @@ diff -Nur a/browser/base/content/abouthome/aboutHome.js b/browser/base/content/a
 -           "k4w0jAcTAyllnBoh9Kxw/tEdS8cuT0WyH4vX1PYD5qMBzQDE2eFDxz09zsscWuwVHX6a8YwaFAiM" +
 -           "NAkHr4vdUdf82rQN6JwnSl4N4vAxeKdxP2A+mjXuKTvcXcY9TdOnyxPk4zKZ/vbRAqe75C3QfZZY" +
 -           "0P/y6/7299z+H4QrdGsoib8JAAAAAElFTkSuQmCC"
-+  "DuckDuckGo HTML": {
-+     image: "data:image/png;base64," +
-+           "iVBORw0KGgoAAAANSUhEUgAAAC8AAAAcCAYAAADxyeavAAAABmJLR0QA/wD/AP+gvaeTAAAACXBI" +
-+           "WXMAAA3XAAAN1wFCKJt4AAAAB3RJTUUH3AwBERgxGkWttAAABtVJREFUWMPtmGtwVdUVx397n3Pu" +
-+           "K8m9uXlASCHQIBqeEooEDAymUEAKEaGlUoeOtbYdnSmdYjud6fjBdhytLS0zdRzbWkAGsCBtSktr" +
-+           "RRQFY4gWaQZQUJFwCUhISHLzuo9zzj67Hy4Cd+RD6XDBD90z59uZdX5rrf96nC24xkd7jtlb/7VS" +
-+           "da6jQEYKQiA8nUwlzcm39oWfXnvuWn5LXCtDyk6V9N6x4FGvu2ceydQw7amA8PsNAO04rvD7E8KQ" +
-+           "HxlTqncWbnnu0c8MfM+C+mfVh8fv144jfXPuwJoxA5QLUoJS4Gm0cnF27cY52IKsGOFas2ofDP/q" +
-+           "yT/cMPieurmjvb7BfdhOuTl1CtbM27FfehnnjTdB6+yXLQv/nfMwqqqwd7+COtWGHDKkMfit+xYH" +
-+           "V349fl3hu2fPne6dOv26UXWL36qdjtO4H/ffLWBZYBgIkW1aaw1KIQwTY9IEzPFjcfY1opXXWdS8" +
-+           "t0wI4V03+PPjqm1z0kTLml5D4hdrIBRC5ueh471opUDKTzlw0QlABAIEVq4gtXELsqT4fNH+vaVX" +
-+           "yyD/F/Cu22a2GUOHWOb4sQw+9jhCCNwVy8k/2Exh6zEiL2zBP6cOhMg4cnm0hEAIgU6lSG36I8EH" +
-+           "v4Pu6y/pqZu/PueR75k5Z40biz2ct3oVid+tg1QK7XlQ+XkYNZLQN+4lWDcbPA/7zztIbdmK09SM" +
-+           "yAt9OgtKIaNRAl9dSnLbdl18+J2wEGIgJ/D9q38UTv1pR8z/pTmFWinsV19DSIl2XOTSeoqeWpsl" +
-+           "j09kM/DIT0lt3IQwzSvKyJo0AW3bYPnejv69oSYnskm/uHsWEPEvXYK98x9gGBmAihFEn3yMWDxN" +
-+           "v62ywPvTinP3fRsqKtBXip4QqLPtyLIyvFNt07TWMifwwm8u9dXOEKmGv4A/gAA0IKtvpVsZ9KYV" +
-+           "QTO7UC1DUHZTOaG7F2d6/hWO19GJMfxzeL29xO9e/uOcwOu0PducUo29Zy/CMi/qTuWFKMz3Ma4k" +
-+           "wJneNN5lPT5gSp7Z20bnvEXgumg0WpP14HlopTKySiTrcwM/mChGCoTnwWXRdfv60I7L0XMJxjze" +
-+           "RMLObtnn+9OoqjGgTUhIZL7CrEohIypjRgjUqVPIMaPxunvK/lse86pkEwrlXRBqdtrbTqNTKaqG" +
-+           "5nP8J7cT8sks3f980U1AF/0L41izbMzKNKJAkdxcTLohkmmpPXFkaSnuB8fNnMBj2y5CWGid5YBx" +
-+           "tp1ET5xIOExFNPDJeonu24n38SqEHQMg72EDr89AfeQj9fxQnJYQWBrQiEAAkkkIBr3cwLtuHMMM" +
-+           "ak8jjMuKsqOTwY4OIiMrLkksdQgduwvdaZHYPgwZcfE6LJzDQVSrD2FqxAVO7WmM4cOxm5qRxUWD" +
-+           "uek20Wird+YMxpjKi5NTC4FQCrvlUNb4xyiBYCXCL7D35ZPcWEz6n2GwBf76OP5FvWhHZEpea0RJ" +
-+           "MbqrC5Rqygm81xPfYL/+BoEV90A6fWnKmSbqrX+hL/RtAOEbTnrPQ6RfihD+dRuR52IUvnCCyLMx" +
-+           "Aov6UCf8F78u8vLQA4MgJb6vLN2WE9kYI0c0qw8+tIXf5zMqKlAdHQgpQUqCh48woBQFFwYXgE4G" +
-+           "SawvRmwqQg51EHkeXp+B126B1AhDAwI5rAwViyFLSwbyf/C93TmJfFHjniOypORo4olfEvjuA5d2" +
-+           "dinxn4zRf64jOzITxyJ8mYKk3cQ94cc7b4KpEUYmb9p28N85D/e9Y1g1U1fmdKs0J0/+snYc7R46" +
-+           "jDV9Gtp1M51HStz9zbTbJzkaf4/OdC/p2qkMhH0cmhhm/iOjcE0QaITI1IZ2HPzLl+G+exRhmrGC" +
-+           "36zdcVUsVwsfeX7Dma6pMx+wX35lXWjVQ2DbOM1vIywLeeAg79c6bDj+NzpUlFHBCAM/HI0oD/KO" +
-+           "GKS11MfYM2mUASiFf9kSdFc3duObnlU9+R5a3sr9Pl98oHG9CATWDf7sCXwLF+BbOB8MA1/LYVwv" +
-+           "YzKW+Ji23pO0lucjTYnlaoS+tEn6Fi4A18VuasJXM21lYcPW5uv6D3t+0m3biceX+ZbUC1GQj9vV" +
-+           "w7HVc9iXfpfKwhqmRW+hPFRG1zNP07Dr9yxr9RMYPwFj/FjUsfexG/e71heqv1nYsHXzDbk96K6u" +
-+           "uctLJDeLcEG+cfMYjPvvxf/FuViX70QDg6gdO7Hbz2K/tg8ViyFCoVZZXl4f/ev2Izf83qZryvQ1" +
-+           "Opn6vo7HTQBjdCWyrAxcB9V2Gu9sO0ipZTTab42rWhHetvnFz8yl08VM1NYtIZlcrNPpm73+AQtD" +
-+           "ahkOJ3HVAWtW7a7wb596lf8f+A8mm/+hmETyjwAAAABJRU5ErkJggg=="
++  "searx": {
++    image: "data:image/png;base64,\
++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"
    }
  };
  
@@ -345,7 +367,7 @@ diff -Nur a/browser/base/content/abouthome/aboutHome.js b/browser/base/content/a
  // This global tracks if the page has been set up before, to prevent double inits
  let gInitialized = false;
  let gObserver = new MutationObserver(function (mutations) {
-@@ -153,7 +48,6 @@
+@@ -153,7 +58,6 @@
      if (mutation.attributeName == "searchEngineName") {
        setupSearchEngine();
        if (!gInitialized) {
@@ -353,7 +375,7 @@ diff -Nur a/browser/base/content/abouthome/aboutHome.js b/browser/base/content/a
          gInitialized = true;
        }
        return;
-@@ -178,118 +72,6 @@
+@@ -178,118 +82,6 @@
    window.removeEventListener("resize", fitToWidth);
  });
  
@@ -472,7 +494,7 @@ diff -Nur a/browser/base/content/abouthome/aboutHome.js b/browser/base/content/a
  function onSearchSubmit(aEvent)
  {
    let searchTerms = document.getElementById("searchText").value;
-@@ -339,159 +121,6 @@
+@@ -339,159 +131,6 @@
  
  }
  
@@ -633,8 +655,21 @@ diff -Nur a/browser/base/content/abouthome/aboutHome.js b/browser/base/content/a
    if (window.scrollMaxX) {
      document.body.setAttribute("narrow", "true");
 diff -Nur a/browser/base/content/abouthome/aboutHome.xhtml b/browser/base/content/abouthome/aboutHome.xhtml
---- a/browser/base/content/abouthome/aboutHome.xhtml	2014-10-09 12:53:31.000000000 -0200
-+++ b/browser/base/content/abouthome/aboutHome.xhtml	2014-10-21 14:23:10.525956357 -0200
+--- a/browser/base/content/abouthome/aboutHome.xhtml	2015-07-13 19:10:24.000000000 -0300
++++ b/browser/base/content/abouthome/aboutHome.xhtml	2015-08-18 02:41:35.756857459 -0300
+@@ -90,10 +90,10 @@
+       <img src="chrome://branding/content/about-logo.png"/>
+ 
+       <div id="searchContainer">
+-        <form name="searchForm" id="searchForm" action="https://duckduckgo.com/html/">
++        <form name="searchForm" id="searchForm" action="https://searx.laquadrature.net/">
+           <input type="text" name="q" value="" id="searchText" maxlength="256"
+                  autofocus="autofocus"/>
+-          <input id="searchSubmit" type="submit" value="&abouthome.searchEngineButton.label; DuckDuckGO"/>
++          <input id="searchSubmit" type="submit" value="&abouthome.searchEngineButton.label; searx"/>
+         </form>
+       </div>
+ 
 @@ -101,6 +101,7 @@
  
      <div class="spacer"/>
@@ -676,14 +711,14 @@ diff -Nur a/browser/locales/en-US/chrome/browser/aboutHome.dtd b/browser/locales
  <!ENTITY abouthome.historyButton.label   "History">
  <!ENTITY abouthome.settingsButton.label  "Settings">
 diff -Nur a/browser/locales/en-US/chrome/browser-region/region.properties b/browser/locales/en-US/chrome/browser-region/region.properties
---- a/browser/locales/en-US/chrome/browser-region/region.properties	2015-01-27 16:20:32.000000000 -0200
-+++ b/browser/locales/en-US/chrome/browser-region/region.properties	2015-01-29 12:21:13.202346944 -0200
+--- a/browser/locales/en-US/chrome/browser-region/region.properties	2015-07-13 19:14:26.000000000 -0300
++++ b/browser/locales/en-US/chrome/browser-region/region.properties	2015-08-18 02:43:13.382178053 -0300
 @@ -3,17 +3,12 @@
  # file, You can obtain one at http://mozilla.org/MPL/2.0/.
  
  # Default search engine
 -browser.search.defaultenginename=Google
-+browser.search.defaultenginename=DuckDuckGo HTML
++browser.search.defaultenginename=searx
  
  # Search engine order (order displayed in the search bar dropdown)s
 -browser.search.order.1=Google
@@ -694,9 +729,9 @@ diff -Nur a/browser/locales/en-US/chrome/browser-region/region.properties b/brow
 -# selection UI
 -browser.contentHandlers.types.0.title=My Yahoo!
 -browser.contentHandlers.types.0.uri=https://add.my.yahoo.com/rss?url=%s
-+browser.search.order.1=DuckDuckGo HTML
-+browser.search.order.2=DuckDuckGo Lite
-+browser.search.order.3=searx
++browser.search.order.1=searx
++browser.search.order.2=DuckDuckGo HTML
++browser.search.order.3=DuckDuckGo Lite
  
  # increment this number when anything gets changed in the list below.  This will
  # cause IceCat to re-read these prefs and inject any new handlers into the