[arch-commits] Commit in thunderbird/trunk (PKGBUILD rust-1.33.patch rust-1.35.patch)
Date: Sunday, July 14, 2019 @ 10:46:13
Author: arojas
Revision: 357972
Update to 60.8.0
Added:
thunderbird/trunk/rust-1.35.patch
Modified:
thunderbird/trunk/PKGBUILD
Deleted:
thunderbird/trunk/rust-1.33.patch
-+
PKGBUILD| 15 ---
rust-1.33.patch | 39 ---
rust-1.35.patch | 47 +++
3 files changed, 55 insertions(+), 46 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-07-14 10:28:16 UTC (rev 357971)
+++ PKGBUILD2019-07-14 10:46:13 UTC (rev 357972)
@@ -6,7 +6,7 @@
# Contributor: Anders Bostrom
pkgname=thunderbird
-pkgver=60.7.2
+pkgver=60.8.0
pkgrel=1
pkgdesc='Standalone mail and news reader from mozilla.org'
url='https://www.mozilla.org/thunderbird/'
@@ -18,12 +18,14 @@
autoconf2.13 rust clang llvm gtk2)
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}
+rust-1.35.patch
$pkgname.desktop)
-sha256sums=('fc89a5f66b17d554fc0b9c153483edcc74b1bacc916dfd6dccead8478060af31'
-'2b0244a9f7a30f28bcc12055f171e5506c7e3b929d85c3b3514b7e4e4c251784'
+sha256sums=('1e7a13e64b63476d2235aaac6823fdab949af45cfcd5a25ee710cbae08c2f5d1'
+'SKIP'
+'3257987cc0ab0559c65561d523eb4d0e73b5edb86d9d18a2487818d9fca0bb30'
'e44c55501f650a4e80b9c353b81f33e07ca65808db831eff6ca616aded233827')
+validpgpkeys=(14F26682D0916CDD81E37B6D61B7B526D98F0353) # Mozilla Software
Releases
# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
# Note: These are for Arch Linux use ONLY. For your own distribution, please
@@ -40,8 +42,7 @@
prepare() {
cd $pkgname-$pkgver
- # https://bugzilla.mozilla.org/show_bug.cgi?id=1539901 (Patch from Fedora)
- patch -Np1 -i ../rust-1.33.patch
+ patch -Np1 -i ../rust-1.35.patch # Fix build with rust 1.35 (Fedora)
echo -n "$_google_api_key" >google-api-key
echo -n "$_mozilla_api_key" >mozilla-api-key
Deleted: rust-1.33.patch
===
--- rust-1.33.patch 2019-07-14 10:28:16 UTC (rev 357971)
+++ rust-1.33.patch 2019-07-14 10:46:13 UTC (rev 357972)
@@ -1,39 +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.0 +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/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.0 +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) => {
Added: rust-1.35.patch
===
--- rust-1.35.patch (rev 0)
+++ rust-1.35.patch 2019-07-14 10:46:13 UTC (rev 357972)
@@ -0,0 +1,47 @@
+diff -up
thunderbird-60.8.0/servo/components/style_traits/values.rs.rust-1.33-build
thunderbird-60.8.0/servo/components/style_traits/values.rs
+--- thunderbird-60.8.0/servo/components/style_traits/values.rs.rust-1.33-build
2019-07-03 17:25:28.0 +0200
thunderbird-60.8.0/servo/components/style_traits/values.rs 2019-07-11
13:38:53.687318154 +0200
+@@ -135,6 +135,7 @@ where
+ }
+ }
+
++/// Some comment
+ #[macro_export]
+ macro_rules! serialize_function {
+ ($dest: expr, $name:
[arch-commits] Commit in thunderbird/trunk (PKGBUILD rust-1.33.patch)
Date: Tuesday, May 21, 2019 @ 21:29:40
Author: foutrelis
Revision: 353738
upgpkg: thunderbird 60.7.0-1
New upstream release.
Modified:
thunderbird/trunk/PKGBUILD
thunderbird/trunk/rust-1.33.patch
-+
PKGBUILD|8
rust-1.33.patch | 31 ---
2 files changed, 4 insertions(+), 35 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-05-21 18:18:41 UTC (rev 353737)
+++ PKGBUILD2019-05-21 21:29:40 UTC (rev 353738)
@@ -6,8 +6,8 @@
# Contributor: Anders Bostrom
pkgname=thunderbird
-pkgver=60.6.1
-pkgrel=2
+pkgver=60.7.0
+pkgrel=1
pkgdesc='Standalone mail and news reader from mozilla.org'
url='https://www.mozilla.org/thunderbird/'
arch=(x86_64)
@@ -21,8 +21,8 @@
source=(https://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$pkgver/source/thunderbird-$pkgver.source.tar.xz
rust-1.33.patch
$pkgname.desktop)
-sha256sums=('17aef9232a76bdc812422883c02b01b4ecb7633c3ee9870da5e4ec0e20ba5f67'
-'97bdb978d59cf5f0f967750e9d8dfbc8fc73367b08437838c44a308fe2ee5442'
+sha256sums=('377ca762624df103dd768dc36b7632537b46aa83ddc9d336a157cadcde8bb51d'
+'2b0244a9f7a30f28bcc12055f171e5506c7e3b929d85c3b3514b7e4e4c251784'
'e44c55501f650a4e80b9c353b81f33e07ca65808db831eff6ca616aded233827')
# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
Modified: rust-1.33.patch
===
--- rust-1.33.patch 2019-05-21 18:18:41 UTC (rev 353737)
+++ rust-1.33.patch 2019-05-21 21:29:40 UTC (rev 353738)
@@ -9,17 +9,6 @@
#[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.0 +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.0 +0100
+++ thunderbird-60.5.3/servo/components/style/properties/properties.mako.rs
2019-03-13 15:05:58.966726107 +0100
@@ -48,23 +37,3 @@
#[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.0 +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)]
[arch-commits] Commit in thunderbird/trunk (PKGBUILD rust-1.33.patch)
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
===
--- PKGBUILD2019-04-05 20:13:49 UTC (rev 350153)
+++ PKGBUILD2019-04-06 03:59:44 UTC (rev 350154)
@@ -6,7 +6,7 @@
# Contributor: Anders Bostrom
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@Q}/google-api-key
+ac_add_options
--with-google-location-service-api-keyfile=${PWD@Q}/google-api-key
+ac_add_options --with-google-safebrowsing-api-keyfile=${PWD@Q}/google-api-key
ac_add_options --with-mozilla-api-keyfile=${PWD@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.0 +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.0 +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.0 +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) => {
