diff options
Diffstat (limited to 'source/xap/mozilla-thunderbird')
| -rw-r--r-- | source/xap/mozilla-thunderbird/80754eac3809 | 32 | ||||
| -rwxr-xr-x | source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild | 7 |
2 files changed, 1 insertions, 38 deletions
diff --git a/source/xap/mozilla-thunderbird/80754eac3809 b/source/xap/mozilla-thunderbird/80754eac3809 deleted file mode 100644 index c38efb653..000000000 --- a/source/xap/mozilla-thunderbird/80754eac3809 +++ /dev/null @@ -1,32 +0,0 @@ - -# HG changeset patch -# User Magnus Melin <mkmelin+mozilla@iki.fi> -# Date 1533928828 -10800 -# Node ID 80754eac3809bff2f8fe4ea05bd16dbaf3dfe1a7 -# Parent 020481090e4e241e345f92410688c9f81e543911 -Bug 1482248 - don't crash on empty file name in nsMsgLocalStoreUtils::nsShouldIgnoreFile. r=jorgk - -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") || - diff --git a/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild b/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild index c15e590dd..3050ec831 100755 --- a/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild +++ b/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild @@ -30,7 +30,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=mozilla-thunderbird VERSION=$(basename $(ls thunderbird-*.tar.?z | cut -d - -f 2 | rev | cut -f 3- -d . | rev) .source) RELEASEVER=$(echo $VERSION | cut -f 1 -d e | cut -f 1 -d b) -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Specify this variable for a localized build. # For example, to build a version of Thunderbird with Italian support, run @@ -161,11 +161,6 @@ cd thunderbird-$RELEASEVER || exit 1 # Retain GTK+ v2 scrolling behavior: zcat $CWD/tb.ui.scrollToClick.diff.gz | patch -p2 --verbose || exit 1 -# Fix crash with 60.0: -( cd comm - zcat $CWD/80754eac3809.gz | patch -p1 --verbose || exit 1 -) - # Fix build when using Rust 1.29.0: zcat $CWD/mozilla.rust_1_29_0.patch.gz | patch -p1 --verbose || exit 1 |