diff options
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 9 | ||||
| -rw-r--r-- | rust-i686.patch | 16 |
3 files changed, 3 insertions, 26 deletions
@@ -1,7 +1,7 @@ pkgbase = firefox-esr pkgdesc = Standalone web browser from mozilla.org, Extended Support Release pkgver = 52.1.0 - pkgrel = 1 + pkgrel = 2 url = https://www.mozilla.org/en-US/firefox/organizations/ arch = i686 arch = x86_64 @@ -49,14 +49,12 @@ pkgbase = firefox-esr source = firefox.desktop source = firefox-symbolic.svg source = firefox-install-dir.patch - source = rust-i686.patch source = fix-wifi-scanner.diff validpgpkeys = 2B90598A745E992F315E22C58AB132963A06537A sha256sums = da2ba9630b8b56c6f5d36d9f3da2d984ef7986dc8b4d804f6947fcea6c24637d sha256sums = c202e5e18da1eeddd2e1d81cb3436813f11e44585ca7357c4c5f1bddd4bec826 sha256sums = a2474b32b9b2d7e0fb53a4c89715507ad1c194bef77713d798fa39d507def9e9 sha256sums = d86e41d87363656ee62e12543e2f5181aadcff448e406ef3218e91865ae775cd - sha256sums = f61ea706ce6905f568b9bdafd1b044b58f20737426f0aa5019ddb9b64031a269 sha256sums = 9765bca5d63fb5525bbd0520b7ab1d27cabaed697e2fc7791400abc3fa4f13b8 pkgname = firefox-esr @@ -6,7 +6,7 @@ pkgname=firefox-esr pkgver=52.1.0 -pkgrel=1 +pkgrel=2 pkgdesc="Standalone web browser from mozilla.org, Extended Support Release" arch=(i686 x86_64) license=(MPL GPL LGPL) @@ -23,12 +23,11 @@ conflicts=(firefox) options=(!emptydirs !makeflags !strip) source=(https://ftp.mozilla.org/pub/firefox/releases/${pkgver}esr/source/firefox-${pkgver}esr.source.tar.xz 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=('da2ba9630b8b56c6f5d36d9f3da2d984ef7986dc8b4d804f6947fcea6c24637d' 'c202e5e18da1eeddd2e1d81cb3436813f11e44585ca7357c4c5f1bddd4bec826' 'a2474b32b9b2d7e0fb53a4c89715507ad1c194bef77713d798fa39d507def9e9' 'd86e41d87363656ee62e12543e2f5181aadcff448e406ef3218e91865ae775cd' - 'f61ea706ce6905f568b9bdafd1b044b58f20737426f0aa5019ddb9b64031a269' '9765bca5d63fb5525bbd0520b7ab1d27cabaed697e2fc7791400abc3fa4f13b8') validpgpkeys=('2B90598A745E992F315E22C58AB132963A06537A') @@ -56,9 +55,6 @@ prepare() { # 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 @@ -69,7 +65,6 @@ ac_add_options --prefix=/usr 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 diff --git a/rust-i686.patch b/rust-i686.patch deleted file mode 100644 index 85512e1436b8..000000000000 --- a/rust-i686.patch +++ /dev/null @@ -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 |