iceweasel-libre-21.0.1-1: updating version

1 files changed, 13 insertions, 31 deletions

diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index c35b83600..774d80f92 100644
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -14,7 +14,7 @@ _pgo=true
 
 # We're getting this from Debian Experimental
 _debname=iceweasel
-_debver=20.0
+_debver=21.0
 _debrel=1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -22,7 +22,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 _pkgname=iceweasel
 pkgname=iceweasel-libre
 pkgver=$_debver.$_debrel
-pkgrel=5
+pkgrel=1
 
 pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based on Mozilla Firefox."
 arch=(i686 x86_64 mips64el)
@@ -30,7 +30,7 @@ license=(MPL GPL LGPL)
 depends=(alsa-lib dbus-glib desktop-file-utils gtk2 gstreamer0.10-base hicolor-icon-theme hunspell libevent libnotify libvpx libxt mime-types mozilla-common mozilla-searchplugins nss sqlite startup-notification)
 makedepends=(autoconf2.13 diffutils imagemagick libidl2 librsvg libxslt mesa pkg-config python2 quilt unzip zip)
 [ "$CARCH" != "mips64el" ] && makedepends+=('yasm')
-options=(!emptydirs)
+options=(!emptydirs !makeflags)
 if $_pgo; then
   makedepends+=(xorg-server-xvfb)
   options+=(!ccache)
@@ -50,19 +50,17 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2"
         iceweasel-install-dir.patch
         vendor.js
         shared-libs.patch
-        replace-urls.txt
         Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch)
-md5sums=('22daa24b6490c654f131550cbf20fad3'
-         '0c70ab52f35701558081df3d360361a2'
-         'a65f285d20e11e650f7220b9c7f2bbf2'
+md5sums=('0a7c51bb494463c327af918bae6c4ee4'
+         'c17121a4ffd40f463e16d7828445d96e'
+         'e1e903ca91997f18b428c54ef604f27d'
          '383e8e2a97a8b13fe56d153adb6878b6'
-         'ea7fec9c58670aae945c0f472471cdff'
+         '1c6b47e2123c684c1da1e08bd0a107d9'
          '7b9e5996dd9fe0b186a43a297db1c6b5'
          'abf5ecb74caa857abb42bcfbb3442d9c'
-         '0c26941504d3f2abed759221e9bb5de1'
+         'e7e915720aaf6883ab4b706fe2195dda'
          '52e52f840a49eb1d14be1c0065b03a93'
-         '3bf8aefb861095caa45649c118163454'
-         'd0e1f2625cd9f7234abdeb55aee00529')
+         '85e67561e0e491cd538ce018dfc2d948')
 
 prepare() {
   export DEBIAN_BUILD="mozilla-release"
@@ -86,17 +84,6 @@ prepare() {
   patch -Np1 -i "$srcdir/iceweasel-install-dir.patch" # install to /usr/lib/$_pkgname
   patch -Np1 -i "$srcdir/shared-libs.patch"
 
-  # Replace common URLs
-  sed '/^#/d' ../replace-urls.txt | while read -r moz_url free_url; do
-    if [[ -n $moz_url ]]; then
-      printf 'liberating: %s -> %s\n' "$moz_url" "$free_url"
-      grep -Erl "${moz_url}" \
-        --exclude='*.'{patch,orig,rej} \
-        --exclude-dir={.pc,test,tests,testing} \
-        | xargs -d '\n' --no-run-if-empty sed -ri "s<${moz_url}<${free_url}<g"
-    fi
-  done
-
   # Patch anything that's left
   patch -Np1 -i "$srcdir/libre.patch"
 
@@ -151,27 +138,22 @@ build() {
   export PATH="$srcdir/path:$PATH"
   export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$_pkgname"
   export PYTHON="/usr/bin/python2"
-  export MOZ_MAKE_FLAGS="$MAKEFLAGS"
-  unset MAKEFLAGS
 
   if $_pgo; then
-    # Enable PGO
     export DISPLAY=:99
     Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 $DISPLAY &
-    _fail=0
 
-    make -f client.mk build MOZ_PGO=1 || _fail=1
-
-    kill $! || true
-    return $_fail
+    make -f client.mk build MOZ_PGO=1
   else
     make -f client.mk build
   fi
+
+  kill $! || true
 }
 
 package() {
   cd "$srcdir/$DEBIAN_BUILD"
-  make -j1 -f client.mk DESTDIR="$pkgdir" install
+  make -f client.mk DESTDIR="$pkgdir" install
 
   install -Dm644 ../vendor.js "$pkgdir/usr/lib/$_pkgname/defaults/preferences/vendor.js"