Update to 1:53.0.deb1-2

* icu 59.1 / hunspell 1.6.0 rebuild
* fix build with cargo 0.18

3 files changed, 60 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 046b62074962..f5d4ced70413 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Mon Apr 24 00:37:52 UTC 2017
+# Sat May  6 01:45:26 UTC 2017
 pkgbase = iceweasel
 	pkgdesc = A libre version of Debian Iceweasel, the standalone web browser based on Mozilla Firefox.
 	pkgver = 53.0.deb1
-	pkgrel = 1
+	pkgrel = 2
 	epoch = 1
 	url = https://wiki.parabola.nu/iceweasel
 	arch = i686
@@ -36,7 +36,7 @@ pkgbase = iceweasel
 	depends = gtk2
 	depends = gtk3
 	depends = hunspell
-	depends = icu=58.2
+	depends = icu=59.1
 	depends = libevent
 	depends = libvpx
 	depends = libxt
@@ -68,6 +68,7 @@ pkgbase = iceweasel
 	source = iceweasel.desktop
 	source = iceweasel-install-dir.patch
 	source = vendor.js
+	source = 0001-Bug-1338655-Don-t-try-to-build-mp4parse-bindings.-r-.patch
 	source = fix-wifi-scanner.diff
 	source = enable-object-directory-paths.patch
 	source = mozilla-1253216.patch
@@ -84,6 +85,7 @@ pkgbase = iceweasel
 	sha256sums = 250f7aaa3c1362f9d2bb2211cd605eab93a5e806e8540f184979d41acf46142a
 	sha256sums = 3aea6676f1e53a09673b6ae219d281fc28054beb6002b09973611c02f827651d
 	sha256sums = 90bdede15c2e85e5d081e2b822884a6354a116868ba7d9e19a2484a4e2528aaf
+	sha256sums = 413cd6d366d78f325d80ebebccfd0afa0d266b40b2e54b66ba2fa03c15f3ea67
 	sha256sums = 9765bca5d63fb5525bbd0520b7ab1d27cabaed697e2fc7791400abc3fa4f13b8
 	sha256sums = e260e555b261aabab1e48786dd514eeea056e4402af7cfd4dfd1d32858441484
 	sha256sums = fbb6011501a74a8ea6d01c041870fcefb7ef2859c134aedc676e5f6452833f65
diff --git a/0001-Bug-1338655-Don-t-try-to-build-mp4parse-bindings.-r-.patch b/0001-Bug-1338655-Don-t-try-to-build-mp4parse-bindings.-r-.patch
new file mode 100644
index 000000000000..cf2e0eb9b80b
--- /dev/null
+++ b/0001-Bug-1338655-Don-t-try-to-build-mp4parse-bindings.-r-.patch
@@ -0,0 +1,48 @@
+From bbd48a5613c872883616884cfaf41665b0e4ec9b Mon Sep 17 00:00:00 2001
+From: Ralph Giles <giles@mozilla.com>
+Date: Fri, 10 Feb 2017 12:58:18 -0800
+Subject: [PATCH] Bug 1338655 - Don't try to build mp4parse bindings. r=froydnj
+
+We use the cheddar crate to generate a C header file
+for our mp4parse_capi wrapper crate. Currently we
+do this at code check-in time via update-rust.sh.
+
+Cargo 0.18 and later will try to execute a build.rs
+file in the crate source tree regardless of whether
+it's specified in Cargo.toml so patching out that
+line just results in 'crate cheddar not found'.
+
+This change restores the old behaviour by substituting
+a 'build = false' line instead.
+
+We do have syntex vendored, but we don't currently build
+it by default, so I prefer this solution to just vendoring
+cheddar and generating the header at build time. The syntex
+crate is quite large and adds significantly to our compile
+time.
+
+MozReview-Commit-ID: InJRRODWAdP
+
+--HG--
+extra : rebase_source : 29378fcbc86015ce6cc22dc66d38a43ddbac204e
+---
+ media/libstagefright/binding/mp4parse-cargo.patch     | 5 +++--
+ media/libstagefright/binding/mp4parse_capi/Cargo.toml | 2 ++
+ 2 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/media/libstagefright/binding/mp4parse_capi/Cargo.toml b/media/libstagefright/binding/mp4parse_capi/Cargo.toml
+index aee7ee947151a27c..d7e3f55119d3f4b6 100644
+--- a/media/libstagefright/binding/mp4parse_capi/Cargo.toml
++++ b/media/libstagefright/binding/mp4parse_capi/Cargo.toml
+@@ -18,6 +18,8 @@ exclude = [
+   "*.mp4",
+ ]
+ 
++build = false
++
+ [dependencies]
+ byteorder = "1.0.0"
+ "mp4parse" = {version = "0.6.0", path = "../mp4parse"}
+-- 
+2.12.2
+
diff --git a/PKGBUILD b/PKGBUILD
index 15b6d31a489f..fcc4217591e5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -30,11 +30,11 @@ _pkgname=firefox
 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 armv7h)
 license=(MPL GPL LGPL)
-depends=(alsa-lib dbus-glib ffmpeg gtk2 gtk3 hunspell icu=58.2 libevent libvpx libxt mime-types mozilla-common nss sqlite startup-notification ttf-font)
+depends=(alsa-lib dbus-glib ffmpeg gtk2 gtk3 hunspell icu=59.1 libevent libvpx libxt mime-types mozilla-common nss sqlite startup-notification ttf-font)
 makedepends=(autoconf2.13 diffutils gconf imagemagick imake inetutils libidl2 libpulse librsvg-stable libxslt mesa mozilla-searchplugins pkg-config python2 quilt unzip yasm zip)
 makedepends_i686=(cargo)
 makedepends_x86_64=("${makedepends_i686[@]}")
@@ -61,6 +61,7 @@ source=("$_debrepo/`debfile $_debname`_$_debver.is.$_debver.orig.tar.xz"
         $pkgname.desktop
         $pkgname-install-dir.patch
         vendor.js
+        0001-Bug-1338655-Don-t-try-to-build-mp4parse-bindings.-r-.patch
         fix-wifi-scanner.diff
         enable-object-directory-paths.patch
         mozilla-1253216.patch
@@ -77,6 +78,7 @@ sha256sums=('e77dbd8a4681481a5c9ab8ed3a5ac6c19caec8e25dc80f8b56461cfdf52d047a'
             '250f7aaa3c1362f9d2bb2211cd605eab93a5e806e8540f184979d41acf46142a'
             '3aea6676f1e53a09673b6ae219d281fc28054beb6002b09973611c02f827651d'
             '90bdede15c2e85e5d081e2b822884a6354a116868ba7d9e19a2484a4e2528aaf'
+            '413cd6d366d78f325d80ebebccfd0afa0d266b40b2e54b66ba2fa03c15f3ea67'
             '9765bca5d63fb5525bbd0520b7ab1d27cabaed697e2fc7791400abc3fa4f13b8'
             'e260e555b261aabab1e48786dd514eeea056e4402af7cfd4dfd1d32858441484'
             'fbb6011501a74a8ea6d01c041870fcefb7ef2859c134aedc676e5f6452833f65'
@@ -129,6 +131,9 @@ prepare() {
   # https://bugzilla.mozilla.org/show_bug.cgi?id=1314968
   patch -Np1 -i ../fix-wifi-scanner.diff
 
+  # https://bugs.archlinux.org/task/53890
+  patch -Np1 -i ../0001-Bug-1338655-Don-t-try-to-build-mp4parse-bindings.-r-.patch
+
   mkdir "$srcdir/path"
   ln -s /usr/bin/python2 "$srcdir/path/python"