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

[Levente Polyak]

    Date: Thursday, October 18, 2018 @ 06:38:18
  Author: anthraxx
Revision: 336816

upgpkg: thunderbird 60.2.1-1

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

-----------------------------------+
 PKGBUILD                          |   16 +++++--------
 bz1482248.patch                   |   28 ------------------------
 thunderbird-60.2.1-buildfix.patch |   42 ++++++++++++++++++++++++++++++++++++
 3 files changed, 48 insertions(+), 38 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-10-17 22:57:33 UTC (rev 336815)
+++ PKGBUILD	2018-10-18 06:38:18 UTC (rev 336816)
@@ -5,8 +5,8 @@
 # Contributor: Anders Bostrom <anders.bostrom at home.se>
 
 pkgname=thunderbird
-pkgver=60.0
-pkgrel=4
+pkgver=60.2.1
+pkgrel=1
 pkgdesc="Standalone mail and news reader from mozilla.org"
 arch=(x86_64)
 license=(MPL GPL LGPL)
@@ -19,10 +19,10 @@
 options=(!emptydirs !makeflags)
 source=(https://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$pkgver/source/thunderbird-$pkgver.source.tar.xz
         $pkgname.desktop
-        bz1482248.patch)
-sha256sums=('bd7da88dcc03c448a4e975b5a1d3e9bf466ec9151b1059392bcdb50955a22056'
+        thunderbird-60.2.1-buildfix.patch)
+sha256sums=('d313f25cd7ddc016bf8e4d4115f14b34a66621c0feabbc0dd72f9304cb93d7bf'
             'e44c55501f650a4e80b9c353b81f33e07ca65808db831eff6ca616aded233827'
-            '8d944e6f5b8935843da1acb3c7b2670b217cd7ce7501738e02354b8702857aaa')
+            '884c5a6742677c83173812f7abb1e409a2b13371ba6079c4cb69b3e95010de05')
 
 # 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,11 +81,7 @@
 ac_add_options --disable-crashreporter
 ac_add_options --disable-updater
 END
-
-  cd comm
-  # https://bugzilla.mozilla.org/show_bug.cgi?id=1482248
-  patch -p1 -i "$srcdir/bz1482248.patch"
-
+  patch -Np1 < ../thunderbird-60.2.1-buildfix.patch
 }
 
 build() {

Deleted: bz1482248.patch
===================================================================
--- bz1482248.patch	2018-10-17 22:57:33 UTC (rev 336815)
+++ bz1482248.patch	2018-10-18 06:38:18 UTC (rev 336816)
@@ -1,28 +0,0 @@
-
-diff --git a/mailnews/local/src/nsMsgLocalStoreUtils.cpp b/mailnews/local/src/nsMsgLocalStoreUtils.cpp
---- a/mailnews/local/src/nsMsgLocalStoreUtils.cpp
-+++ b/mailnews/local/src/nsMsgLocalStoreUtils.cpp
-@@ -23,16 +23,19 @@ nsMsgLocalStoreUtils::AddDirectorySepara
-   path->GetLeafName(leafName);
-   leafName.AppendLiteral(FOLDER_SUFFIX);
-   return path->SetLeafName(leafName);
- }
- 
- bool
- nsMsgLocalStoreUtils::nsShouldIgnoreFile(nsAString& name)
- {
-+  if (name.IsEmpty())
-+    return true;
-+
-   char16_t firstChar = name.First();
-   if (firstChar == '.' || firstChar == '#' ||
-       name.CharAt(name.Length() - 1) == '~')
-     return true;
- 
-   if (name.LowerCaseEqualsLiteral("msgfilterrules.dat") ||
-       name.LowerCaseEqualsLiteral("rules.dat") ||
-       name.LowerCaseEqualsLiteral("filterlog.html") ||
-
-
-
-

Added: thunderbird-60.2.1-buildfix.patch
===================================================================
--- thunderbird-60.2.1-buildfix.patch	                        (rev 0)
+++ thunderbird-60.2.1-buildfix.patch	2018-10-18 06:38:18 UTC (rev 336816)
@@ -0,0 +1,42 @@
+
+# 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
+