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

1 files changed, 9 insertions, 34 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"