[arch-commits] Commit in firefox/trunk (PKGBUILD rust-i686.patch)

[Jan Steffens]

    Date: Wednesday, April 19, 2017 @ 19:44:42
  Author: heftig
Revision: 293289

53.0-1

Modified:
  firefox/trunk/PKGBUILD
Deleted:
  firefox/trunk/rust-i686.patch

-----------------+
 PKGBUILD        |    9 ++-------
 rust-i686.patch |   16 ----------------
 2 files changed, 2 insertions(+), 23 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-04-19 16:33:07 UTC (rev 293288)
+++ PKGBUILD	2017-04-19 19:44:42 UTC (rev 293289)
@@ -4,7 +4,7 @@
 # Contributor: Jakub Schmidtke <sjakub at gmail.com>
 
 pkgname=firefox
-pkgver=52.0.2
+pkgver=53.0
 pkgrel=1
 pkgdesc="Standalone web browser from mozilla.org"
 arch=(i686 x86_64)
@@ -21,12 +21,11 @@
 _repo=https://hg.mozilla.org/mozilla-unified
 source=("hg+$_repo#tag=FIREFOX_${pkgver//./_}_RELEASE"
         firefox.desktop firefox-symbolic.svg
-        firefox-install-dir.patch rust-i686.patch fix-wifi-scanner.diff)
+        firefox-install-dir.patch fix-wifi-scanner.diff)
 sha256sums=('SKIP'
             'ada313750e6fb14558b37c764409a17c1672a351a46c73b350aa1fe4ea9220ef'
             'a2474b32b9b2d7e0fb53a4c89715507ad1c194bef77713d798fa39d507def9e9'
             'd86e41d87363656ee62e12543e2f5181aadcff448e406ef3218e91865ae775cd'
-            'f61ea706ce6905f568b9bdafd1b044b58f20737426f0aa5019ddb9b64031a269'
             '9765bca5d63fb5525bbd0520b7ab1d27cabaed697e2fc7791400abc3fa4f13b8')
 
 # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
@@ -51,9 +50,6 @@
   # 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 -n "$_mozilla_api_key" >mozilla-api-key
 
@@ -64,7 +60,6 @@
 ac_add_options --enable-release
 ac_add_options --enable-gold
 ac_add_options --enable-pie
-ac_add_options --enable-rust
 
 # Branding
 ac_add_options --enable-official-branding

Deleted: rust-i686.patch
===================================================================
--- rust-i686.patch	2017-04-19 16:33:07 UTC (rev 293288)
+++ rust-i686.patch	2017-04-19 19:44:42 UTC (rev 293289)
@@ -1,16 +0,0 @@
- 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