Fix from upstream for Bug 1444371:

mail.label_ascii_only_mail_as_us_ascii does not work with ISO-2022-JP

Bump PKGREVISION.

4 files changed, 44 insertions, 3 deletions

diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile
index f816ffafad2..d1db9cf4ad9 100644
--- a/mail/thunderbird/Makefile
+++ b/mail/thunderbird/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.204 2018/03/12 11:17:01 wiz Exp $
+# $NetBSD: Makefile,v 1.205 2018/03/23 05:29:11 rin Exp $
 
 DISTNAME=	thunderbird-${TB_VER}.source
 PKGNAME=	thunderbird-${TB_VER}
-PKGREVISION=	1
+PKGREVISION=	2
 TB_VER=		52.6.0
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_MOZILLA:=thunderbird/releases/${TB_VER}/source/}
diff --git a/mail/thunderbird/distinfo b/mail/thunderbird/distinfo
index 92c4272a33f..682b7db9bff 100644
--- a/mail/thunderbird/distinfo
+++ b/mail/thunderbird/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.196 2018/03/03 22:20:39 ryoon Exp $
+$NetBSD: distinfo,v 1.197 2018/03/23 05:29:11 rin Exp $
 
 SHA1 (thunderbird-52.6.0.source.tar.xz) = 8965e9ece5feaa8370ebea047e1fcadd00f2cff7
 RMD160 (thunderbird-52.6.0.source.tar.xz) = 4eda8415747174be41dc21f5367c7c89732afab6
@@ -12,6 +12,8 @@ SHA1 (patch-mail_app_nsMailApp.cpp) = 8834e141e4526af4b6a7a65195fd8f13d7c9cdb1
 SHA1 (patch-mail_components_shell_nsMailGNOMEIntegration.cpp) = cbd87d7d7fc8df32b7fd444148d48a92c54c94d9
 SHA1 (patch-mail_installer_package-manifest.in) = 3829a4d1ae7e8da29ae90d8ac31856fe260c2acc
 SHA1 (patch-mail_installer_removed-files.in) = 1a6744cda9842046b9d4b388333678a580d49d43
+SHA1 (patch-mailnews_compose_src_nsMsgCompose.cpp) = f44e66c9985e69904768126649162cc15681c2d0
+SHA1 (patch-mailnews_compose_src_nsMsgSend.cpp) = 6d9f04350a4bf7a33f478af591fa26f990bd999e
 SHA1 (patch-mozilla_browser_branding_unofficial_locales_en-US_brand.dtd) = 1cd7faa6a098e2bc609d941406b46e6f737fbb63
 SHA1 (patch-mozilla_build_gyp.mozbuild) = c7081e530a60af88be428d7779139415483fac56
 SHA1 (patch-mozilla_build_moz.configure_init.configure) = 1d0d8ddb9a4ea7a395067ccc31be1e6f81791271
diff --git a/mail/thunderbird/patches/patch-mailnews_compose_src_nsMsgCompose.cpp b/mail/thunderbird/patches/patch-mailnews_compose_src_nsMsgCompose.cpp
new file mode 100644
index 00000000000..b3d6011f41c
--- /dev/null
+++ b/mail/thunderbird/patches/patch-mailnews_compose_src_nsMsgCompose.cpp
@@ -0,0 +1,21 @@
+$NetBSD: patch-mailnews_compose_src_nsMsgCompose.cpp,v 1.1 2018/03/23 05:29:11 rin Exp $
+
+Fix from upstream for Bug 1444371:
+mail.label_ascii_only_mail_as_us_ascii does not work with ISO-2022-JP
+
+--- mailnews/compose/src/nsMsgCompose.cpp.orig	2018-03-23 13:59:55.545701174 +0900
++++ mailnews/compose/src/nsMsgCompose.cpp	2018-03-23 14:00:30.158529214 +0900
+@@ -1321,12 +1321,11 @@ NS_IMETHODIMP nsMsgCompose::SendMsg(MSG_
+   }
+   if (!msgBody.IsEmpty())
+   {
++    bool isAsciiOnly = NS_IsAscii(static_cast<const char16_t*>(msgBody.get()));
+     // Convert body to mail charset
+     nsCString outCString;
+     rv = nsMsgI18NConvertFromUnicode(m_compFields->GetCharacterSet(),
+       msgBody, outCString, false, true);
+-    bool isAsciiOnly = NS_IsAscii(outCString.get()) &&
+-      !nsMsgI18Nstateful_charset(m_compFields->GetCharacterSet());
+     if (m_compFields->GetForceMsgEncoding())
+       isAsciiOnly = false;
+     if (NS_SUCCEEDED(rv) && !outCString.IsEmpty())
diff --git a/mail/thunderbird/patches/patch-mailnews_compose_src_nsMsgSend.cpp b/mail/thunderbird/patches/patch-mailnews_compose_src_nsMsgSend.cpp
new file mode 100644
index 00000000000..66492a0afd2
--- /dev/null
+++ b/mail/thunderbird/patches/patch-mailnews_compose_src_nsMsgSend.cpp
@@ -0,0 +1,18 @@
+$NetBSD: patch-mailnews_compose_src_nsMsgSend.cpp,v 1.1 2018/03/23 05:29:11 rin Exp $
+
+Fix from upstream for Bug 1444371:
+mail.label_ascii_only_mail_as_us_ascii does not work with ISO-2022-JP
+
+--- mailnews/compose/src/nsMsgSend.cpp.orig	2018-03-23 14:00:40.325824595 +0900
++++ mailnews/compose/src/nsMsgSend.cpp	2018-03-23 14:01:05.961104275 +0900
+@@ -1591,9 +1591,8 @@ nsMsgComposeAndSend::GetBodyFromEditor()
+ 
+   if (aCharset && *aCharset)
+   {
++    bool isAsciiOnly = NS_IsAscii(bodyText);
+     rv = nsMsgI18NConvertFromUnicode(aCharset, nsDependentString(bodyText), outCString, false, true);
+-    bool isAsciiOnly = NS_IsAscii(outCString.get()) &&
+-      !nsMsgI18Nstateful_charset(mCompFields->GetCharacterSet());
+     if (mCompFields->GetForceMsgEncoding())
+       isAsciiOnly = false;
+     mCompFields->SetBodyIsAsciiOnly(isAsciiOnly);