svn commit: r492187 - in branches/2019Q1/mail/thunderbird: . files
Jan Beich
jbeich at FreeBSD.org
Tue Feb 5 00:53:17 UTC 2019
Author: jbeich
Date: Tue Feb 5 00:53:16 2019
New Revision: 492187
URL: https://svnweb.freebsd.org/changeset/ports/492187
Log:
MFH: r492179
mail/thunderbird: backport a fix for saving an address book entry
PR: 235483
Submitted by: Arrigo Marchiori
Obtained from: upstream
Approved by: ports-secteam blanket
Added:
branches/2019Q1/mail/thunderbird/files/patch-bug1521454
- copied unchanged from r492179, head/mail/thunderbird/files/patch-bug1521454
Modified:
branches/2019Q1/mail/thunderbird/Makefile
Directory Properties:
branches/2019Q1/ (props changed)
Modified: branches/2019Q1/mail/thunderbird/Makefile
==============================================================================
--- branches/2019Q1/mail/thunderbird/Makefile Tue Feb 5 00:51:03 2019 (r492186)
+++ branches/2019Q1/mail/thunderbird/Makefile Tue Feb 5 00:53:16 2019 (r492187)
@@ -3,6 +3,7 @@
PORTNAME= thunderbird
DISTVERSION= 60.5.0
+PORTREVISION= 1
CATEGORIES= mail news net-im ipv6
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build2/source
Copied: branches/2019Q1/mail/thunderbird/files/patch-bug1521454 (from r492179, head/mail/thunderbird/files/patch-bug1521454)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2019Q1/mail/thunderbird/files/patch-bug1521454 Tue Feb 5 00:53:16 2019 (r492187, copy of r492179, head/mail/thunderbird/files/patch-bug1521454)
@@ -0,0 +1,43 @@
+Avoid exception due to bad locale code when appending [-u]-ca-gregory-nu-latn
+
+--- comm/common/bindings/datetimepicker.xml.orig 2019-01-22 19:44:24 UTC
++++ comm/common/bindings/datetimepicker.xml
+@@ -488,7 +488,11 @@
+
+ var numberOrder = /^(\D*)\s*(\d+)(\D*)(\d+)(\D*)(\d+)\s*(\D*)$/;
+
+- var locale = Services.locale.getRegionalPrefsLocales()[0] + "-u-ca-gregory-nu-latn";
++ var locale = Services.locale.getRegionalPrefsLocales()[0];
++ if (locale.includes("-u-"))
++ locale += "-ca-gregory-nu-latn";
++ else
++ locale += "-u-ca-gregory-nu-latn";
+ var dtf = new Services.intl.DateTimeFormat(locale, { timeStyle: "long" });
+
+ var pmTime = dtf.format(new Date(2000, 0, 1, 16, 7, 9));
+@@ -777,7 +781,11 @@
+
+ var numberOrder = /^(\D*)\s*(\d+)(\D*)(\d+)(\D*)(\d+)\s*(\D*)$/;
+
+- var locale = Services.locale.getRegionalPrefsLocales()[0] + "-u-ca-gregory-nu-latn";
++ var locale = Services.locale.getRegionalPrefsLocales()[0];
++ if (locale.includes("-u-"))
++ locale += "-ca-gregory-nu-latn";
++ else
++ locale += "-u-ca-gregory-nu-latn";
+ var dtf = new Services.intl.DateTimeFormat(locale, { dateStyle: "short" });
+
+ var dt = dtf.format(new Date(2002, 9, 4));
+@@ -1007,7 +1015,11 @@
+ <method name="_init">
+ <body>
+ <![CDATA[
+- var locale = Services.locale.getRegionalPrefsLocales()[0] + "-u-ca-gregory";
++ var locale = Services.locale.getRegionalPrefsLocales()[0];
++ if (locale.includes("-u-"))
++ locale += "-ca-gregory";
++ else
++ locale += "-u-ca-gregory";
+ var dtfMonth = new Services.intl.DateTimeFormat(locale, {month: "long", timeZone: "UTC"});
+ var dtfWeekday = new Services.intl.DateTimeFormat(locale, {weekday: "narrow"});
+
More information about the svn-ports-branches
mailing list