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

7c71c33c9e508'>refs</a><a class='active' href='/guix/log/gnu/services/ganeti.scm'>log</a><a href='/guix/tree/gnu/services/ganeti.scm?id=b57254d02baa9f4428995d9d9a37c71c33c9e508'>tree</a><a href='/guix/commit/gnu/services/ganeti.scm?id=b57254d02baa9f4428995d9d9a37c71c33c9e508'>commit</a><a href='/guix/diff/gnu/services/ganeti.scm?id=b57254d02baa9f4428995d9d9a37c71c33c9e508'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/services/ganeti.scm'>
<input type='hidden' name='id' value='b57254d02baa9f4428995d9d9a37c71c33c9e508'/><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=b57254d02baa9f4428995d9d9a37c71c33c9e508'>root</a>/<a href='/guix/log/gnu?id=b57254d02baa9f4428995d9d9a37c71c33c9e508'>gnu</a>/<a href='/guix/log/gnu/services?id=b57254d02baa9f4428995d9d9a37c71c33c9e508'>services</a>/<a href='/guix/log/gnu/services/ganeti.scm?id=b57254d02baa9f4428995d9d9a37c71c33c9e508'>ganeti.scm</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/services/ganeti.scm?id=b57254d02baa9f4428995d9d9a37c71c33c9e508&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2020-10-28 21:10:54 -0700'>2020-10-28</span></td><td><a href='/guix/commit/gnu/services/ganeti.scm?id=7db4dc60045082b79ea288573d8492a6e5d5903c'>gnu: ganeti-luxid-service-type: Fix typo.</a><span class='msg-avail'>...</span></td><td>Vagrant Cascadian</td></tr>
<tr><td><span title='2020-10-10 23:39:17 +0200'>2020-10-10</span></td><td><a href='/guix/commit/gnu/services/ganeti.scm?id=d7fb4199c770c3bd7ce755b1160aa19e9164f148'>services: ganeti: Fix typo.</a><span class='msg-avail'>...</span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2020-08-25 17:14:50 +0200'>2020-08-25</span></td><td><a href='/guix/commit/gnu/services/ganeti.scm?id=2e832d4b8a1c68a9f28d5953819954ee37d9800f'>services: ganeti-kvmd-service-type: Fix typo in description.</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2020-07-21 23:54:44 +0200'>2020-07-21</span></td><td><a href='/guix/commit/gnu/services/ganeti.scm?id=938f3190e786baab4116ea826bde21d102396cc2'>services: ganeti: Fix erroneous gexp.</a><span class='msg-avail'>...</span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2020-07-19 14:23:16 +0200'>2020-07-19</span></td><td><a href='/guix/commit/gnu/services/ganeti.scm?id=41daf1286575f3a1998493c893f6d5a9c5b62de8'>services: ganeti: Use TLS on the remote API by default.</a><span class='msg-avail'>...</span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2020-07-16 21:51:44 +0200'>2020-07-16</span></td><td><a href='/guix/commit/gnu/services/ganeti.scm?id=9a622827559b223cc6b48733a82c74ce14a29bab'>services: Add ganeti.</a><span class='msg-avail'>...</span></td><td>Marius Bakke</td></tr>