60.7.0-1

3 files changed, 10 insertions, 41 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 25e724ff5521..77811bc9b55e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = thunderbird-appmenu
 	pkgdesc = Thunderbird from extra with appmenu patch
-	pkgver = 60.6.1
-	pkgrel = 2
+	pkgver = 60.7.0
+	pkgrel = 1
 	url = https://aur.archlinux.org/packages/thunderbird-appmenu/
 	arch = x86_64
 	license = MPL
@@ -36,17 +36,17 @@ pkgbase = thunderbird-appmenu
 	depends = ttf-font
 	depends = icu
 	optdepends = libcanberra: sound support
-	provides = thunderbird=60.6.1
+	provides = thunderbird=60.7.0
 	conflicts = thunderbird
 	options = !emptydirs
 	options = !makeflags
-	source = https://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/60.6.1/source/thunderbird-60.6.1.source.tar.xz
+	source = https://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/60.7.0/source/thunderbird-60.7.0.source.tar.xz
 	source = thunderbird.desktop
 	source = rust-1.33.patch
 	source = unity-menubar.patch
-	sha256sums = 17aef9232a76bdc812422883c02b01b4ecb7633c3ee9870da5e4ec0e20ba5f67
+	sha256sums = 377ca762624df103dd768dc36b7632537b46aa83ddc9d336a157cadcde8bb51d
 	sha256sums = 3534ea85d8e0e35dba5f40a7a07844df19f3a480e1358fc50c2502f122dab789
-	sha256sums = 97bdb978d59cf5f0f967750e9d8dfbc8fc73367b08437838c44a308fe2ee5442
+	sha256sums = 2b0244a9f7a30f28bcc12055f171e5506c7e3b929d85c3b3514b7e4e4c251784
 	sha256sums = 22786f52773b93046fdb12378f67343b1d7d3390e83a00ff4aa03948c2b1c9e2
 
 pkgname = thunderbird-appmenu
diff --git a/PKGBUILD b/PKGBUILD
index 1eccb8095450..732180042648 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,8 +8,8 @@
 
 _pkgname=thunderbird
 pkgname=thunderbird-appmenu
-pkgver=60.6.1
-pkgrel=2
+pkgver=60.7.0
+pkgrel=1
 pkgdesc="Thunderbird from extra with appmenu patch"
 arch=(x86_64)
 license=(MPL GPL LGPL)
@@ -26,9 +26,9 @@ source=(https://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$pkgver/sou
         $_pkgname.desktop
         rust-1.33.patch
         unity-menubar.patch)
-sha256sums=('17aef9232a76bdc812422883c02b01b4ecb7633c3ee9870da5e4ec0e20ba5f67'
+sha256sums=('377ca762624df103dd768dc36b7632537b46aa83ddc9d336a157cadcde8bb51d'
             '3534ea85d8e0e35dba5f40a7a07844df19f3a480e1358fc50c2502f122dab789'
-            '97bdb978d59cf5f0f967750e9d8dfbc8fc73367b08437838c44a308fe2ee5442'
+            '2b0244a9f7a30f28bcc12055f171e5506c7e3b929d85c3b3514b7e4e4c251784'
             '22786f52773b93046fdb12378f67343b1d7d3390e83a00ff4aa03948c2b1c9e2')
 
 # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
diff --git a/rust-1.33.patch b/rust-1.33.patch
index 30da2437a037..f4b19bcf1232 100644
--- a/rust-1.33.patch
+++ b/rust-1.33.patch
@@ -9,17 +9,6 @@ diff -up thunderbird-60.5.3/servo/components/style/gecko/regen_atoms.py.rust-1.3
  #[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
@@ -48,23 +37,3 @@ diff -up thunderbird-60.5.3/servo/components/style/properties/properties.mako.rs
  #[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)]