From 4777a3cdec4c38d5d00f7b72f9f1ec89fad50aa8 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 23 Sep 2020 14:09:05 +0200 Subject: [PATCH] firefox: update to 81.0. [ci skip] --- srcpkgs/firefox/patches/rust-glslopt.patch | 13 ------------- srcpkgs/firefox/template | 6 ++++-- 2 files changed, 4 insertions(+), 15 deletions(-) delete mode 100644 srcpkgs/firefox/patches/rust-glslopt.patch diff --git a/srcpkgs/firefox/patches/rust-glslopt.patch b/srcpkgs/firefox/patches/rust-glslopt.patch deleted file mode 100644 index 3717caa2290..00000000000 --- a/srcpkgs/firefox/patches/rust-glslopt.patch +++ /dev/null @@ -1,13 +0,0 @@ -overwrite HOST_* flags to get rid of -MF - ---- third_party/rust/glslopt/build.rs 2020-06-03 01:37:31.000000000 +0200 -+++ third_party/rust/glslopt/build.rs 2020-06-04 10:57:16.418469546 +0200 -@@ -28,6 +28,8 @@ - env::remove_var(format!("CXXFLAGS_{}", &target)); - env::remove_var(format!("CFLAGS_{}", target.replace("-", "_"))); - env::remove_var(format!("CXXFLAGS_{}", target.replace("-", "_"))); -+ env::set_var("HOST_CFLAGS", "-O2"); -+ env::set_var("HOST_CXXFLAGS", "-O2"); - - configure(&mut cc::Build::new()) - .warnings(false) diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template index e71515cbc06..248ce896d87 100644 --- a/srcpkgs/firefox/template +++ b/srcpkgs/firefox/template @@ -3,7 +3,7 @@ # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-i18n". # pkgname=firefox -version=80.0.1 +version=81.0 revision=1 build_helper="rust" short_desc="Mozilla Firefox web browser" @@ -11,7 +11,7 @@ maintainer="Johannes " license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://www.mozilla.org/firefox/" distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz" -checksum=596b085e32a2d683ba960e161ea65c6271f90f576d4bf956e0d48e83af992c21 +checksum=9328745012178aee5a4f47c833539f7872cc6e0f20a853568a313e60cabd1ec8 lib32disabled=yes @@ -153,6 +153,7 @@ do_build() { export MOZ_MAKE_FLAGS="${makejobs}" export MOZ_NOSPAM=1 export MOZBUILD_STATE_PATH="${wrksrc}/mozbuild" + export MACH_USE_SYSTEM_PYTHON=1 export AS=$CC @@ -173,6 +174,7 @@ ac_add_options --enable-default-toolkit=$(vopt_if wayland 'cairo-gtk3-wayland' ' ./mach build } do_install() { + export MACH_USE_SYSTEM_PYTHON=1 DESTDIR="$DESTDIR" ./mach install vinstall ${FILESDIR}/vendor.js 644 usr/lib/firefox/browser/defaults/preferences