From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kei Kebreau Subject: Re: Fixing evolution-data-server on core-updates Date: Mon, 15 Jul 2019 09:50:14 -0400 Message-ID: <87wogjmmp5.fsf@posteo.net> References: <875zo4ym4x.fsf@ngyro.com> <87tvbnmpyg.fsf@gnu.org> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Return-path: Received: from eggs.gnu.org ([2001:470:142:3::10]:53591) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hn1N1-0005K2-Ae for guix-devel@gnu.org; Mon, 15 Jul 2019 09:50:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hn1Mz-0002Qw-6D for guix-devel@gnu.org; Mon, 15 Jul 2019 09:50:22 -0400 Received: from mout01.posteo.de ([185.67.36.65]:49586) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hn1My-0002PR-Cu for guix-devel@gnu.org; Mon, 15 Jul 2019 09:50:21 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 9922216005F for ; Mon, 15 Jul 2019 15:50:17 +0200 (CEST) In-Reply-To: <87tvbnmpyg.fsf@gnu.org> ("Ludovic \=\?utf-8\?Q\?Court\=C3\=A8s\=22'\?\= \=\?utf-8\?Q\?s\?\= message of "Mon, 15 Jul 2019 14:39:51 +0200") List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: Ludovic =?utf-8?Q?Court=C3=A8s?= Cc: guix-devel@gnu.org Ludovic Court=C3=A8s writes: > Hello Timothy, > > Timothy Sample skribis: > >> From bcd753f777687c52bba6b9bf4184879e69990118 Mon Sep 17 00:00:00 2001 >> From: Timothy Sample >> Date: Sun, 14 Jul 2019 23:47:44 -0400 >> Subject: [PATCH] gnu: evolution-data-server: Fix locale issue. >> >> * gnu/packages/gnome.scm (evolution-data-server)[arguments]: Add a phase >> that patches the source code to fix a locale issue. >> --- >> gnu/packages/gnome.scm | 15 +++++++++++++++ >> 1 file changed, 15 insertions(+) >> >> diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm >> index eb251498e9..a34adc4006 100644 >> --- a/gnu/packages/gnome.scm >> +++ b/gnu/packages/gnome.scm >> @@ -5168,6 +5168,21 @@ Exchange, Last.fm, IMAP/SMTP, Jabber, SIP and Ker= beros.") >> "tests/libedata-cal/test-cal-cache-utils.c") >> (("/bin/rm") (which "rm"))) >> #t)) >> + ;; This phase fixes locale canonicalization and prevents a few= test >> + ;; failures. The bug has been reported upstream: >> + ;; . >> + (add-after 'unpack 'patch-locale-canonicalization >> + (lambda _ >> + (substitute* "src/libedataserver/e-collator.c" >> + (("len =3D uloc_canonicalize \\(posix_locale,.*" x) >> + ((lambda (xs) (string-join xs "\n" 'suffix)) >> + (list >> + "if (g_ascii_strcasecmp(posix_locale, \"C\") =3D=3D 0= ||" >> + " g_ascii_strcasecmp(posix_locale, \"POSIX\") =3D= =3D 0) {" >> + " posix_locale =3D \"en_US_POSIX\";" >> + "}" >> + x)))) > > LGTM, thanks for fixing it! > > Ludo=E2=80=99. Just FYI, I can confirm that this patch allows me to re-enable tests that previously failed on core-updates! I've re-enabled the relevant failing tests on my own core-updates branch in anticipation of this patch. Thanks from me, too! Kei