From: Peter Michael Green Date: Mon, 30 Dec 2019 11:52:02 +0000 (+0000) Subject: update quilt metadata and changelog date. X-Git-Tag: archive/raspbian/1%68.5.0-1_deb10u1+rpi1~7 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=56f0062922396593e151d616e6614ff3a14eeba2;p=thunderbird.git update quilt metadata and changelog date. --- diff --git a/debian/changelog b/debian/changelog index 45ff61966e..09883705ee 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,7 +9,7 @@ thunderbird (1:68.3.0-2~deb10u1+rpi1) buster-staging; urgency=medium * Further fixes to clean target (still not completely fixed :( ). * Add build-depends on clang-6.0 (to match libclang-6.0-dev) - -- Peter Michael Green Tue, 17 Dec 2019 17:00:25 +0000 + -- Peter Michael Green Mon, 30 Dec 2019 11:50:06 +0000 thunderbird (1:68.3.0-2~deb10u1) stable-security; urgency=medium diff --git a/debian/patches/raspbian-rust-triplet-hack.patch b/debian/patches/raspbian-rust-triplet-hack.patch index 67bf0af7fb..36391b46a0 100644 --- a/debian/patches/raspbian-rust-triplet-hack.patch +++ b/debian/patches/raspbian-rust-triplet-hack.patch @@ -1,11 +1,9 @@ Description: Hack broken rust target selection so it produces the right target on raspbian. Author: Peter Michael Green -Index: firefox-esr-60.3.0esr.new/build/moz.configure/rust.configure -=================================================================== ---- firefox-esr-60.3.0esr.new.orig/build/moz.configure/rust.configure -+++ firefox-esr-60.3.0esr.new/build/moz.configure/rust.configure -@@ -111,6 +111,8 @@ def rust_compiler(rustc_info, cargo_info +--- thunderbird-68.3.0.orig/build/moz.configure/rust.configure ++++ thunderbird-68.3.0/build/moz.configure/rust.configure +@@ -185,6 +185,8 @@ def rust_compiler(rustc_info, cargo_info @depends(rustc, when=rust_compiler) @@ -14,7 +12,7 @@ Index: firefox-esr-60.3.0esr.new/build/moz.configure/rust.configure def rust_supported_targets(rustc): out = check_cmd_output(rustc, '--print', 'target-list').splitlines() # The os in the triplets used by rust may match the same OSes, in which -@@ -118,9 +120,14 @@ def rust_supported_targets(rustc): +@@ -192,7 +194,11 @@ def rust_supported_targets(rustc): per_os = {} ambiguous = set() per_raw_os = {} @@ -24,14 +22,11 @@ Index: firefox-esr-60.3.0esr.new/build/moz.configure/rust.configure for t in out: + traw = t t = split_triplet(t, allow_unknown=True) - key = (t.cpu, t.endianness, t.os) -+ sys.stdout.write(traw+' '+repr(key)+' '+repr(t.raw_os)+'\n') - if key in per_os: - previous = per_os[key] - per_raw_os[(previous.cpu, previous.endianness, -@@ -152,11 +159,13 @@ def rust_triple_alias(host_or_target): - @depends(rustc, host_or_target, c_compiler, rust_supported_targets, - when=rust_compiler) + endianness = t.endianness + if t.cpu.startswith('thumb') and endianness not in ('big', 'little'): +@@ -232,11 +238,13 @@ def rust_triple_alias(host_or_target): + arm_target, when=rust_compiler) + @checking('for rust %s triplet' % host_or_target_str) @imports('os') + @imports('sys') @imports('subprocess') @@ -41,16 +36,5 @@ Index: firefox-esr-60.3.0esr.new/build/moz.configure/rust.configure @imports(_from='textwrap', _import='dedent') + @imports(_from='__builtin__', _import='repr') def rust_target(rustc, host_or_target, compiler_info, - rust_supported_targets): + rust_supported_targets, arm_target): # Rust's --target options are similar to, but not exactly the same -@@ -180,8 +189,9 @@ def rust_triple_alias(host_or_target): - - rustc_target = rust_supported_targets.per_os.get( - (host_or_target.cpu, host_or_target.endianness, host_or_target_os)) -- -+ #sys.stdout.write(host_or_target.cpu+'\n') - if rustc_target is None: -+ sys.stdout.write('using per_raw_os.get with tuple '+repr(((host_or_target.cpu, host_or_target.endianness,host_or_target_raw_os)))+'\n') - rustc_target = rust_supported_targets.per_raw_os.get( - (host_or_target.cpu, host_or_target.endianness, - host_or_target_raw_os))