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

[Bartłomiej Piotrowski]

    Date: Monday, August 20, 2018 @ 07:55:42
  Author: bpiotrowski
Revision: 332686

60.0-4: backport a fix for FS#59585

Added:
  thunderbird/trunk/bz1482248.patch
Modified:
  thunderbird/trunk/PKGBUILD

-----------------+
 PKGBUILD        |   13 ++++++++++---
 bz1482248.patch |   28 ++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-08-20 07:36:07 UTC (rev 332685)
+++ PKGBUILD	2018-08-20 07:55:42 UTC (rev 332686)
@@ -7,7 +7,7 @@
 
 pkgname=thunderbird
 pkgver=60.0
-pkgrel=3
+pkgrel=4
 pkgdesc="Standalone mail and news reader from mozilla.org"
 arch=(x86_64)
 license=(MPL GPL LGPL)
@@ -19,9 +19,11 @@
 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)
+        $pkgname.desktop
+        bz1482248.patch)
 sha256sums=('bd7da88dcc03c448a4e975b5a1d3e9bf466ec9151b1059392bcdb50955a22056'
-            'e44c55501f650a4e80b9c353b81f33e07ca65808db831eff6ca616aded233827')
+            'e44c55501f650a4e80b9c353b81f33e07ca65808db831eff6ca616aded233827'
+            '8d944e6f5b8935843da1acb3c7b2670b217cd7ce7501738e02354b8702857aaa')
 
 # 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
@@ -80,6 +82,11 @@
 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"
+
 }
 
 build() {

Added: bz1482248.patch
===================================================================
--- bz1482248.patch	                        (rev 0)
+++ bz1482248.patch	2018-08-20 07:55:42 UTC (rev 332686)
@@ -0,0 +1,28 @@
+
+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") ||
+
+
+
+