Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 5 Feb 2019 00:49:56 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r492179 - in head/mail/thunderbird: . files
Message-ID:  <201902050049.x150nudv094447@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Tue Feb  5 00:49:56 2019
New Revision: 492179
URL: https://svnweb.freebsd.org/changeset/ports/492179

Log:
  mail/thunderbird: backport a fix for saving an address book entry
  
  PR:		235483
  Submitted by:	Arrigo Marchiori
  Obtained from:	upstream

Added:
  head/mail/thunderbird/files/patch-bug1521454   (contents, props changed)
Modified:
  head/mail/thunderbird/Makefile   (contents, props changed)

Modified: head/mail/thunderbird/Makefile
==============================================================================
--- head/mail/thunderbird/Makefile	Tue Feb  5 00:32:29 2019	(r492178)
+++ head/mail/thunderbird/Makefile	Tue Feb  5 00:49:56 2019	(r492179)
@@ -3,7 +3,7 @@
 
 PORTNAME=	thunderbird
 DISTVERSION=	60.5.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail news net-im ipv6
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
 		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build2/source

Added: head/mail/thunderbird/files/patch-bug1521454
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/thunderbird/files/patch-bug1521454	Tue Feb  5 00:49:56 2019	(r492179)
@@ -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"});
+ 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201902050049.x150nudv094447>