From 467a615a85f0d378bc24e0d4da306cd62e61d366 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 3 Feb 2019 14:59:56 +0100
Subject: [PATCH] thunderbird: update to 60.5.0.

[skip ci]
---
 srcpkgs/thunderbird/patches/fix-toolkit.patch | 23 ++++++++---------
 srcpkgs/thunderbird/patches/fix-tools.patch   | 25 +++++++++----------
 srcpkgs/thunderbird/template                  |  4 +--
 3 files changed, 25 insertions(+), 27 deletions(-)

diff --git a/srcpkgs/thunderbird/patches/fix-toolkit.patch b/srcpkgs/thunderbird/patches/fix-toolkit.patch
index 7d79879862d..120ea8561e9 100644
--- a/srcpkgs/thunderbird/patches/fix-toolkit.patch
+++ b/srcpkgs/thunderbird/patches/fix-toolkit.patch
@@ -47,18 +47,6 @@
  #include <a.out.h>
  #endif
 
-
---- toolkit.orig/mozapps/update/common/updatedefines.h	2014-03-15 05:19:37.000000000 +0000
-+++ toolkit/mozapps/update/common/updatedefines.h	2014-04-17 10:24:33.793431933 +0000
-@@ -105,7 +105,7 @@
- 
- #ifdef SOLARIS
- # include <sys/stat.h>
--#else
-+#elif !defined(__linux__) || defined(__GLIBC__)
- # include <fts.h>
- #endif
- # include <dirent.h>
 --- toolkit.orig/mozapps/update/updater/updater.cpp	2014-03-15 05:19:37.000000000 +0000
 +++ toolkit/mozapps/update/updater/updater.cpp	2014-04-17 10:24:33.796765327 +0000
 @@ -3432,6 +3432,7 @@
@@ -77,3 +65,14 @@
  
    return rv;
  }
+--- toolkit/mozapps/update/common/updatedefines.h	2019-02-03 14:48:50.526625890 +0100
++++ toolkit/mozapps/update/common/updatedefines.h	2019-02-03 14:49:51.466743641 +0100
+@@ -100,7 +100,7 @@
+ 
+ #ifdef SOLARIS
+ #include <sys/stat.h>
+-#else
++#elif !defined(__linux__) || defined(__GLIBC__)
+ #include <fts.h>
+ #endif
+ #include <dirent.h>
diff --git a/srcpkgs/thunderbird/patches/fix-tools.patch b/srcpkgs/thunderbird/patches/fix-tools.patch
index d5a94cb5798..97e77307cea 100644
--- a/srcpkgs/thunderbird/patches/fix-tools.patch
+++ b/srcpkgs/thunderbird/patches/fix-tools.patch
@@ -9,14 +9,14 @@
  #include <stdint.h>
  #include <math.h>
  #include "MainThreadUtils.h"
---- tools/profiler/lul/LulElf.cpp
-+++ tools/profiler/lul/LulElf.cpp
-@@ -579,10 +579,10 @@
+--- tools/profiler/lul/LulElf.cpp	2019-02-03 14:54:15.727928668 +0100
++++ tools/profiler/lul/LulElf.cpp	2019-02-03 14:55:54.342546975 +0100
+@@ -459,10 +459,10 @@
  // Return the non-directory portion of FILENAME: the portion after the
  // last slash, or the whole filename if there are no slashes.
- string BaseFileName(const string &filename) {
+ string BaseFileName(const string& filename) {
 -  // Lots of copies!  basename's behavior is less than ideal.
--  char *c_filename = strdup(filename.c_str());
+-  char* c_filename = strdup(filename.c_str());
 -  string base = basename(c_filename);
 -  free(c_filename);
 +  // basename's behavior is less than ideal so avoid it
@@ -25,13 +25,13 @@
 +  string base = p ? p+1 : c_filename;
    return base;
  }
-
---- tools/profiler/core/platform-linux-android.cpp.orig
-+++ tools/profiler/core/platform-linux-android.cpp
-@@ -534,9 +534,11 @@
- void
- Registers::SyncPopulate()
- {
+ 
+--- tools/profiler/core/platform-linux-android.cpp	2019-02-03 14:56:23.607139579 +0100
++++ tools/profiler/core/platform-linux-android.cpp	2019-02-03 14:57:03.198587558 +0100
+@@ -497,8 +497,10 @@
+ ucontext_t sSyncUContext;
+ 
+ void Registers::SyncPopulate() {
 +#if defined(__GLIBC__)
    if (!getcontext(&sSyncUContext)) {
      PopulateRegsFromContext(*this, &sSyncUContext);
@@ -39,4 +39,3 @@
 +#endif
  }
  #endif
- 
diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index a3a575b21ff..e08db1a3815 100644
--- a/srcpkgs/thunderbird/template
+++ b/srcpkgs/thunderbird/template
@@ -3,14 +3,14 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/thunderbird-i18n".
 #
 pkgname=thunderbird
-version=60.4.0
+version=60.5.0
 revision=1
 short_desc="Standalone Mail/News reader"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 homepage="https://www.thunderbird.net/"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=27a6cdd9cfdd7ce70b1d193c64739db6be6b39eec308f0122d8472a6cd243e75
+checksum=6f96e87e832e4089c69418db64e19afd54a0acefe3e0364087a8bc6f442b9566
 
 only_for_archs="i686 i686-musl x86_64 x86_64-musl"
 lib32disabled=yes