From 936abd362cedf96ea9889e05468fc74bf47778fb Mon Sep 17 00:00:00 2001
From: Andreas Grapentin <andreas@grapentin.org>
Date: Thu, 11 Apr 2019 23:25:02 +0200
Subject: nonprism/icedove: updated to 60.6.1

---
 nonprism/icedove/PKGBUILD        | 24 ++++++++------
 nonprism/icedove/rust-1.33.patch | 70 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 85 insertions(+), 9 deletions(-)
 create mode 100644 nonprism/icedove/rust-1.33.patch

diff --git a/nonprism/icedove/PKGBUILD b/nonprism/icedove/PKGBUILD
index 5e15c6c8d..9b3f15496 100644
--- a/nonprism/icedove/PKGBUILD
+++ b/nonprism/icedove/PKGBUILD
@@ -21,7 +21,7 @@ _pkgname=thunderbird
 pkgname=icedove
 replaces=("$_pkgname")
 epoch=1
-pkgver=60.5.1
+pkgver=60.6.1
 pkgrel=2
 pkgrel+=.parabola1.nonprism1
 _brandingver=60.5
@@ -40,11 +40,13 @@ 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
-        $pkgname.desktop)
-source+=(https://repo.parabola.nu/other/icedove/${pkgname}_$_brandingver-$_brandingrel.branding.tar.xz{,.sig}
-         mozilla-1238661.patch
-         libre-searchengines.patch)
-sha256sums=('69a3f741b7378b50a3b6a3b59f6c4fedd2d82d469ab234390627e15da1b58e03'
+        rust-1.33.patch
+        $pkgname.desktop
+        https://repo.parabola.nu/other/icedove/${pkgname}_$_brandingver-$_brandingrel.branding.tar.xz{,.sig}
+        mozilla-1238661.patch
+        libre-searchengines.patch)
+sha256sums=('17aef9232a76bdc812422883c02b01b4ecb7633c3ee9870da5e4ec0e20ba5f67'
+            '97bdb978d59cf5f0f967750e9d8dfbc8fc73367b08437838c44a308fe2ee5442'
             'af8199a12ebe09189d143458bd1e2d0071aff3410ed121dc2329a448a56632f0'
             '590862b39ba7baf60e47240e33de5839a8e85b6831c839ea57481968c9020241'
             'SKIP'
@@ -55,6 +57,9 @@ 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 <<END
 ac_add_options --enable-application=comm/mail
 ac_add_options --enable-calendar
@@ -64,7 +69,7 @@ ac_add_options --enable-release
 ac_add_options --enable-linker=gold
 ac_add_options --enable-hardening
 ac_add_options --enable-optimize
-ac_add_options --enable-rust-simd
+#ac_add_options --enable-rust-simd
 
 # Branding
 ac_add_options --disable-official-branding
@@ -104,6 +109,8 @@ END
 
     cat >> .mozconfig <<END
 ac_add_options --disable-webrtc
+ac_add_options --disable-elf-hack
+ac_add_options --enable-optimize="-g -O2 -fno-schedule-insns"
 END
   fi
 
@@ -179,12 +186,11 @@ build() {
   cd $_pkgname-$pkgver
 
   if [[ $CARCH = armv7h ]]; then
-    export RUSTFLAGS+=" -Cdebuginfo=0 -Clto=off"
     export LDFLAGS+=" -Wl,--no-keep-memory -Wl,--reduce-memory-overheads"
   fi
 
   if [[ $CARCH = i686 ]]; then
-    export RUSTFLAGS+=" -Cdebuginfo=0 -Clto=off"
+    sed -i 's/\(cargo_rustc_flags += -C lto\)/#\1/' config/rules.mk
     export LDFLAGS+=" -Wl,--no-keep-memory -Wl,--reduce-memory-overheads"
   fi
 
diff --git a/nonprism/icedove/rust-1.33.patch b/nonprism/icedove/rust-1.33.patch
new file mode 100644
index 000000000..30da2437a
--- /dev/null
+++ b/nonprism/icedove/rust-1.33.patch
@@ -0,0 +1,70 @@
+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.2