From patchwork Sat Jul 3 17:41:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jean-Baptiste Volatier X-Patchwork-Id: 31093 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 0439B27BC78; Sat, 3 Jul 2021 18:42:28 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 77D5927BC81 for ; Sat, 3 Jul 2021 18:42:27 +0100 (BST) Received: from localhost ([::1]:42774 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lzjes-0003FN-HF for patchwork@mira.cbaines.net; Sat, 03 Jul 2021 13:42:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33200) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lzjeU-0002xb-QW for guix-patches@gnu.org; Sat, 03 Jul 2021 13:42:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56494) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lzjeU-0004io-Iw for guix-patches@gnu.org; Sat, 03 Jul 2021 13:42:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lzjeU-0007tM-H9 for guix-patches@gnu.org; Sat, 03 Jul 2021 13:42:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48325] [PATCH v5 1/5] gnu: Add utf8proc-2.6.1. Resent-From: Jean-Baptiste Volatier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 03 Jul 2021 17:42:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48325 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Maxime Devos , Jean-Baptiste Volatier , zimoun , 48325@debbugs.gnu.org, Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 48325-submit@debbugs.gnu.org id=B48325.162533410730279 (code B ref 48325); Sat, 03 Jul 2021 17:42:02 +0000 Received: (at 48325) by debbugs.gnu.org; 3 Jul 2021 17:41:47 +0000 Received: from localhost ([127.0.0.1]:39798 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lzjeE-0007sJ-Ku for submit@debbugs.gnu.org; Sat, 03 Jul 2021 13:41:47 -0400 Received: from mail-40136.protonmail.ch ([185.70.40.136]:35531) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lzjeB-0007s1-JR for 48325@debbugs.gnu.org; Sat, 03 Jul 2021 13:41:44 -0400 Date: Sat, 03 Jul 2021 17:41:34 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pm.me; s=protonmail; t=1625334097; bh=A2DCF7GxXkHtq5P6Q8jBaHQZhc/dDZUGdIXpLBbWFNw=; h=Date:To:From:Reply-To:Subject:In-Reply-To:References:From; b=KnSkeFJSBNwB8xIpyZIeDj9D9piJi9U0tGvK9q2u8rC+Sm69Wo8ccj6i0/tZrM5S2 q+0qULPJxdqJNUDS9rMd3o2KCTp2Q3Br4cup4rfTFyVILH/wVFFbQgfRMx8XY3lPnw SNhcNaCVYHb7ZHoZODvfnOZYkYo2E2cXBmBXtCdrfHv8V3iJIMShaCGcusQUwTREBZ +rmwD2J+H/tmuxD4CxBN0kvC9nauV4qbnHUxAYDl5cDVTgST3HPPHbnJegT1sXi/vc 5abgwM+X1PxVqxFvy16+BdQQxv3NiS2IDYEJGZrbje9IbwDtV7a67DGD55TlNMOFWq 1K2RzE1Ds1SoA== Message-ID: <20210703174116.21259-2-jbv@pm.me> In-Reply-To: <20210703174116.21259-1-jbv@pm.me> References: <87pmx0kn5p.fsf_-_@gnu.org> <87zgw2znuf.fsf@guix.i-did-not-set--mail-host-address--so-tickle-me> <86v96ejt4s.fsf@gmail.com> <20210629132128.22249-1-jbv@pm.me> <20210629132128.22249-4-jbv@pm.me> <20210703174116.21259-1-jbv@pm.me> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: Jean-Baptiste Volatier X-ACL-Warn: , Jean-Baptiste Volatier via Guix-patches X-Patchwork-Original-From: Jean-Baptiste Volatier via Guix-patches via From: Jean-Baptiste Volatier X-getmail-retrieved-from-mailbox: Patches * gnu/packages/textutils.scm (utf8proc-2.6.1): New variable. * gnu/packages/textutils.scm (utf8pro): Fix cross-compilation. Co-Authored-By: zimoun . --- gnu/packages/textutils.scm | 46 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 44 insertions(+), 2 deletions(-) -- 2.32.0 diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index ab34373705..37b925e6d9 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -20,6 +20,7 @@ ;;; Copyright © 2019 Mădălin Ionel Patrașcu ;;; Copyright © 2019 Wiktor Żelazny ;;; Copyright © 2020 Maxim Cournoyer +;;; Copyright © 2021 Simon Tournier ;;; ;;; This file is part of GNU Guix. ;;; @@ -63,6 +64,7 @@ #:use-module (gnu packages python-build) #:use-module (gnu packages python-xyz) #:use-module (gnu packages readline) + #:use-module (gnu packages ruby) #:use-module (gnu packages slang) #:use-module (gnu packages web)) @@ -185,9 +187,9 @@ libenca and several charset conversion libraries and tools.") (modify-phases %standard-phases (delete 'configure) (add-before 'check 'check-data - (lambda* (#:key inputs #:allow-other-keys) + (lambda* (#:key inputs native-inputs #:allow-other-keys) (for-each (lambda (i) - (copy-file (assoc-ref inputs i) + (copy-file (assoc-ref (or native-inputs inputs) i) (string-append "data/" i))) '("NormalizationTest.txt" "GraphemeBreakTest.txt")) (substitute* "data/GraphemeBreakTest.txt" @@ -201,6 +203,46 @@ normalization, case-folding, and other operations for data in the UTF-8 encoding, supporting Unicode version 9.0.0.") (license license:expat))) +(define-public utf8proc-2.6.1 + (package + (inherit utf8proc) + (name "utf8proc") + (version "2.6.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/JuliaStrings/utf8proc") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1zqc6airkzkssbjxanx5v8blfk90180gc9id0dx8ncs54f1ib8w7")))) + (arguments + (substitute-keyword-arguments (package-arguments utf8proc) + ((#:phases phases) + `(modify-phases ,phases + (replace 'check-data + (lambda* (#:key inputs native-inputs #:allow-other-keys) + (display native-inputs) + (for-each (lambda (i) + (copy-file (assoc-ref (or native-inputs inputs) i) + (string-append "data/" i))) + '("NormalizationTest.txt" "GraphemeBreakTest.txt" + "DerivedCoreProperties.txt")))))))) + (native-inputs + (append + (package-native-inputs utf8proc) + (let ((UNICODE_VERSION "13.0.0")) + `(("DerivedCoreProperties.txt" + ,(origin + (method url-fetch) + (uri (string-append "https://www.unicode.org/Public/" + UNICODE_VERSION "/ucd/DerivedCoreProperties.txt")) + (sha256 + (base32 "0j12x112cd8fpgazkc8izxnhhpia44p1m36ff8yapslxndcmzm55")))) + ;; For tests + ("ruby" ,ruby))))))) + (define-public libconfuse (package (name "libconfuse")