This patch fixes locale canonicalization when using newer versions of
ICU.  It comes from the upstream repo, and should appear starting in
version 3.33.5.

From fe4ac94ce3c14f200e049a5d102fc0e4b811c71e Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Tue, 16 Jul 2019 07:22:07 +0200
Subject: [PATCH] I#137 - POSIX locale tests fail with ICU 64.x

Closes https://gitlab.gnome.org/GNOME/evolution-data-server/issues/137
---
 src/libedataserver/e-collator.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/libedataserver/e-collator.c b/src/libedataserver/e-collator.c
index 718eac5da..ec2cf7951 100644
--- a/src/libedataserver/e-collator.c
+++ b/src/libedataserver/e-collator.c
@@ -132,6 +132,11 @@ canonicalize_locale (const gchar *posix_locale,
 	gint   len;
 	const gchar *collation_type = NULL;
 
+	if (posix_locale && (
+	    g_ascii_strcasecmp (posix_locale, "C") == 0 ||
+	    g_ascii_strcasecmp (posix_locale, "POSIX") == 0))
+		posix_locale = "en_US_POSIX";
+
 	len = uloc_canonicalize (posix_locale, locale_buffer, LOCALE_BUFFER_LEN, &status);
 
 	if (U_FAILURE (status)) {
-- 
2.22.0

46095'>refs</a><a class='active' href='/guix/log/nix/libutil/hash.cc'>log</a><a href='/guix/tree/nix/libutil/hash.cc?id=db6b9d2f4bc59511904e8c1412d0257675c46095'>tree</a><a href='/guix/commit/nix/libutil/hash.cc?id=db6b9d2f4bc59511904e8c1412d0257675c46095'>commit</a><a href='/guix/diff/nix/libutil/hash.cc?id=db6b9d2f4bc59511904e8c1412d0257675c46095'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/nix/libutil/hash.cc'>
<input type='hidden' name='id' value='db6b9d2f4bc59511904e8c1412d0257675c46095'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=db6b9d2f4bc59511904e8c1412d0257675c46095'>root</a>/<a href='/guix/log/nix?id=db6b9d2f4bc59511904e8c1412d0257675c46095'>nix</a>/<a href='/guix/log/nix/libutil?id=db6b9d2f4bc59511904e8c1412d0257675c46095'>libutil</a>/<a href='/guix/log/nix/libutil/hash.cc?id=db6b9d2f4bc59511904e8c1412d0257675c46095'>hash.cc</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/nix/libutil/hash.cc?id=db6b9d2f4bc59511904e8c1412d0257675c46095&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2020-06-27 23:42:20 +0200'>2020-06-27</span></td><td><a href='/guix/commit/nix/libutil/hash.cc?id=8e6c1415d87272c0221ce328715fc0dd1dd3e032'>daemon: Recognize SHA3 and BLAKE2s.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2020-06-27 23:42:20 +0200'>2020-06-27</span></td><td><a href='/guix/commit/nix/libutil/hash.cc?id=8dc6c387852bb9505be44567a5f56913633cc23a'>daemon: Remove OpenSSL hash compatibility wrappers.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2020-06-27 23:42:20 +0200'>2020-06-27</span></td><td><a href='/guix/commit/nix/libutil/hash.cc?id=3fb6b8f30444d41963ba5bdd441123a6d2df17bd'>daemon: Map directly to gcrypt hash functions.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>