diff options
| author | jbeich <jbeich@FreeBSD.org> | 2019-02-05 08:49:56 +0800 |
|---|---|---|
| committer | jbeich <jbeich@FreeBSD.org> | 2019-02-05 08:49:56 +0800 |
| commit | 3f5ada670c9227ab6062a55e7e469d3a4b304e30 (patch) | |
| tree | 9f6dfb4ce6115abee7febd99ee74d73fa63a551d /mail/thunderbird | |
| parent | 49d0e5a17cc1fbda499a5f6d80e6d56f6887cee4 (diff) | |
| download | freebsd-ports-gnome-3f5ada670c9227ab6062a55e7e469d3a4b304e30.tar.gz freebsd-ports-gnome-3f5ada670c9227ab6062a55e7e469d3a4b304e30.tar.zst freebsd-ports-gnome-3f5ada670c9227ab6062a55e7e469d3a4b304e30.zip | |
mail/thunderbird: backport a fix for saving an address book entry
PR: 235483
Submitted by: Arrigo Marchiori
Obtained from: upstream
Diffstat (limited to 'mail/thunderbird')
| -rw-r--r-- | mail/thunderbird/Makefile | 2 | ||||
| -rw-r--r-- | mail/thunderbird/files/patch-bug1521454 | 43 |
2 files changed, 44 insertions, 1 deletions
diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile index f95907a3529e..b5de74d78ff7 100644 --- a/mail/thunderbird/Makefile +++ b/mail/thunderbird/Makefile @@ -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 diff --git a/mail/thunderbird/files/patch-bug1521454 b/mail/thunderbird/files/patch-bug1521454 new file mode 100644 index 000000000000..3bcad8d2ff31 --- /dev/null +++ b/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"}); + |