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

refs/?id=5e2140511c1ad9ccd731438b74d61b62111da1e6'>refs</a><a class='active' href='/guix/log/gnu/packages/patches/fplll-std-fenv.patch'>log</a><a href='/guix/tree/gnu/packages/patches/fplll-std-fenv.patch?id=5e2140511c1ad9ccd731438b74d61b62111da1e6'>tree</a><a href='/guix/commit/gnu/packages/patches/fplll-std-fenv.patch?id=5e2140511c1ad9ccd731438b74d61b62111da1e6'>commit</a><a href='/guix/diff/gnu/packages/patches/fplll-std-fenv.patch?id=5e2140511c1ad9ccd731438b74d61b62111da1e6'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/patches/fplll-std-fenv.patch'>
<input type='hidden' name='id' value='5e2140511c1ad9ccd731438b74d61b62111da1e6'/><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=5e2140511c1ad9ccd731438b74d61b62111da1e6'>root</a>/<a href='/guix/log/gnu?id=5e2140511c1ad9ccd731438b74d61b62111da1e6'>gnu</a>/<a href='/guix/log/gnu/packages?id=5e2140511c1ad9ccd731438b74d61b62111da1e6'>packages</a>/<a href='/guix/log/gnu/packages/patches?id=5e2140511c1ad9ccd731438b74d61b62111da1e6'>patches</a>/<a href='/guix/log/gnu/packages/patches/fplll-std-fenv.patch?id=5e2140511c1ad9ccd731438b74d61b62111da1e6'>fplll-std-fenv.patch</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/gnu/packages/patches/fplll-std-fenv.patch?id=5e2140511c1ad9ccd731438b74d61b62111da1e6&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2020-09-23 14:14:09 +0200'>2020-09-23</span></td><td><a href='/guix/commit/gnu/packages/patches/fplll-std-fenv.patch?id=049a1714fc0dee6c69f216b6f2e4f43410f6fcac'>gnu: fplll: Correct include files.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/patches/fplll-std-fenv.patch: New patch.
* gnu/local.mk (dist_patch_DATA): Register patch.
* gnu/packages/algebra.scm (fplll): Use patch and move all inputs to
propagated-inputs.
</span></span></td><td>Andreas Enge</td></tr>