version 50.0-1

4 files changed, 57 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e1283d0cb1b1..9188b330e726 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = firefox-gtk2
 	pkgdesc = Standalone web browser from mozilla.org
-	pkgver = 49.0.2
+	pkgver = 50.0
 	pkgrel = 1
 	url = https://www.mozilla.org/firefox/
 	arch = i686
@@ -20,7 +20,7 @@ pkgbase = firefox-gtk2
 	makedepends = inetutils
 	makedepends = xorg-server-xvfb
 	makedepends = autoconf2.13
-	makedepends = rust
+	makedepends = cargo
 	depends = gtk2
 	depends = mozilla-common
 	depends = libxt
@@ -39,22 +39,26 @@ pkgbase = firefox-gtk2
 	optdepends = networkmanager: Location detection via available WiFi networks
 	optdepends = libnotify: Notification integration
 	optdepends = upower: Battery API
-	provides = firefox=49.0.2-1
+	provides = firefox=50.0-1
 	conflicts = firefox
 	options = !emptydirs
 	options = !makeflags
-	source = https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/49.0.2/source/firefox-49.0.2.source.tar.xz
+	source = https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/50.0/source/firefox-50.0.source.tar.xz
 	source = mozconfig
 	source = firefox.desktop
 	source = firefox-install-dir.patch
+	source = rust-i686.patch
 	source = vendor.js
 	source = firefox-symbolic.svg
-	sha256sums = 67abe9202958c36bf60454c91065953aa8f6ede83ea1c0e9cdb870c3fc3d56d0
+	source = fix-wifi-scanner.diff
+	sha256sums = 5da027350aee148dc62cc1ca897db30510be87ca8eab5e67a7adc7a2479b8616
 	sha256sums = 5488e59d08787927337b343c74a999e62e36ba1a0715f3ecb1c314e2ff8f1961
 	sha256sums = 75c526e9669b91b4fe5dcea650a1e8419220abb2e9564184f0d984c71eae82e8
 	sha256sums = d86e41d87363656ee62e12543e2f5181aadcff448e406ef3218e91865ae775cd
+	sha256sums = f61ea706ce6905f568b9bdafd1b044b58f20737426f0aa5019ddb9b64031a269
 	sha256sums = 4b50e9aec03432e21b44d18c4c97b2630bace606b033f7d556c9d3e3eb0f4fa4
 	sha256sums = a2474b32b9b2d7e0fb53a4c89715507ad1c194bef77713d798fa39d507def9e9
+	sha256sums = 9765bca5d63fb5525bbd0520b7ab1d27cabaed697e2fc7791400abc3fa4f13b8
 
 pkgname = firefox-gtk2
 
diff --git a/PKGBUILD b/PKGBUILD
index d14be2973d2d..02607df2d60f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 279103 2016-10-21 12:18:19Z heftig $
+# $Id: PKGBUILD 280867 2016-11-15 21:11:04Z heftig $
 # Maintainer: Brian Bidulock <bidulock@openss7.org>
 # Contributor: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor : Ionut Biru <ibiru@archlinux.org>
@@ -6,7 +6,7 @@
 
 pkgname=firefox-gtk2
 _pkgname=firefox
-pkgver=49.0.2
+pkgver=50.0
 pkgrel=1
 pkgdesc="Standalone web browser from mozilla.org"
 arch=('i686' 'x86_64')
@@ -16,7 +16,7 @@ depends=('gtk2' 'mozilla-common' 'libxt' 'startup-notification' 'mime-types'
          'dbus-glib' 'alsa-lib' 'ffmpeg' 'libvpx' 'libevent' 'nss' 'hunspell'
          'sqlite' 'ttf-font' 'icu')
 makedepends=('unzip' 'zip' 'diffutils' 'python2' 'yasm' 'mesa' 'imake' 'gconf'
-             'libpulse' 'inetutils' 'xorg-server-xvfb' 'autoconf2.13' 'rust')
+             'libpulse' 'inetutils' 'xorg-server-xvfb' 'autoconf2.13' 'cargo')
 optdepends=('networkmanager: Location detection via available WiFi networks'
             'libnotify: Notification integration'
             'upower: Battery API')
@@ -27,14 +27,18 @@ source=(https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$pkgver/source/
         mozconfig
         firefox.desktop
         firefox-install-dir.patch
+        rust-i686.patch
         vendor.js
-        firefox-symbolic.svg)
-sha256sums=('67abe9202958c36bf60454c91065953aa8f6ede83ea1c0e9cdb870c3fc3d56d0'
+        firefox-symbolic.svg
+        fix-wifi-scanner.diff)
+sha256sums=('5da027350aee148dc62cc1ca897db30510be87ca8eab5e67a7adc7a2479b8616'
             '5488e59d08787927337b343c74a999e62e36ba1a0715f3ecb1c314e2ff8f1961'
             '75c526e9669b91b4fe5dcea650a1e8419220abb2e9564184f0d984c71eae82e8'
             'd86e41d87363656ee62e12543e2f5181aadcff448e406ef3218e91865ae775cd'
+            'f61ea706ce6905f568b9bdafd1b044b58f20737426f0aa5019ddb9b64031a269'
             '4b50e9aec03432e21b44d18c4c97b2630bace606b033f7d556c9d3e3eb0f4fa4'
-            'a2474b32b9b2d7e0fb53a4c89715507ad1c194bef77713d798fa39d507def9e9')
+            'a2474b32b9b2d7e0fb53a4c89715507ad1c194bef77713d798fa39d507def9e9'
+            '9765bca5d63fb5525bbd0520b7ab1d27cabaed697e2fc7791400abc3fa4f13b8')
 validpgpkeys=('2B90598A745E992F315E22C58AB132963A06537A')
 
 # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
@@ -56,6 +60,12 @@ prepare() {
   cp ../mozconfig .mozconfig
   patch -Np1 -i ../firefox-install-dir.patch
 
+  # https://bugzilla.mozilla.org/show_bug.cgi?id=1314968
+  patch -Np1 -i ../fix-wifi-scanner.diff
+
+  # Build with the rust targets we actually ship
+  patch -Np1 -i ../rust-i686.patch
+
   echo -n "$_google_api_key" >google-api-key
   echo "ac_add_options --with-google-api-keyfile=\"$PWD/google-api-key\"" >>.mozconfig
 
diff --git a/fix-wifi-scanner.diff b/fix-wifi-scanner.diff
new file mode 100644
index 000000000000..f8fdd6c42142
--- /dev/null
+++ b/fix-wifi-scanner.diff
@@ -0,0 +1,16 @@
+ netwerk/wifi/nsWifiScannerDBus.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git c/netwerk/wifi/nsWifiScannerDBus.cpp i/netwerk/wifi/nsWifiScannerDBus.cpp
+index 182553e18fa6e104..6fa0a0b023d3e45f 100644
+--- c/netwerk/wifi/nsWifiScannerDBus.cpp
++++ i/netwerk/wifi/nsWifiScannerDBus.cpp
+@@ -62,7 +62,7 @@ nsWifiScannerDBus::SendMessage(const char* aInterface,
+       return NS_ERROR_FAILURE;
+     }
+   } else if (!strcmp(aFuncCall, "GetAll")) {
+-    const char* param = "";
++    const char* param = "org.freedesktop.NetworkManager.AccessPoint";
+     if (!dbus_message_iter_append_basic(&argsIter, DBUS_TYPE_STRING, &param)) {
+       return NS_ERROR_FAILURE;
+     }
diff --git a/rust-i686.patch b/rust-i686.patch
new file mode 100644
index 000000000000..85512e1436b8
--- /dev/null
+++ b/rust-i686.patch
@@ -0,0 +1,16 @@
+ build/moz.configure/rust.configure | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git c/build/moz.configure/rust.configure i/build/moz.configure/rust.configure
+index cd86b24153debb1b..44911715e25d95e3 100644
+--- c/build/moz.configure/rust.configure
++++ i/build/moz.configure/rust.configure
+@@ -81,7 +81,7 @@ def rust_target(rust_compiler, rustc, target, cross_compiling):
+             # OpenBSD
+             ('x86_64', 'OpenBSD'): 'x86_64-unknown-openbsd',
+             # Linux
+-            ('x86', 'Linux'): 'i586-unknown-linux-gnu',
++            ('x86', 'Linux'): 'i686-unknown-linux-gnu',
+             # Linux
+             ('x86_64', 'Linux'): 'x86_64-unknown-linux-gnu',
+             # OS X and iOS