From 74b5e4a4684bc3b8f20965a751e46452e0a536a5 Mon Sep 17 00:00:00 2001 From: bill-auger Date: Thu, 26 Sep 2019 21:23:35 -0400 Subject: [icedove]: sync with arch v68 (broken) --- libre/icedove/PKGBUILD | 42 +++++++++++----------- libre/icedove/mozilla-1238661.patch | 12 ------- libre/icedove/rust-1.33.patch | 70 ------------------------------------- 3 files changed, 20 insertions(+), 104 deletions(-) delete mode 100644 libre/icedove/mozilla-1238661.patch delete mode 100644 libre/icedove/rust-1.33.patch diff --git a/libre/icedove/PKGBUILD b/libre/icedove/PKGBUILD index 4895bbdf4..8d5afb25c 100644 --- a/libre/icedove/PKGBUILD +++ b/libre/icedove/PKGBUILD @@ -19,45 +19,40 @@ _pkgname=thunderbird pkgname=icedove replaces=("$_pkgname") -epoch=1 -pkgver=60.6.1 -pkgrel=3 +pkgver=68.1.0 +pkgrel=1 pkgrel+=.parabola1 _brandingver=60.5 _brandingrel=1 pkgdesc="Libre standalone mail and news reader based on Mozilla Thunderbird" +url="https://wiki.parabola.nu/$pkgname" arch=(x86_64) arch+=(i686 armv7h) license=(MPL GPL LGPL) -url="https://wiki.parabola.nu/$pkgname" -depends=(gtk3 gtk2 mozilla-common libxt startup-notification mime-types dbus-glib alsa-lib + +depends=(gtk3 mozilla-common libxt startup-notification mime-types dbus-glib alsa-lib nss hunspell sqlite ttf-font icu) # libvpx -makedepends=(unzip zip diffutils python2 yasm mesa imake gconf libpulse inetutils xorg-server-xvfb - autoconf2.13 rust clang llvm) +makedepends=(unzip zip diffutils python python2 yasm nasm mesa imake libpulse inetutils xorg-server-xvfb + autoconf2.13 rust clang llvm gtk2 cbindgen nodejs) 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 - rust-1.33.patch +source=(https://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$pkgver/source/thunderbird-$pkgver.source.tar.xz{,.asc} $pkgname.desktop https://repo.parabola.nu/other/icedove/${pkgname}_$_brandingver-$_brandingrel.branding.tar.xz{,.sig} - mozilla-1238661.patch libre-searchengines.patch) -sha256sums=('17aef9232a76bdc812422883c02b01b4ecb7633c3ee9870da5e4ec0e20ba5f67' - '97bdb978d59cf5f0f967750e9d8dfbc8fc73367b08437838c44a308fe2ee5442' +sha256sums=('de0e5c7d1d5576f451e386e4779f155b7af97621a4e22caac0c6dee3c9d76eef' + 'SKIP' 'af8199a12ebe09189d143458bd1e2d0071aff3410ed121dc2329a448a56632f0' '590862b39ba7baf60e47240e33de5839a8e85b6831c839ea57481968c9020241' 'SKIP' - '97b1d3bb2916cd1a297682b3ae4dc679a5afce28610140c73e454b931116028e' '9ef9dd18ac1f76ccc3d5d2ace866bb40199fd00a1192da83aef376c585be2ec3') -validpgpkeys=(BFA8008A8265677063B11BF47171986E4B745536) # Andreas Grapentin +validpgpkeys=(14F26682D0916CDD81E37B6D61B7B526D98F0353) # Mozilla Software Releases +validpgpkeys+=(BFA8008A8265677063B11BF47171986E4B745536) # Andreas Grapentin prepare() { cd $_pkgname-$pkgver - # https://bugzilla.mozilla.org/show_bug.cgi?id=1539901 (Patch from Fedora) - patch -Np1 -i ../rust-1.33.patch - cat >.mozconfig <> .mozconfig < What's new" menu entry to mozilla.debian.net -pref("mailnews.start_page.override_url", "http://wiki.debian.org/Icedove/WhatsNew45"); +//pref("mailnews.start_page.override_url", "http://wiki.debian.org/Icedove/WhatsNew45"); END _distini="$pkgdir/usr/lib/$pkgname/distribution/distribution.ini" diff --git a/libre/icedove/mozilla-1238661.patch b/libre/icedove/mozilla-1238661.patch deleted file mode 100644 index d4fd64a6d..000000000 --- a/libre/icedove/mozilla-1238661.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up thunderbird-60.5.0/mfbt/LinuxSignal.h.mozilla-1238661 thunderbird-60.5.0/mfbt/LinuxSignal.h ---- thunderbird-60.5.0/mfbt/LinuxSignal.h.mozilla-1238661 2019-01-30 11:33:21.447003175 +0100 -+++ thunderbird-60.5.0/mfbt/LinuxSignal.h 2019-01-30 11:35:13.848537051 +0100 -@@ -22,7 +22,7 @@ __attribute__((naked)) void SignalTrampo - void* aContext) { - asm volatile("nop; nop; nop; nop" : : : "memory"); - -- asm volatile("b %0" : : "X"(H) : "memory"); -+ asm volatile("bx %0" : : "r"(H), "l"(aSignal), "l"(aInfo), "l"(aContext) : "memory"); - } - - #define MOZ_SIGNAL_TRAMPOLINE(h) (mozilla::SignalTrampoline) diff --git a/libre/icedove/rust-1.33.patch b/libre/icedove/rust-1.33.patch deleted file mode 100644 index 30da2437a..000000000 --- a/libre/icedove/rust-1.33.patch +++ /dev/null @@ -1,70 +0,0 @@ -diff -up thunderbird-60.5.3/servo/components/style/gecko/regen_atoms.py.rust-1.33-build thunderbird-60.5.3/servo/components/style/gecko/regen_atoms.py ---- thunderbird-60.5.3/servo/components/style/gecko/regen_atoms.py.rust-1.33-build 2019-03-04 19:17:31.000000000 +0100 -+++ thunderbird-60.5.3/servo/components/style/gecko/regen_atoms.py 2019-03-13 15:05:58.965726109 +0100 -@@ -202,6 +202,7 @@ RULE_TEMPLATE = ('("{atom}") =>\n ' - ' }}}};') - - MACRO = ''' -+/// Returns a static atom by passing the literal string it represents. - #[macro_export] - macro_rules! atom {{ - {} -diff -up thunderbird-60.5.3/servo/components/style/gecko_string_cache/namespace.rs.rust-1.33-build thunderbird-60.5.3/servo/components/style/gecko_string_cache/namespace.rs ---- thunderbird-60.5.3/servo/components/style/gecko_string_cache/namespace.rs.rust-1.33-build 2019-03-04 19:17:27.000000000 +0100 -+++ thunderbird-60.5.3/servo/components/style/gecko_string_cache/namespace.rs 2019-03-13 15:05:58.966726107 +0100 -@@ -11,6 +11,7 @@ use std::fmt; - use std::ops::Deref; - use string_cache::{Atom, WeakAtom}; - -+/// Macro text - #[macro_export] - macro_rules! ns { - () => { $crate::string_cache::Namespace(atom!("")) }; -diff -up thunderbird-60.5.3/servo/components/style/properties/properties.mako.rs.rust-1.33-build thunderbird-60.5.3/servo/components/style/properties/properties.mako.rs ---- thunderbird-60.5.3/servo/components/style/properties/properties.mako.rs.rust-1.33-build 2019-03-04 19:17:30.000000000 +0100 -+++ thunderbird-60.5.3/servo/components/style/properties/properties.mako.rs 2019-03-13 15:05:58.966726107 +0100 -@@ -55,6 +55,7 @@ use style_adjuster::StyleAdjuster; - - pub use self::declaration_block::*; - -+/// Generated - #[cfg(feature = "gecko")] - #[macro_export] - macro_rules! property_name { -@@ -3852,7 +3853,7 @@ impl fmt::Debug for AliasId { - } - } - --// NOTE(emilio): Callers are responsible to deal with prefs. -+/// Callers are responsible to deal with prefs. - #[macro_export] - macro_rules! css_properties_accessors { - ($macro_name: ident) => { -@@ -3875,6 +3876,7 @@ macro_rules! css_properties_accessors { - } - } - -+/// Neco - #[macro_export] - macro_rules! longhand_properties_idents { - ($macro_name: ident) => { -diff -up thunderbird-60.5.3/servo/components/style_traits/values.rs.rust-1.33-build thunderbird-60.5.3/servo/components/style_traits/values.rs ---- thunderbird-60.5.3/servo/components/style_traits/values.rs.rust-1.33-build 2019-03-04 19:17:27.000000000 +0100 -+++ thunderbird-60.5.3/servo/components/style_traits/values.rs 2019-03-13 15:37:34.077560034 +0100 -@@ -135,6 +135,7 @@ where - } - } - -+/// Neco - #[macro_export] - macro_rules! serialize_function { - ($dest: expr, $name: ident($( $arg: expr, )+)) => { -@@ -404,7 +405,7 @@ impl_to_css_for_predefined_type!(::csspa - impl_to_css_for_predefined_type!(::cssparser::Color); - impl_to_css_for_predefined_type!(::cssparser::UnicodeRange); - --#[macro_export] -+/// Define an enum type with unit variants that each correspond to a CSS keyword. - macro_rules! define_css_keyword_enum { - (pub enum $name:ident { $($variant:ident = $css:expr,)+ }) => { - #[allow(missing_docs)] -- cgit v1.2.3