[arch-commits] Commit in thunderbird/trunk (PKGBUILD rust-1.33.patch)

Evangelos Foutras foutrelis at archlinux.org
Sat Apr 6 03:59:44 UTC 2019


    Date: Saturday, April 6, 2019 @ 03:59:44
  Author: foutrelis
Revision: 350154

upgpkg: thunderbird 60.6.1-1

- New upstream release
- Add patch from Fedora to fix building with Rust 1.33
- Leave out --enable-rust-simd because it breaks the build
- Split Google API key into Location Service and Safe Browsing

Added:
  thunderbird/trunk/rust-1.33.patch
Modified:
  thunderbird/trunk/PKGBUILD

-----------------+
 PKGBUILD        |   15 ++++++++---
 rust-1.33.patch |   70 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 81 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-04-05 20:13:49 UTC (rev 350153)
+++ PKGBUILD	2019-04-06 03:59:44 UTC (rev 350154)
@@ -6,7 +6,7 @@
 # Contributor: Anders Bostrom <anders.bostrom at home.se>
 
 pkgname=thunderbird
-pkgver=60.5.3
+pkgver=60.6.1
 pkgrel=1
 pkgdesc='Standalone mail and news reader from mozilla.org'
 url='https://www.mozilla.org/thunderbird/'
@@ -19,8 +19,10 @@
 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
         $pkgname.desktop)
-sha256sums=('83c91c4dc9b537aca99db45f99ccf2258cd830c704fb4aa994df18272c8a5211'
+sha256sums=('17aef9232a76bdc812422883c02b01b4ecb7633c3ee9870da5e4ec0e20ba5f67'
+            '97bdb978d59cf5f0f967750e9d8dfbc8fc73367b08437838c44a308fe2ee5442'
             'e44c55501f650a4e80b9c353b81f33e07ca65808db831eff6ca616aded233827')
 
 # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
@@ -38,6 +40,9 @@
 prepare() {
   cd $pkgname-$pkgver
 
+  # https://bugzilla.mozilla.org/show_bug.cgi?id=1539901 (Patch from Fedora)
+  patch -Np1 -i ../rust-1.33.patch
+
   echo -n "$_google_api_key" >google-api-key
   echo -n "$_mozilla_api_key" >mozilla-api-key
 
@@ -50,7 +55,8 @@
 ac_add_options --enable-linker=gold
 ac_add_options --enable-hardening
 ac_add_options --enable-optimize
-ac_add_options --enable-rust-simd
+# https://bugzilla.mozilla.org/show_bug.cgi?id=1521249
+#ac_add_options --enable-rust-simd
 
 # Branding
 ac_add_options --enable-official-branding
@@ -58,7 +64,8 @@
 ac_add_options --with-distribution-id=org.archlinux
 
 # Keys
-ac_add_options --with-google-api-keyfile=${PWD at Q}/google-api-key
+ac_add_options --with-google-location-service-api-keyfile=${PWD at Q}/google-api-key
+ac_add_options --with-google-safebrowsing-api-keyfile=${PWD at Q}/google-api-key
 ac_add_options --with-mozilla-api-keyfile=${PWD at Q}/mozilla-api-key
 
 # System libraries

Added: rust-1.33.patch
===================================================================
--- rust-1.33.patch	                        (rev 0)
+++ rust-1.33.patch	2019-04-06 03:59:44 UTC (rev 350154)
@@ -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)]


More information about the arch-commits mailing list