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

[Levente Polyak]

    Date: Wednesday, September 4, 2019 @ 08:17:38
  Author: anthraxx
Revision: 361601

upgpkg: thunderbird 68.0-1

Modified:
  thunderbird/trunk/PKGBUILD
Deleted:
  thunderbird/trunk/rust-1.35.patch

-----------------+
 PKGBUILD        |   14 ++++----------
 rust-1.35.patch |   47 -----------------------------------------------
 2 files changed, 4 insertions(+), 57 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-09-04 05:13:29 UTC (rev 361600)
+++ PKGBUILD	2019-09-04 08:17:38 UTC (rev 361601)
@@ -6,7 +6,7 @@
 # Contributor: Anders Bostrom <anders.bostrom at home.se>
 
 pkgname=thunderbird
-pkgver=60.8.0
+pkgver=68.0
 pkgrel=1
 pkgdesc='Standalone mail and news reader from mozilla.org'
 url='https://www.mozilla.org/thunderbird/'
@@ -14,16 +14,14 @@
 license=(MPL GPL LGPL)
 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 libpulse inetutils xorg-server-xvfb
-             autoconf2.13 rust clang llvm gtk2)
+makedepends=(unzip zip diffutils python python2 yasm nasm mesa imake libpulse inetutils xorg-server-xvfb
+             autoconf2.13 rust clang llvm gtk2 cbindgen nodejs)
 optdepends=('libcanberra: sound support')
 options=(!emptydirs !makeflags)
 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=('1e7a13e64b63476d2235aaac6823fdab949af45cfcd5a25ee710cbae08c2f5d1'
+sha256sums=('f87dade2dd64ef61de842812d3e42d82b8a541988da851077778abfa2ebd95d1'
             'SKIP'
-            '3257987cc0ab0559c65561d523eb4d0e73b5edb86d9d18a2487818d9fca0bb30'
             'e44c55501f650a4e80b9c353b81f33e07ca65808db831eff6ca616aded233827')
 validpgpkeys=(14F26682D0916CDD81E37B6D61B7B526D98F0353) # Mozilla Software Releases <release at mozilla.com>
 
@@ -42,8 +40,6 @@
 prepare() {
   cd $pkgname-$pkgver
 
-  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
 
@@ -79,7 +75,6 @@
 # ac_add_options --with-system-libvpx
 ac_add_options --with-system-nspr
 ac_add_options --with-system-nss
-ac_add_options --enable-system-hunspell
 ac_add_options --enable-system-sqlite
 ac_add_options --enable-system-ffi
 
@@ -144,7 +139,6 @@
     "$pkgdir/usr/share/applications/$pkgname.desktop"
 
   # Use system-provided dictionaries
-  rm -r "$pkgdir/usr/lib/$pkgname/dictionaries"
   ln -Ts /usr/share/hunspell "$pkgdir/usr/lib/$pkgname/dictionaries"
   ln -Ts /usr/share/hyphen "$pkgdir/usr/lib/$pkgname/hyphenation"
 

Deleted: rust-1.35.patch
===================================================================
--- rust-1.35.patch	2019-09-04 05:13:29 UTC (rev 361600)
+++ rust-1.35.patch	2019-09-04 08:17:38 UTC (rev 361601)
@@ -1,47 +0,0 @@
-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.000000000 +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: ident($( $arg: expr, )+)) => {
-@@ -404,6 +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);
- 
-+/// Some comment
- #[macro_export]
- macro_rules! define_css_keyword_enum {
-     (pub enum $name:ident { $($variant:ident = $css:expr,)+ }) => {
-diff -up thunderbird-60.8.0/servo/components/style/properties/properties.mako.rs.old thunderbird-60.8.0/servo/components/style/properties/properties.mako.rs
---- thunderbird-60.8.0/servo/components/style/properties/properties.mako.rs.old	2019-07-11 14:22:51.393784701 +0200
-+++ thunderbird-60.8.0/servo/components/style/properties/properties.mako.rs	2019-07-11 14:24:03.182578100 +0200
-@@ -55,6 +55,7 @@ use style_adjuster::StyleAdjuster;
- 
- pub use self::declaration_block::*;
- 
-+/// Neco
- #[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.
-+/// NOTE(emilio): 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) => {