From patchwork Tue Apr 29 20:42:46 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: John Khoo X-Patchwork-Id: 42163 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 AFC2D27BC4B; Tue, 29 Apr 2025 21:44:51 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 56AB527BC49 for ; Tue, 29 Apr 2025 21:44:50 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u9roD-0007CP-79; Tue, 29 Apr 2025 16:44:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u9roB-0007As-69; Tue, 29 Apr 2025 16:44:03 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u9roA-0007mO-J3; Tue, 29 Apr 2025 16:44:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=TnqJtJKe+zw5ytQSDr4orQrd6Ex3cP1NQL5mSrzt9WA=; b=kKgT0D7rCz8++4lrOWwkW+yxAY75j9d4CdU/H4sp7Jtk/9Tejp4+ez08qIFrjC+LanN/S2ae1KeOHui9RmQ1sznYabI32pybhOQJ3/bx5mWR9ngnEwtB195t5J8GZpG6VT9odY/e6FF7O/7M4RpEg34s0+l2fp4tB4TrtwIpbzI5xRQEi5cwzajbK1TFo7gl4+KyFl5cmWGKpp/62T3wPPKoDzTEV+cmxmEz22Spoc+KL9NA3FPtIIBaAcHyQGgav+5UpyhERTmX4tQoKqSfrNIuedlwepmnJ9BHd0yshRAoXi75dYzonFi0qhUeJJ0N99WZJWltnpB2e7dxwES53g==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u9roA-000463-D0; Tue, 29 Apr 2025 16:44:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77949] [PATCH v3 2/5] gnu: utf8proc: Update to 2.10.0. Resent-From: John Khoo Original-Sender: "Debbugs-submit" Resent-CC: johnkhootf@gmail.com, liliana.prikler@gmail.com, hako@ultrarare.space, help-debbugs@gnu.org, luispereira.tkd@gmail.com, guix-patches@gnu.org Resent-Date: Tue, 29 Apr 2025 20:44:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 77949 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77949@debbugs.gnu.org Cc: John Khoo , John Khoo , Liliana Marie Prikler , Hilton Chain , Debbugs Internal Request , Luis Pereira X-Debbugs-Original-Xcc: John Khoo , Liliana Marie Prikler , Hilton Chain , Debbugs Internal Request , Luis Pereira Received: via spool by 77949-submit@debbugs.gnu.org id=B77949.174595940015399 (code B ref 77949); Tue, 29 Apr 2025 20:44:02 +0000 Received: (at 77949) by debbugs.gnu.org; 29 Apr 2025 20:43:20 +0000 Received: from localhost ([127.0.0.1]:35164 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u9rnT-00040I-Ml for submit@debbugs.gnu.org; Tue, 29 Apr 2025 16:43:20 -0400 Received: from mail-pl1-x62d.google.com ([2607:f8b0:4864:20::62d]:56361) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1u9rnN-0003yh-3H for 77949@debbugs.gnu.org; Tue, 29 Apr 2025 16:43:14 -0400 Received: by mail-pl1-x62d.google.com with SMTP id d9443c01a7336-225477548e1so69099075ad.0 for <77949@debbugs.gnu.org>; Tue, 29 Apr 2025 13:43:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1745959386; x=1746564186; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=TnqJtJKe+zw5ytQSDr4orQrd6Ex3cP1NQL5mSrzt9WA=; b=l7cfNPXpszT1B3k2np0OKqlytC+5LgLQBnohOQBDg8Lhabg+BV1j+g7nGorNk2b8e9 kesMTNdWxXkdUWHyqSQdEz/QHAW7EpamhtCBbr0SSvEQc8uy9/o4JhDjLm+oeGH3iBGP pC+jC5nFe1c1FGDqn00YjHsEavY3Gl3tS3PD5dIRUIYTNwjAx8zsIgcuA7349zOLJCPt hB7x7yi+0Lf/sEXTnSuKCcebCvv8kb+3SXd3lGCpolgi5/ck/9MF2S2Hx5uDNGJkfL3R odx8mQ//mh2btJOWr1frBuqQuWNWg/RcJWqmmjI5Bd4GqTF+T0lt9Yl3pTk16aZFXkUo GQCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745959386; x=1746564186; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=TnqJtJKe+zw5ytQSDr4orQrd6Ex3cP1NQL5mSrzt9WA=; b=w99dNG6ZCAhiaeT/qpA80AT48p+ooDpyWx78KYqev8ohXz3iQ4msIJWv3z9JF7dzrn gtNa8/wo6pxOPTR8O/qNJtRHiptAKOkAnUwOG9dXlFyNJzY3wzUgxrjADWL6YXzc1nqb W8SmyFBTT0JF4ZynnXCfi2Lx1lPGUFLw9YCtyvb77hcuvaLXBbj2cJLC3tqFQ974NyCe bc0lO1lvw1weD7OI9i51ASFPhCUWYQEKyxAY11CKdhn42CuqJnye4euM1E3V9ZuJx7rr 0CIANHPb4sGcPre7qgWTHmcXDhaJwf+/ISrG7q0qm0dR0YztAAlrg1IntzgHt5wFERCX XM5Q== X-Gm-Message-State: AOJu0YyGfeitsVm+E4dI2R4TvCtwCat5/n+esnZlEOHa9neogDccHdF4 MZD3C/CJOQO3uJwQdfxhOPA0IGZ1Aop7CQ0STR0KdumeRRiSxuiDzqRsyaOoqk4= X-Gm-Gg: ASbGnctlqJ5avyEzP3UrzTjJoVXPXzpjcjbvRbcbTEWRGTYeod7XgCt5XoCk1dfbQgo v6MjNDKHvEFNDTezVg2byVQZU7UktUCN/yjFdWyDAo8TjuPBKXA3BgAZT8F0VK960EcmrNMwM2P kp9wd454TSNpBfg83qPuVoEDKcMdolwNf4xyUaIu13R5C81ukXWSg9SZpM+LM/wmVcCALWjYNM8 kW7Iqs69yKZQENs2xVXo3AAGVzlg3w6elFSd5PfDuXd9PAjAVGyIhp+H90MFcYaLWf70/S0hvy6 mhWJFJF5Gqh/g7x8inbSTmvSe5pZoi0/CBZy X-Google-Smtp-Source: AGHT+IGjbbzNJF/hyw3diG1+vk5KaxAQ64o6aibOKw86SRqG3Huvr1J812C194YNBiWkdWSotbQoEA== X-Received: by 2002:a17:902:ce84:b0:220:e9f5:4b7c with SMTP id d9443c01a7336-22df34cac69mr11510825ad.17.1745959385978; Tue, 29 Apr 2025 13:43:05 -0700 (PDT) Received: from localhost ([116.86.61.95]) by smtp.gmail.com with UTF8SMTPSA id d9443c01a7336-22db5102882sm107335365ad.197.2025.04.29.13.43.04 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 29 Apr 2025 13:43:05 -0700 (PDT) From: John Khoo Date: Wed, 30 Apr 2025 04:42:46 +0800 Message-ID: <5d40384d9feed414dfaded6cb3f812b19239d437.1745959369.git.johnkhootf@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <0998501bad053ba20daae94993a9f64120e114ab.1745959369.git.johnkhootf@gmail.com> References: <0998501bad053ba20daae94993a9f64120e114ab.1745959369.git.johnkhootf@gmail.com> 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/textutils.scm (utf8proc): Update to 2.10.0. Change-Id: Ib8e08ea65eab2409a38dd5f43c91342842e361f5 --- gnu/packages/textutils.scm | 76 ++++++++++++++++---------------------- 1 file changed, 32 insertions(+), 44 deletions(-) diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index 5fc21eb7ea..83c8d83c8b 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -91,7 +91,8 @@ (define-module (gnu packages textutils) #:use-module (gnu packages ruby) #:use-module (gnu packages slang) #:use-module (gnu packages web) - #:use-module (gnu packages xorg)) + #:use-module (gnu packages xorg) + #:use-module (srfi srfi-1)) (define-public dos2unix (package @@ -202,20 +203,10 @@ (define-public utf8proc-bootstrap (define-public utf8proc (package + (inherit utf8proc-bootstrap) (name "utf8proc") - (version "2.5.0") - (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 "1xlkazhdnja4lksn5c9nf4bln5gjqa35a8gwlam5r0728w0h83qq")))) - (build-system gnu-build-system) - (native-inputs - (let ((UNICODE_VERSION "13.0.0")) ; defined in data/Makefile + (native-inputs ;; For tests. + (let ((UNICODE_VERSION "16.0.0")) ; defined in data/Makefile ;; Test data that is otherwise downloaded with curl. `(("NormalizationTest.txt" ,(origin @@ -223,7 +214,7 @@ (define-public utf8proc (uri (string-append "https://www.unicode.org/Public/" UNICODE_VERSION "/ucd/NormalizationTest.txt")) (sha256 - (base32 "07g0ya4f6zfzvpp24ccxkb2yq568kh83gls85rjl950nv5fya3nn")))) + (base32 "1cffwlxgn6sawxb627xqaw3shnnfxq0v7cbgsld5w1z7aca9f4fq")))) ("GraphemeBreakTest.txt" ,(origin (method url-fetch) @@ -231,37 +222,34 @@ (define-public utf8proc UNICODE_VERSION "/ucd/auxiliary/GraphemeBreakTest.txt")) (sha256 - (base32 "07f8rrvcsq4pibdz6zxggxy8w7zjjqyw2ggclqlhalyv45yv7prj")))) - + (base32 "1d9w6vdfxakjpp38qjvhgvbl2qx0zv5655ph54dhdb3hs9a96azf")))) + ("DerivedCoreProperties.txt" + ,(origin + (method url-fetch) + (uri (string-append "https://www.unicode.org/Public/" + UNICODE_VERSION "/ucd/DerivedCoreProperties.txt")) + (sha256 + (base32 "1gfsq4vdmzi803i2s8ih7mm4fgs907kvkg88kvv9fi4my9hm3lrr")))) ;; For tests. - ("perl" ,perl)))) + ("perl" ,perl) + ("ruby" ,ruby-2.7) + ("julia" ,julia)))) (arguments - `(#:make-flags (list ,(string-append "CC=" (cc-for-target)) - (string-append "prefix=" (assoc-ref %outputs "out"))) - #:phases - (modify-phases %standard-phases - (delete 'configure) - (add-before 'check 'check-data - (lambda* (#:key ,@(if (%current-target-system) - '(native-inputs) - '()) - inputs #:allow-other-keys) - (for-each (lambda (i) - (copy-file (assoc-ref ,@(if (%current-target-system) - '((or native-inputs inputs)) - '(inputs)) i) - (string-append "data/" i))) - '("NormalizationTest.txt" "GraphemeBreakTest.txt")) - (substitute* "data/GraphemeBreakTest.txt" - (("÷") "/") - (("×") "+")) - #t))))) - (home-page "https://juliastrings.github.io/utf8proc/") - (synopsis "C library for processing UTF-8 Unicode data") - (description "utf8proc is a small C library that provides Unicode -normalization, case-folding, and other operations for data in the UTF-8 -encoding, supporting Unicode version 9.0.0.") - (license license:expat))) + (substitute-keyword-arguments (package-arguments utf8proc-bootstrap) + ((#:tests? _ #f) + (not (%current-target-system))) + ((#:phases phases) + `(modify-phases %standard-phases + (delete 'configure) + (add-before 'check '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")))))))) + (properties (alist-delete 'hidden? (package-properties utf8proc-bootstrap))))) (define-public utf8proc-2.7.0 (package