iceweasel-1:40.0.deb1-2: updating revision

* fix freedom issue #783 -> https://labs.parabola.nu/issues/783
* make searx the default search engine -> https://lists.parabola.nu/pipermail/dev/2015-August/003196.html
* drop mips64el support

2 files changed, 79 insertions, 95 deletions

diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD
index 81a5131cf..7c366015b 100644
--- a/libre/iceweasel/PKGBUILD
+++ b/libre/iceweasel/PKGBUILD
@@ -24,13 +24,13 @@ 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)
+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=(autoconf2.13 diffutils gst-plugins-base-libs imagemagick imake inetutils libidl2 libpulse librsvg libxslt mesa pkg-config python2 quilt unzip yasm zip)
+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 nss sqlite startup-notification)
+makedepends=(autoconf2.13 diffutils gst-plugins-base-libs imagemagick imake inetutils libidl2 libpulse librsvg libxslt mesa mozilla-searchplugins pkg-config python2 quilt unzip yasm zip)
 options=(!emptydirs !makeflags debug)
 if $_pgo; then
   makedepends+=(xorg-server-xvfb)
@@ -56,7 +56,7 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2"
 sha256sums=('ddebb9f43f653b096367fb6851299edae31973d88e8c91c1ec9c9926022ee4d3'
             '2b0c360fef190df4a41d7f2a7976d8b9e711266df97dc84683ce9948ae8848d7'
             '521ad8ac7b84a9e00721087073ccb312a066bf92d4a6ef385c9d7597977e1ca4'
-            '4d5eb8d65a599ed9a46eda02ee96f62b8bde698d6fb29ab2a62dda9f1f30358f'
+            '1811eec7a02411295affc6ee66e3e4b9fd636b0bfbd313ce2a132beb124612d8'
             '93e3001ce152e1d142619e215a9ef07dd429943b99d21726c25da9ceb31e31cd'
             '56eba484179c7f498076f8dc603d8795e99dce8c6ea1da9736318c59d666bff6'
             '2257dc69886bd0b72c48675a27c3a88b9cf6b598252c9e9f1c99763180684fc3'
@@ -112,31 +112,6 @@ prepare() {
   # Load our build config, disable SafeSearch
   cp "$srcdir/mozconfig" .mozconfig
 
-  # 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
-
   mkdir "$srcdir/path"
 
   # WebRTC build tries to execute "python" and expects Python 2
@@ -150,6 +125,10 @@ prepare() {
   # https://bugzilla.mozilla.org/show_bug.cgi?id=841734
   cp "$srcdir/$pkgname-fixed-loading-icon.png" \
     browser/themes/linux/tabbrowser/loading.png
+
+  # Load our searchplugins
+  rm -rv browser/locales/en-US/searchplugins
+  cp -av /usr/lib/mozilla/searchplugins browser/locales/en-US
 }
 
 build() {
@@ -197,10 +176,6 @@ package() {
   ln -s /usr/share/hunspell "$pkgdir/usr/lib/$pkgname/dictionaries"
   ln -s /usr/share/hyphen   "$pkgdir/usr/lib/$pkgname/hyphenation"
 
-  rm -rf "$pkgdir/usr/lib/$pkgname/browser/"{searchplugins,plugins}
-  ln -sf /usr/lib/mozilla/plugins       "$pkgdir/usr/lib/$pkgname/browser/plugins"
-  ln -sf /usr/lib/mozilla/searchplugins "$pkgdir/usr/lib/$pkgname/browser/searchplugins"
-
   # Workaround for now:
   #https://bugzilla.mozilla.org/show_bug.cgi?id=658850
   ln -sf $pkgname "$pkgdir/usr/lib/$pkgname/$pkgname-bin"
diff --git a/libre/iceweasel/libre.patch b/libre/iceweasel/libre.patch
index 89b5d9421..e465b3e41 100644
--- a/libre/iceweasel/libre.patch
+++ b/libre/iceweasel/libre.patch
@@ -1,7 +1,7 @@
 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-07-05 23:02:37.831899460 -0300
-+++ mozilla-release/browser/app/profile/firefox.js	2015-07-05 23:08:31.637567304 -0300
-@@ -284,11 +284,6 @@
+--- mozilla-release.orig/browser/app/profile/firefox.js	2015-08-14 02:22:36.676626042 -0300
++++ mozilla-release/browser/app/profile/firefox.js	2015-08-14 02:23:52.119613185 -0300
+@@ -283,11 +283,6 @@
  pref("browser.slowStartup.timeThreshold", 40000);
  pref("browser.slowStartup.maxSamples", 5);
  
@@ -14,8 +14,8 @@ diff -Nur mozilla-release.orig/browser/app/profile/firefox.js mozilla-release/br
  pref("browser.casting.enabled", false);
  pref("browser.chrome.site_icons", true);
 diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.css mozilla-release/browser/base/content/abouthome/aboutHome.css
---- mozilla-release.orig/browser/base/content/abouthome/aboutHome.css	2015-01-09 02:38:12.000000000 -0200
-+++ mozilla-release/browser/base/content/abouthome/aboutHome.css	2015-06-26 18:10:33.415681146 -0300
+--- mozilla-release.orig/browser/base/content/abouthome/aboutHome.css	2015-08-07 12:54:06.000000000 -0300
++++ mozilla-release/browser/base/content/abouthome/aboutHome.css	2015-08-14 02:46:44.222645356 -0300
 @@ -49,11 +49,6 @@
    background-repeat: no-repeat;
  }
@@ -34,7 +34,7 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.css mozi
    height: 28px;
 -  width: 70px;
 -  min-width: 70px;
-+  width: 47px;
++  width: 28px;
  }
  
  #searchIcon {
@@ -179,9 +179,9 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.css mozi
  }
  
 diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozilla-release/browser/base/content/abouthome/aboutHome.js
---- mozilla-release.orig/browser/base/content/abouthome/aboutHome.js	2015-05-08 13:55:12.000000000 -0300
-+++ mozilla-release/browser/base/content/abouthome/aboutHome.js	2015-05-15 06:52:57.450189850 -0300
-@@ -5,155 +5,44 @@
+--- mozilla-release.orig/browser/base/content/abouthome/aboutHome.js	2015-08-07 12:54:06.000000000 -0300
++++ mozilla-release/browser/base/content/abouthome/aboutHome.js	2015-08-14 02:30:21.304032046 -0300
+@@ -5,155 +5,54 @@
  "use strict";
  
  const SEARCH_ENGINES = {
@@ -190,7 +190,8 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozil
 -    // it will be scaled down as necessary on lower-dpi displays.
 -    // This needs to be defined in a single line to keep the JS parser from creating many
 -    // intermediate strings in memory.  See bug 986672.
--    image: "data:image/png;base64,\
++  "searx": {
+     image: "data:image/png;base64,\
 -iVBORw0KGgoAAAANSUhEUgAAAIwAAAA4CAYAAAAvmxBdAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJ\
 -bWFnZVJlYWR5ccllPAAAGrFJREFUeNrtfHt4VdW172+utZOASLJ5+BaIFrUeXkFsa0Fl++gDnznV\
 -VlvFxt7aqvUUarXtse3Bau35ak/rZ9XT26NtfOvV6wFET+FYCQEKWqsQIT5RCAgSXnlnrzXneNw/\
@@ -313,41 +314,49 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozil
 -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" +
-+           "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"
++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"
    }
  };
  
@@ -372,7 +381,7 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozil
  // This global tracks if the page has been set up before, to prevent double inits
  let gInitialized = false;
  let gObserver = new MutationObserver(function (mutations) {
-@@ -161,7 +50,6 @@
+@@ -161,7 +60,6 @@
      if (mutation.attributeName == "searchEngineName") {
        setupSearchEngine();
        if (!gInitialized) {
@@ -380,7 +389,7 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozil
          gInitialized = true;
        }
        return;
-@@ -186,118 +74,6 @@
+@@ -186,118 +84,6 @@
    window.removeEventListener("resize", fitToWidth);
  });
  
@@ -499,7 +508,7 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozil
  function onSearchSubmit(aEvent)
  {
    let searchText = document.getElementById("searchText");
-@@ -381,144 +157,6 @@
+@@ -381,144 +167,6 @@
    document.dispatchEvent(event);
  }
  
@@ -739,9 +748,9 @@ diff -Nur mozilla-release.orig/browser/locales/en-US/chrome/browser/devtools/sou
  
  # LOCALIZATION NOTE The correct localization of this file might be to keep it
 diff -Nur mozilla-release.orig/browser/locales/en-US/chrome/browser/devtools/toolbox.dtd mozilla-release/browser/locales/en-US/chrome/browser/devtools/toolbox.dtd
---- mozilla-release.orig/browser/locales/en-US/chrome/browser/devtools/toolbox.dtd	2015-06-30 19:57:55.000000000 -0300
-+++ mozilla-release/browser/locales/en-US/chrome/browser/devtools/toolbox.dtd	2015-07-05 23:08:31.667565805 -0300
-@@ -83,7 +83,7 @@
+--- mozilla-release.orig/browser/locales/en-US/chrome/browser/devtools/toolbox.dtd	2015-08-07 12:54:09.000000000 -0300
++++ mozilla-release/browser/locales/en-US/chrome/browser/devtools/toolbox.dtd	2015-08-14 02:23:52.122946356 -0300
+@@ -86,7 +86,7 @@
    -  checkbox that toggles remote debugging, i.e. devtools.debugger.remote-enabled
    -  boolean preference in about:config, in the options panel. -->
  <!ENTITY options.enableRemote.label3    "Enable remote debugging">
@@ -750,7 +759,7 @@ diff -Nur mozilla-release.orig/browser/locales/en-US/chrome/browser/devtools/too
  
  <!-- LOCALIZATION NOTE (options.disableJavaScript.label,
    -  options.disableJavaScript.tooltip): This is the options panel label and
-@@ -106,7 +106,7 @@
+@@ -109,7 +109,7 @@
  <!-- LOCALIZATION NOTE (options.selectDefaultTools.label): This is the label for
    -  the heading of group of checkboxes corresponding to the default developer
    -  tools. -->
@@ -781,8 +790,8 @@ diff -Nur mozilla-release.orig/browser/locales/en-US/chrome/browser/devtools/web
  <!ENTITY key_quit "W">
  <!-- open menu -->
 diff -Nur mozilla-release.orig/browser/locales/en-US/chrome/browser/devtools/webide.properties mozilla-release/browser/locales/en-US/chrome/browser/devtools/webide.properties
---- mozilla-release.orig/browser/locales/en-US/chrome/browser/devtools/webide.properties	2015-02-23 05:39:34.000000000 -0200
-+++ mozilla-release/browser/locales/en-US/chrome/browser/devtools/webide.properties	2015-02-25 21:33:17.993024651 -0200
+--- mozilla-release.orig/browser/locales/en-US/chrome/browser/devtools/webide.properties	2015-08-07 12:54:09.000000000 -0300
++++ mozilla-release/browser/locales/en-US/chrome/browser/devtools/webide.properties	2015-08-14 02:23:52.122946356 -0300
 @@ -2,8 +2,8 @@
  # 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/.
@@ -794,7 +803,7 @@ diff -Nur mozilla-release.orig/browser/locales/en-US/chrome/browser/devtools/web
  
  runtimeButton_label=Select Runtime
  projectButton_label=Open App
-@@ -47,10 +47,10 @@
+@@ -50,10 +50,10 @@
  addons_stable=stable
  addons_unstable=unstable
  # LOCALIZATION NOTE (addons_simulator_label): This label is shown as the name of
@@ -808,14 +817,14 @@ diff -Nur mozilla-release.orig/browser/locales/en-US/chrome/browser/devtools/web
  addons_uninstall_button=uninstall
  addons_adb_label=ADB Helper Add-on
 diff -Nur mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties
---- mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties	2015-01-09 02:38:16.000000000 -0200
-+++ mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties	2015-01-16 15:03:01.408257268 -0200
+--- mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties	2015-08-07 12:54:09.000000000 -0300
++++ mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties	2015-08-14 02:25:49.750538381 -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
@@ -826,9 +835,9 @@ diff -Nur mozilla-release.orig/browser/locales/en-US/chrome/browser-region/regio
 -# 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 Firefox to re-read these prefs and inject any new handlers into the