From 4ce9d74a861f9e0bab48c16e1a18cbcea277ddbb Mon Sep 17 00:00:00 2001 From: Andreas Grapentin Date: Tue, 7 Apr 2020 18:27:21 +0200 Subject: nonprism/icedove: updated to 68.6 --- nonprism/icedove/PKGBUILD | 41 ++++-- nonprism/icedove/arm-wasm-vfp.patch | 15 ++ nonprism/icedove/mozilla-1338795-regression.patch | 11 ++ nonprism/icedove/thunderbird-rust-1.39.patch | 170 ---------------------- 4 files changed, 53 insertions(+), 184 deletions(-) create mode 100644 nonprism/icedove/arm-wasm-vfp.patch create mode 100644 nonprism/icedove/mozilla-1338795-regression.patch delete mode 100644 nonprism/icedove/thunderbird-rust-1.39.patch diff --git a/nonprism/icedove/PKGBUILD b/nonprism/icedove/PKGBUILD index 45350a1d5..1a0a43ec8 100644 --- a/nonprism/icedove/PKGBUILD +++ b/nonprism/icedove/PKGBUILD @@ -21,10 +21,10 @@ _pkgname=thunderbird pkgname=icedove replaces=("$_pkgname") epoch=1 -pkgver=68.2.2 -pkgrel=2 +pkgver=68.6.0 +pkgrel=1 pkgrel+=.parabola1.nonprism1 -_brandingver=68.2 +_brandingver=68.6 _brandingrel=1 pkgdesc='Standalone mail and news reader based on Mozilla Thunderbird' pkgdesc+=', without support for unsafe and dangerous for privacy protocols' @@ -40,26 +40,28 @@ makedepends+=(quilt mozilla-searchplugins python2-blessings imagemagick) optdepends=('libcanberra: sound support') options=(!emptydirs !makeflags) source=(https://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$pkgver/source/thunderbird-$pkgver.source.tar.xz{,.asc} - $pkgname.desktop - thunderbird-rust-1.39.patch) + $pkgname.desktop) source+=( https://repo.parabola.nu/other/icedove/${pkgname}_$_brandingver-$_brandingrel.branding.tar.xz{,.sig} - libre-searchengines.patch) -sha256sums=('c17edbcde0e9e7599cda16b69b130039f69113b498ea394057cedfae153f0dd3' + libre-searchengines.patch + mozilla-1338795-regression.patch) +source_armv7h=(arm-wasm-vfp.patch) +sha256sums=('4e3b8fdcfae12e7d49232a9c324e82d47ed94b371031f31baf69b2f7c2fb5b51' 'SKIP' 'af8199a12ebe09189d143458bd1e2d0071aff3410ed121dc2329a448a56632f0' - '08834ef1c2dd685edd40dea20dfa9d4b889f5c387385ac329a162eeff6cf90be' - 'b36792a6fcbe68841bc842723222c88ecf1f54f7f75bd634b216b61f3ae422f2' + '23693c60df02067981dbcad7c58c29e6e38a73b54fd00cfabd94f38e45062dfd' 'SKIP' - '072bba9d9ef4cfcb03b3776a15e52020e05c685add38329bd041f680026f5898') + '072bba9d9ef4cfcb03b3776a15e52020e05c685add38329bd041f680026f5898' + 'dbec24e57a445b1076a11fde00d0f5b8cd53ce314c2b9d3cd2a83bd84fc25375') +sha256sums_armv7h=(bc00516032330760444939c516a60c78f868631e1b37f075f0fe71a53737b966) validpgpkeys=(14F26682D0916CDD81E37B6D61B7B526D98F0353) # Mozilla Software Releases validpgpkeys+=(BFA8008A8265677063B11BF47171986E4B745536) # Andreas Grapentin prepare() { cd $_pkgname-$pkgver - patch -p1 -i ../thunderbird-rust-1.39.patch # Fix build with rust 1.39 (Gentoo) - + # see https://labs.parabola.nu/issues/2267 + patch -Np1 -i "$srcdir"/mozilla-1338795-regression.patch cat >.mozconfig <> .mozconfig < Option { -- use self::HasVtableResult::*; -- -- match (*self, *rhs) { -- (x, y) if x == y => Some(cmp::Ordering::Equal), -- (BaseHasVtable, _) => Some(cmp::Ordering::Greater), -- (_, BaseHasVtable) => Some(cmp::Ordering::Less), -- (SelfHasVtable, _) => Some(cmp::Ordering::Greater), -- (_, SelfHasVtable) => Some(cmp::Ordering::Less), -- _ => unreachable!(), -- } -- } --} -- - impl HasVtableResult { - /// Take the least upper bound of `self` and `rhs`. - pub fn join(self, rhs: Self) -> Self { ---- a/third_party/rust/bindgen/src/ir/analysis/sizedness.rs -+++ b/third_party/rust/bindgen/src/ir/analysis/sizedness.rs -@@ -22,13 +22,14 @@ use {HashMap, Entry}; - /// - /// We initially assume that all types are `ZeroSized` and then update our - /// understanding as we learn more about each type. --#[derive(Copy, Clone, Debug, PartialEq, Eq, Ord)] -+#[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord)] - pub enum SizednessResult { -- /// Has some size that is known to be greater than zero. That doesn't mean -- /// it has a static size, but it is not zero sized for sure. In other words, -- /// it might contain an incomplete array or some other dynamically sized -- /// type. -- NonZeroSized, -+ /// The type is zero-sized. -+ /// -+ /// This means that if it is a C++ type, and is not being used as a base -+ /// member, then we must add an `_address` byte to enforce the -+ /// unique-address-per-distinct-object-instance rule. -+ ZeroSized, - - /// Whether this type is zero-sized or not depends on whether a type - /// parameter is zero-sized or not. -@@ -52,12 +53,11 @@ pub enum SizednessResult { - /// https://github.com/rust-lang-nursery/rust-bindgen/issues/586 - DependsOnTypeParam, - -- /// The type is zero-sized. -- /// -- /// This means that if it is a C++ type, and is not being used as a base -- /// member, then we must add an `_address` byte to enforce the -- /// unique-address-per-distinct-object-instance rule. -- ZeroSized, -+ /// Has some size that is known to be greater than zero. That doesn't mean -+ /// it has a static size, but it is not zero sized for sure. In other words, -+ /// it might contain an incomplete array or some other dynamically sized -+ /// type. -+ NonZeroSized, - } - - impl Default for SizednessResult { -@@ -66,21 +66,6 @@ impl Default for SizednessResult { - } - } - --impl cmp::PartialOrd for SizednessResult { -- fn partial_cmp(&self, rhs: &Self) -> Option { -- use self::SizednessResult::*; -- -- match (*self, *rhs) { -- (x, y) if x == y => Some(cmp::Ordering::Equal), -- (NonZeroSized, _) => Some(cmp::Ordering::Greater), -- (_, NonZeroSized) => Some(cmp::Ordering::Less), -- (DependsOnTypeParam, _) => Some(cmp::Ordering::Greater), -- (_, DependsOnTypeParam) => Some(cmp::Ordering::Less), -- _ => unreachable!(), -- } -- } --} -- - impl SizednessResult { - /// Take the least upper bound of `self` and `rhs`. - pub fn join(self, rhs: Self) -> Self { ---- a/third_party/rust/bindgen/src/ir/derive.rs -+++ b/third_party/rust/bindgen/src/ir/derive.rs -@@ -92,10 +92,10 @@ pub trait CanDeriveOrd { - /// - /// Initially we assume that we can derive trait for all types and then - /// update our understanding as we learn more about each type. --#[derive(Debug, Copy, Clone, PartialEq, Eq, Ord)] -+#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord)] - pub enum CanDerive { -- /// No, we cannot. -- No, -+ /// Yes, we can derive automatically. -+ Yes, - - /// The only thing that stops us from automatically deriving is that - /// array with more than maximum number of elements is used. -@@ -103,8 +103,8 @@ pub enum CanDerive { - /// This means we probably can "manually" implement such trait. - Manually, - -- /// Yes, we can derive automatically. -- Yes, -+ /// No, we cannot. -+ No, - } - - impl Default for CanDerive { -@@ -113,22 +113,6 @@ impl Default for CanDerive { - } - } - --impl cmp::PartialOrd for CanDerive { -- fn partial_cmp(&self, rhs: &Self) -> Option { -- use self::CanDerive::*; -- -- let ordering = match (*self, *rhs) { -- (x, y) if x == y => cmp::Ordering::Equal, -- (No, _) => cmp::Ordering::Greater, -- (_, No) => cmp::Ordering::Less, -- (Manually, _) => cmp::Ordering::Greater, -- (_, Manually) => cmp::Ordering::Less, -- _ => unreachable!() -- }; -- Some(ordering) -- } --} -- - impl CanDerive { - /// Take the least upper bound of `self` and `rhs`. - pub fn join(self, rhs: Self) -> Self { -- cgit v1.2.3