Fri Mar 23 05:29:11 2018 UTC ()
Fix from upstream for Bug 1444371:
mail.label_ascii_only_mail_as_us_ascii does not work with ISO-2022-JP

Bump PKGREVISION.


(rin)
diff -r1.204 -r1.205 pkgsrc/mail/thunderbird/Makefile
diff -r1.196 -r1.197 pkgsrc/mail/thunderbird/distinfo
diff -r0 -r1.1 pkgsrc/mail/thunderbird/patches/patch-mailnews_compose_src_nsMsgCompose.cpp
diff -r0 -r1.1 pkgsrc/mail/thunderbird/patches/patch-mailnews_compose_src_nsMsgSend.cpp
cvs diff -r1.204 -r1.205 pkgsrc/mail/thunderbird/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/thunderbird/Makefile 2018/03/12 11:17:01 1.204
+++ pkgsrc/mail/thunderbird/Makefile 2018/03/23 05:29:11 1.205
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.204 2018/03/12 11:17:01 wiz Exp $ 1# $NetBSD: Makefile,v 1.205 2018/03/23 05:29:11 rin Exp $
2 2
3DISTNAME= thunderbird-${TB_VER}.source 3DISTNAME= thunderbird-${TB_VER}.source
4PKGNAME= thunderbird-${TB_VER} 4PKGNAME= thunderbird-${TB_VER}
5PKGREVISION= 1 5PKGREVISION= 2
6TB_VER= 52.6.0 6TB_VER= 52.6.0
7CATEGORIES= mail 7CATEGORIES= mail
8MASTER_SITES= ${MASTER_SITE_MOZILLA:=thunderbird/releases/${TB_VER}/source/} 8MASTER_SITES= ${MASTER_SITE_MOZILLA:=thunderbird/releases/${TB_VER}/source/}
9EXTRACT_SUFX= .tar.xz 9EXTRACT_SUFX= .tar.xz
10 10
11MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= https://www.mozillamessaging.com/en-US/thunderbird/ 12HOMEPAGE= https://www.mozillamessaging.com/en-US/thunderbird/
13COMMENT= Organize, secure and customize your mail 13COMMENT= Organize, secure and customize your mail
14 14
15USE_TOOLS+= unzip pax 15USE_TOOLS+= unzip pax
16WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} 16WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
17MOZILLA_DIR= mozilla/ 17MOZILLA_DIR= mozilla/
18PLIST_SRC+= ${PLIST_SRC_DFLT} 18PLIST_SRC+= ${PLIST_SRC_DFLT}
cvs diff -r1.196 -r1.197 pkgsrc/mail/thunderbird/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/thunderbird/distinfo 2018/03/03 22:20:39 1.196
+++ pkgsrc/mail/thunderbird/distinfo 2018/03/23 05:29:11 1.197
@@ -1,27 +1,29 @@ @@ -1,27 +1,29 @@
1$NetBSD: distinfo,v 1.196 2018/03/03 22:20:39 ryoon Exp $ 1$NetBSD: distinfo,v 1.197 2018/03/23 05:29:11 rin Exp $
2 2
3SHA1 (thunderbird-52.6.0.source.tar.xz) = 8965e9ece5feaa8370ebea047e1fcadd00f2cff7 3SHA1 (thunderbird-52.6.0.source.tar.xz) = 8965e9ece5feaa8370ebea047e1fcadd00f2cff7
4RMD160 (thunderbird-52.6.0.source.tar.xz) = 4eda8415747174be41dc21f5367c7c89732afab6 4RMD160 (thunderbird-52.6.0.source.tar.xz) = 4eda8415747174be41dc21f5367c7c89732afab6
5SHA512 (thunderbird-52.6.0.source.tar.xz) = 80742c95ed61d1cb2e72b71bb23bdd211a40240ab4393e9f028a38f902547372084a8f56445e2394484be088a7b9801405f3d6618fb2742601cc968bf34427f0 5SHA512 (thunderbird-52.6.0.source.tar.xz) = 80742c95ed61d1cb2e72b71bb23bdd211a40240ab4393e9f028a38f902547372084a8f56445e2394484be088a7b9801405f3d6618fb2742601cc968bf34427f0
6Size (thunderbird-52.6.0.source.tar.xz) = 230376180 bytes 6Size (thunderbird-52.6.0.source.tar.xz) = 230376180 bytes
7SHA1 (patch-calendar_lightning_Makefile.in) = 02a1528f2da82f1d4ff4931a7d7dc8227b7fa9f2 7SHA1 (patch-calendar_lightning_Makefile.in) = 02a1528f2da82f1d4ff4931a7d7dc8227b7fa9f2
8SHA1 (patch-calendar_lightning_build_universal.mk) = 86dc2c6b4f9feb835570111078aa5d08a389d0da 8SHA1 (patch-calendar_lightning_build_universal.mk) = 86dc2c6b4f9feb835570111078aa5d08a389d0da
9SHA1 (patch-calendar_providers_gdata_Makefile.in) = 0e90ddc9aecc817b0b150bbc37d23ddec97b093e 9SHA1 (patch-calendar_providers_gdata_Makefile.in) = 0e90ddc9aecc817b0b150bbc37d23ddec97b093e
10SHA1 (patch-ldap_c-sdk_include_portable.h) = 7b36594a98beb5af9f82810a052ad2d4706ac968 10SHA1 (patch-ldap_c-sdk_include_portable.h) = 7b36594a98beb5af9f82810a052ad2d4706ac968
11SHA1 (patch-mail_app_nsMailApp.cpp) = 8834e141e4526af4b6a7a65195fd8f13d7c9cdb1 11SHA1 (patch-mail_app_nsMailApp.cpp) = 8834e141e4526af4b6a7a65195fd8f13d7c9cdb1
12SHA1 (patch-mail_components_shell_nsMailGNOMEIntegration.cpp) = cbd87d7d7fc8df32b7fd444148d48a92c54c94d9 12SHA1 (patch-mail_components_shell_nsMailGNOMEIntegration.cpp) = cbd87d7d7fc8df32b7fd444148d48a92c54c94d9
13SHA1 (patch-mail_installer_package-manifest.in) = 3829a4d1ae7e8da29ae90d8ac31856fe260c2acc 13SHA1 (patch-mail_installer_package-manifest.in) = 3829a4d1ae7e8da29ae90d8ac31856fe260c2acc
14SHA1 (patch-mail_installer_removed-files.in) = 1a6744cda9842046b9d4b388333678a580d49d43 14SHA1 (patch-mail_installer_removed-files.in) = 1a6744cda9842046b9d4b388333678a580d49d43
 15SHA1 (patch-mailnews_compose_src_nsMsgCompose.cpp) = f44e66c9985e69904768126649162cc15681c2d0
 16SHA1 (patch-mailnews_compose_src_nsMsgSend.cpp) = 6d9f04350a4bf7a33f478af591fa26f990bd999e
15SHA1 (patch-mozilla_browser_branding_unofficial_locales_en-US_brand.dtd) = 1cd7faa6a098e2bc609d941406b46e6f737fbb63 17SHA1 (patch-mozilla_browser_branding_unofficial_locales_en-US_brand.dtd) = 1cd7faa6a098e2bc609d941406b46e6f737fbb63
16SHA1 (patch-mozilla_build_gyp.mozbuild) = c7081e530a60af88be428d7779139415483fac56 18SHA1 (patch-mozilla_build_gyp.mozbuild) = c7081e530a60af88be428d7779139415483fac56
17SHA1 (patch-mozilla_build_moz.configure_init.configure) = 1d0d8ddb9a4ea7a395067ccc31be1e6f81791271 19SHA1 (patch-mozilla_build_moz.configure_init.configure) = 1d0d8ddb9a4ea7a395067ccc31be1e6f81791271
18SHA1 (patch-mozilla_build_moz.configure_keyfiles.configure) = 00f4a844bae782735e52303bfca4271de369449f 20SHA1 (patch-mozilla_build_moz.configure_keyfiles.configure) = 00f4a844bae782735e52303bfca4271de369449f
19SHA1 (patch-mozilla_build_moz.configure_memory.configure) = 4a3b72925949dde4a60fecc7be801e189c1af727 21SHA1 (patch-mozilla_build_moz.configure_memory.configure) = 4a3b72925949dde4a60fecc7be801e189c1af727
20SHA1 (patch-mozilla_build_moz.configure_old.configure) = 5388284dbc6c5bbaf2ea2116e91c2c6f182d6847 22SHA1 (patch-mozilla_build_moz.configure_old.configure) = 5388284dbc6c5bbaf2ea2116e91c2c6f182d6847
21SHA1 (patch-mozilla_build_pgo_profileserver.py) = 7a88be17fc5939aa2bc5af334dde3222b6cc3ba3 23SHA1 (patch-mozilla_build_pgo_profileserver.py) = 7a88be17fc5939aa2bc5af334dde3222b6cc3ba3
22SHA1 (patch-mozilla_config_Makefile.in) = ef7b31712e3be7620dfaf548d4138c6b425eb2ca 24SHA1 (patch-mozilla_config_Makefile.in) = ef7b31712e3be7620dfaf548d4138c6b425eb2ca
23SHA1 (patch-mozilla_config_baseconfig.mk) = 92891a656cb83de0f5ff7f88d10579cdde0e1359 25SHA1 (patch-mozilla_config_baseconfig.mk) = 92891a656cb83de0f5ff7f88d10579cdde0e1359
24SHA1 (patch-mozilla_config_external_moz.build) = bf05e5da3781087c4e588e0bdccaee05b9d02b24 26SHA1 (patch-mozilla_config_external_moz.build) = bf05e5da3781087c4e588e0bdccaee05b9d02b24
25SHA1 (patch-mozilla_config_stl__wrappers_ios) = f84d793f65bc7c7d1ffc7b542f846b394cf6de50 27SHA1 (patch-mozilla_config_stl__wrappers_ios) = f84d793f65bc7c7d1ffc7b542f846b394cf6de50
26SHA1 (patch-mozilla_config_stl__wrappers_ostream) = b36e7e199e355a0950e0db51c45fb34ce5ea2cc4 28SHA1 (patch-mozilla_config_stl__wrappers_ostream) = b36e7e199e355a0950e0db51c45fb34ce5ea2cc4
27SHA1 (patch-mozilla_config_system-headers) = 4665d754c8e498b3a34f877836287c7723ce930f 29SHA1 (patch-mozilla_config_system-headers) = 4665d754c8e498b3a34f877836287c7723ce930f
File Added: pkgsrc/mail/thunderbird/patches/Attic/patch-mailnews_compose_src_nsMsgCompose.cpp
$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())
File Added: pkgsrc/mail/thunderbird/patches/Attic/patch-mailnews_compose_src_nsMsgSend.cpp
$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);