From mboxrd@z Thu Jan 1 00:00:00 1970 From: Timothy Sample Subject: Fixing evolution-data-server on core-updates Date: Mon, 15 Jul 2019 00:09:18 -0400 Message-ID: <875zo4ym4x.fsf@ngyro.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:470:142:3::10]:47410) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hmsIl-0001Vs-01 for guix-devel@gnu.org; Mon, 15 Jul 2019 00:09:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hmsIj-0003IS-QC for guix-devel@gnu.org; Mon, 15 Jul 2019 00:09:22 -0400 Received: from out3-smtp.messagingengine.com ([66.111.4.27]:47229) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hmsIj-0003He-HN for guix-devel@gnu.org; Mon, 15 Jul 2019 00:09:21 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 74DC5221CF for ; Mon, 15 Jul 2019 00:09:19 -0400 (EDT) Received: from mrblack (74-116-186-44.qc.dsl.ebox.net [74.116.186.44]) by mail.messagingengine.com (Postfix) with ESMTPA id E03228005A for ; Mon, 15 Jul 2019 00:09:18 -0400 (EDT) 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: guix-devel@gnu.org --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hi all, While testing core-updates I found that evolution-data-server does not build due to test failures. The tests fail because evolution-data-server does not accommodate newer versions of ICU. Here=E2=80=99s the upstream bug report [1]. I=E2=80=99ve attached a patch = that uses =E2=80=9Csubstitute*=E2=80=9D to work around the problem (it=E2=80=99s rath= er simple). I think we should wait to hear from upstream, and if they don=E2=80=99t get to it i= n a few days, use the patch. [1] https://gitlab.gnome.org/GNOME/evolution-data-server/issues/137 -- Tim --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-gnu-evolution-data-server-Fix-locale-issue.patch Content-Description: the patch >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 Kerberos.") "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 = uloc_canonicalize \\(posix_locale,.*" x) + ((lambda (xs) (string-join xs "\n" 'suffix)) + (list + "if (g_ascii_strcasecmp(posix_locale, \"C\") == 0 ||" + " g_ascii_strcasecmp(posix_locale, \"POSIX\") == 0) {" + " posix_locale = \"en_US_POSIX\";" + "}" + x)))) + #t)) (add-before 'configure 'dont-override-rpath (lambda _ (substitute* "CMakeLists.txt" -- 2.22.0 --=-=-=--