60.3.0-1

3 files changed, 6 insertions, 53 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 19e5e5f1b996..b628dcb19130 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = thunderbird-appmenu
 	pkgdesc = Thunderbird from extra with appmenu patch
-	pkgver = 60.2.1
+	pkgver = 60.3.0
 	pkgrel = 1
 	url = https://aur.archlinux.org/packages/thunderbird-appmenu/
 	arch = x86_64
@@ -37,17 +37,15 @@ pkgbase = thunderbird-appmenu
 	depends = libvpx
 	depends = icu
 	optdepends = libcanberra: sound support
-	provides = thunderbird=60.2.1
+	provides = thunderbird=60.3.0
 	conflicts = thunderbird
 	options = !emptydirs
 	options = !makeflags
-	source = https://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/60.2.1/source/thunderbird-60.2.1.source.tar.xz
+	source = https://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/60.3.0/source/thunderbird-60.3.0.source.tar.xz
 	source = thunderbird.desktop
-	source = thunderbird-60.2.1-buildfix.patch
 	source = unity-menubar.patch
-	sha256sums = d313f25cd7ddc016bf8e4d4115f14b34a66621c0feabbc0dd72f9304cb93d7bf
+	sha256sums = 23fc097a5aa62006919029df890e5e2bec38c2c3e6081723040ef702ff6e4a7b
 	sha256sums = 3534ea85d8e0e35dba5f40a7a07844df19f3a480e1358fc50c2502f122dab789
-	sha256sums = 884c5a6742677c83173812f7abb1e409a2b13371ba6079c4cb69b3e95010de05
 	sha256sums = c6082f9ab534cdc67c53fa1685df628f03b0674390522f32fe640ce92f1b15ab
 
 pkgname = thunderbird-appmenu
diff --git a/PKGBUILD b/PKGBUILD
index b463c38da37a..1d678d62b923 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@
 
 _pkgname=thunderbird
 pkgname=thunderbird-appmenu
-pkgver=60.2.1
+pkgver=60.3.0
 pkgrel=1
 pkgdesc="Thunderbird from extra with appmenu patch"
 arch=(x86_64)
@@ -24,11 +24,9 @@ conflicts=("thunderbird")
 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
         unity-menubar.patch)
-sha256sums=('d313f25cd7ddc016bf8e4d4115f14b34a66621c0feabbc0dd72f9304cb93d7bf'
+sha256sums=('23fc097a5aa62006919029df890e5e2bec38c2c3e6081723040ef702ff6e4a7b'
             '3534ea85d8e0e35dba5f40a7a07844df19f3a480e1358fc50c2502f122dab789'
-            '884c5a6742677c83173812f7abb1e409a2b13371ba6079c4cb69b3e95010de05'
             'c6082f9ab534cdc67c53fa1685df628f03b0674390522f32fe640ce92f1b15ab')
 
 # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
@@ -88,7 +86,6 @@ ac_add_options --enable-startup-notification
 ac_add_options --disable-crashreporter
 ac_add_options --disable-updater
 END
-  patch -Np1 < ../thunderbird-60.2.1-buildfix.patch
 
   # actual appmenu patch from ubuntu repos
   patch -Np1 -i ../unity-menubar.patch
diff --git a/thunderbird-60.2.1-buildfix.patch b/thunderbird-60.2.1-buildfix.patch
deleted file mode 100644
index f7742ea91281..000000000000
--- a/thunderbird-60.2.1-buildfix.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-
-# HG changeset patch
-# User Chris Manchester <cmanchester@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
-