From b87f989644a37013ef650aabcf562d10f2d91a5e Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Sat, 6 Jun 2020 15:27:25 +0200 Subject: [PATCH] thunderbird: update to 68.9.0. --- .../thunderbird/patches/rust-configure.patch | 17 +++++++---------- srcpkgs/thunderbird/template | 4 ++-- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/srcpkgs/thunderbird/patches/rust-configure.patch b/srcpkgs/thunderbird/patches/rust-configure.patch index 84077f4fc88..09191782b35 100644 --- a/srcpkgs/thunderbird/patches/rust-configure.patch +++ b/srcpkgs/thunderbird/patches/rust-configure.patch @@ -1,23 +1,20 @@ -Mozilla rustc check does not support crossbuild: let's remove it -Remove calls to unwrap_rustup, they fail if rustup isn't present - ---- build/moz.configure/rust.configure 2019-07-06 03:48:30.000000000 +0200 -+++ build/moz.configure/rust.configure 2019-07-09 22:35:23.326851798 +0200 -@@ -79,9 +79,6 @@ +--- build/moz.configure/rust.configure 2020-06-06 10:05:25.819337924 +0200 ++++ build/moz.configure/rust.configure 2020-06-06 10:07:11.346031015 +0200 +@@ -79,10 +79,6 @@ return unwrap -rustc = unwrap_rustup(rustc, 'rustc') -cargo = unwrap_rustup(cargo, 'cargo') - - +- set_config('CARGO', cargo) set_config('RUSTC', rustc) -@@ -294,26 +291,6 @@ +@@ -366,25 +362,6 @@ os.write(in_fd, source) os.close(in_fd) -- + - cmd = [ - rustc, - '--crate-type', 'staticlib', @@ -33,7 +30,7 @@ Remove calls to unwrap_rustup, they fail if rustup isn't present - a rust std library for that target installed. Try: - - rustup target add {} -- '''.format(host_or_target.alias, rustc, rustc_target.alias))) +- '''.format(host_or_target.alias, rustc, rustc_target))) - check_cmd_output(*cmd, onerror=failed) - if not os.path.exists(out_path) or os.path.getsize(out_path) == 0: - failed() diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template index 86f720c3af3..6db05bd70c5 100644 --- a/srcpkgs/thunderbird/template +++ b/srcpkgs/thunderbird/template @@ -3,7 +3,7 @@ # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/thunderbird-i18n". # pkgname=thunderbird -version=68.8.1 +version=68.9.0 revision=1 build_helper="rust" short_desc="Standalone Mail/News reader" @@ -11,7 +11,7 @@ maintainer="Enno Boland " license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://www.thunderbird.net/" distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz" -checksum=99b42a8451dfdd7b343f70aff66c3f28e1be22ba7fcd5dca51e39606d9ba7b6d +checksum=8286599f14a852dfc503893d141d3e0582892faae8aef81bc36cfab3906408cc lib32disabled=yes