[arch-commits] Commit in thunderbird/trunk (2 files)

[Antonio Rojas]

    Date: Sunday, November 4, 2018 @ 20:58:21
  Author: arojas
Revision: 337854

Update to 60.3.0

Modified:
  thunderbird/trunk/PKGBUILD
Deleted:
  thunderbird/trunk/thunderbird-60.2.1-buildfix.patch

-----------------------------------+
 PKGBUILD                          |   13 ++++-------
 thunderbird-60.2.1-buildfix.patch |   42 ------------------------------------
 2 files changed, 5 insertions(+), 50 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-11-04 18:24:28 UTC (rev 337853)
+++ PKGBUILD	2018-11-04 20:58:21 UTC (rev 337854)
@@ -5,8 +5,8 @@
 # Contributor: Anders Bostrom <anders.bostrom at home.se>
 
 pkgname=thunderbird
-pkgver=60.2.1
-pkgrel=2
+pkgver=60.3.0
+pkgrel=1
 pkgdesc="Standalone mail and news reader from mozilla.org"
 arch=(x86_64)
 license=(MPL GPL LGPL)
@@ -18,11 +18,9 @@
 optdepends=('libcanberra: sound support')
 options=(!emptydirs !makeflags)
 source=(https://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$pkgver/source/thunderbird-$pkgver.source.tar.xz
-        $pkgname.desktop
-        thunderbird-60.2.1-buildfix.patch)
-sha256sums=('d313f25cd7ddc016bf8e4d4115f14b34a66621c0feabbc0dd72f9304cb93d7bf'
-            'e44c55501f650a4e80b9c353b81f33e07ca65808db831eff6ca616aded233827'
-            '884c5a6742677c83173812f7abb1e409a2b13371ba6079c4cb69b3e95010de05')
+        $pkgname.desktop)
+sha256sums=('23fc097a5aa62006919029df890e5e2bec38c2c3e6081723040ef702ff6e4a7b'
+            'e44c55501f650a4e80b9c353b81f33e07ca65808db831eff6ca616aded233827')
 
 # 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
@@ -81,7 +79,6 @@
 ac_add_options --disable-crashreporter
 ac_add_options --disable-updater
 END
-  patch -Np1 < ../thunderbird-60.2.1-buildfix.patch
 }
 
 build() {

Deleted: thunderbird-60.2.1-buildfix.patch
===================================================================
--- thunderbird-60.2.1-buildfix.patch	2018-11-04 18:24:28 UTC (rev 337853)
+++ thunderbird-60.2.1-buildfix.patch	2018-11-04 20:58:21 UTC (rev 337854)
@@ -1,42 +0,0 @@
-
-# HG changeset patch
-# User Chris Manchester <cmanchester at mozilla.com>
-# Date 1533063488 25200
-# Node ID bc651d3d910cbc0730d870c5436b29ddc01fef10
-# Parent  e9dd9434ad9ac15284429d904a45e4daf567c03b
-Bug 1479540 - Accept "triplet" strings with only two parts in moz.configure. r=froydnj, a=jcristau
-
-MozReview-Commit-ID: 7pFhoJgBMhQ
-
-diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure
---- a/build/moz.configure/init.configure
-+++ b/build/moz.configure/init.configure
-@@ -586,17 +586,26 @@ option('--target', nargs=1,
- @imports(_from='__builtin__', _import='KeyError')
- @imports(_from='__builtin__', _import='ValueError')
- def split_triplet(triplet, allow_unknown=False):
-     # The standard triplet is defined as
-     #   CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
-     # There is also a quartet form:
-     #   CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
-     # But we can consider the "KERNEL-OPERATING_SYSTEM" as one.
--    cpu, manufacturer, os = triplet.split('-', 2)
-+    # Additionally, some may omit "unknown" when the manufacturer
-+    # is not specified and emit
-+    #   CPU_TYPE-OPERATING_SYSTEM
-+    parts = triplet.split('-', 2)
-+    if len(parts) == 3:
-+        cpu, _, os = parts
-+    elif len(parts) == 2:
-+        cpu, os = parts
-+    else:
-+        die("Unexpected triplet string: %s" % triplet)
- 
-     # Autoconf uses config.sub to validate and canonicalize those triplets,
-     # but the granularity of its results has never been satisfying to our
-     # use, so we've had our own, different, canonicalization. We've also
-     # historically not been very consistent with how we use the canonicalized
-     # values. Hopefully, this will help us make things better.
-     # The tests are inherited from our decades-old autoconf-based configure,
-     # which can probably be improved/cleaned up because they are based on a
-