[arch-commits] Commit in firefox/trunk (3 files)

[Jan Steffens]

    Date: Tuesday, November 15, 2016 @ 09:04:16
  Author: heftig
Revision: 280747

50.0-1

Added:
  firefox/trunk/fix-wifi-scanner.diff
  firefox/trunk/rust-i686.patch
Modified:
  firefox/trunk/PKGBUILD

-----------------------+
 PKGBUILD              |   20 +++++++++++++++-----
 fix-wifi-scanner.diff |   16 ++++++++++++++++
 rust-i686.patch       |   16 ++++++++++++++++
 3 files changed, 47 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2016-11-15 07:55:27 UTC (rev 280746)
+++ PKGBUILD    2016-11-15 09:04:16 UTC (rev 280747)
@@ -4,7 +4,7 @@
 # Contributor: Jakub Schmidtke <sja...@gmail.com>
 
 pkgname=firefox
-pkgver=49.0.2
+pkgver=50.0
 pkgrel=1
 pkgdesc="Standalone web browser from mozilla.org"
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@
          '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')
@@ -23,14 +23,18 @@
         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'
             '3b0c6b08c0211d8c5a02aa050755276ec864c5f2c5ac1a3d3f9f8a9af6512737'
             '75c526e9669b91b4fe5dcea650a1e8419220abb2e9564184f0d984c71eae82e8'
             'd86e41d87363656ee62e12543e2f5181aadcff448e406ef3218e91865ae775cd'
+            'f61ea706ce6905f568b9bdafd1b044b58f20737426f0aa5019ddb9b64031a269'
             '4b50e9aec03432e21b44d18c4c97b2630bace606b033f7d556c9d3e3eb0f4fa4'
-            'a2474b32b9b2d7e0fb53a4c89715507ad1c194bef77713d798fa39d507def9e9')
+            'a2474b32b9b2d7e0fb53a4c89715507ad1c194bef77713d798fa39d507def9e9'
+            '9765bca5d63fb5525bbd0520b7ab1d27cabaed697e2fc7791400abc3fa4f13b8')
 validpgpkeys=('2B90598A745E992F315E22C58AB132963A06537A')
 
 # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
@@ -52,6 +56,12 @@
   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
 

Added: fix-wifi-scanner.diff
===================================================================
--- fix-wifi-scanner.diff                               (rev 0)
+++ fix-wifi-scanner.diff       2016-11-15 09:04:16 UTC (rev 280747)
@@ -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;
+     }

Added: rust-i686.patch
===================================================================
--- rust-i686.patch                             (rev 0)
+++ rust-i686.patch     2016-11-15 09:04:16 UTC (rev 280747)
@@ -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