From patchwork Mon Mar 27 07:46:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: reza X-Patchwork-Id: 48738 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 9E1CE17009; Mon, 27 Mar 2023 08:47:25 +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=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,PDS_BAD_THREAD_QP_64,RCVD_IN_MSPIKE_H2, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 826F216934 for ; Mon, 27 Mar 2023 08:47:24 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pghZI-00007T-K5; Mon, 27 Mar 2023 03:47:04 -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 1pghZG-00006q-R6 for guix-patches@gnu.org; Mon, 27 Mar 2023 03:47:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pghZG-0004Ul-Bg for guix-patches@gnu.org; Mon, 27 Mar 2023 03:47:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pghZG-0001sE-3P for guix-patches@gnu.org; Mon, 27 Mar 2023 03:47:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62473] [PATCH 2/4] gnu: utfcpp: Update to 3.2.3. Resent-From: reza Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 27 Mar 2023 07:47:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62473 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62473@debbugs.gnu.org <62473@debbugs.gnu.org> Cc: Reza Housseini Received: via spool by 62473-submit@debbugs.gnu.org id=B62473.16799031877134 (code B ref 62473); Mon, 27 Mar 2023 07:47:02 +0000 Received: (at 62473) by debbugs.gnu.org; 27 Mar 2023 07:46:27 +0000 Received: from localhost ([127.0.0.1]:46405 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pghYg-0001r0-EI for submit@debbugs.gnu.org; Mon, 27 Mar 2023 03:46:26 -0400 Received: from a2-25.smtp-out.eu-west-1.amazonses.com ([54.240.2.25]:45305) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <0102018722082852-75d7c18a-edf1-44ff-a588-50604407dd45-000000@mail.housseini.me>) id 1pghYd-0001qk-S5 for 62473@debbugs.gnu.org; Mon, 27 Mar 2023 03:46:24 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=solmzk3ljecfoypi3q6x2mqs3bucnhjw; d=housseini.me; t=1679903172; h=Subject:From:To:Cc:Date:Mime-Version:Content-Type:Content-Transfer-Encoding:In-Reply-To:References:Message-Id; bh=5oXyDccpeNXLV4pUeXjGWcS4ZHTRw1yrRFZuvhWQQeg=; b=dQ/cigJPDYkT2uQZwgo1RW0dvKWV4DMgCMK18hyDqppO2cWQQFhbNsNsyaqftG0C UKAupPhBrtntgkvn4/MKNjN6xqCew6dNC/2+NgN1ed76FL4NYbMYw49/O2MecSXkc82 NMywiamk7WPAjiNfonQSIQa9W5D+GbZT0DWil5CM= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=shh3fegwg5fppqsuzphvschd53n6ihuv; d=amazonses.com; t=1679903172; h=Subject:From:To:Cc:Date:Mime-Version:Content-Type:Content-Transfer-Encoding:In-Reply-To:References:Message-Id:Feedback-ID; bh=5oXyDccpeNXLV4pUeXjGWcS4ZHTRw1yrRFZuvhWQQeg=; b=eqCEvHgp/V+KV/zlgZfc84fRh6BRWBs+5/b3iUHX5eh+WlNS4dk5cQHT51QJ6qWx vsjRg2HQZRtf4LNrQyqP+xqx/pPGFnmnmX91uJ3nktwEn5f4rIluUxxU5BG9ynGAlaR H/K4yLitEzizA7/4lvbvbEybAym4+JJpL4FT87k0= Date: Mon, 27 Mar 2023 07:46:12 +0000 Mime-Version: 1.0 In-Reply-To: References: <622cad546298d2bd56fc4baf49dafeb8c9fa20b1.1679863907.git.reza@housseini.me> X-Mailer: Amazon WorkMail Thread-Index: AQHZYCUTqXTMDxJ1QYy50jux+uaaqwAWyAL2 Thread-Topic: [PATCH 2/4] gnu: utfcpp: Update to 3.2.3. X-Wm-Sent-Timestamp: 1679903171 X-Original-Mailer: git-send-email 2.39.2 Message-ID: <0102018722082852-75d7c18a-edf1-44ff-a588-50604407dd45-000000@eu-west-1.amazonses.com> Feedback-ID: 1.eu-west-1.b24dn6frgCi6dh20skzbuMRr7UL8M6Soir/3ogtEjHQ=:AmazonSES X-SES-Outgoing: 2023.03.27-54.240.2.25 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: , Reply-to: reza X-ACL-Warn: , reza via Guix-patches X-Patchwork-Original-From: reza via Guix-patches via From: reza 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 From: Reza Housseini --- gnu/packages/textutils.scm | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) -- 2.39.2 diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index fb8bc7e868..a08fb76543 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -25,6 +25,7 @@ ;;; Copyright © 2021 Felix Gruber ;;; Copyright © 2021 Bonface Munyoki Kilyungi ;;; Copyright © 2022 Gabriel Wicki +;;; Copyright © 2023 Reza Housseini ;;; ;;; This file is part of GNU Guix. ;;; @@ -57,6 +58,7 @@ (define-module (gnu packages textutils) #:use-module (gnu packages) #:use-module (gnu packages autotools) #:use-module (gnu packages base) + #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages gcc) #:use-module (gnu packages golang) @@ -671,30 +673,31 @@ (define-public catdoc (define-public utfcpp (package (name "utfcpp") - (version "2.3.5") + (version "3.2.3") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/nemtrif/utfcpp") - (commit (string-append "v" version)))) + (url "https://github.com/nemtrif/utfcpp") + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 - "1gr98d826z6wa58r1s5i7rz7q2x3r31v7zj0pjjlrc7gfxwklr4s")))) + "00hzh39iddbc6nxg13813qd6d55g2kccwjf5dr96wykfhway9wbr")) + (modules '((guix build utils))) + (snippet '(begin + ;; delete bundled dependencies + (delete-file-recursively "extern") + (substitute* (list "tests/apitests.cpp" + "tests/noexceptionstests.cpp" + "tests/test_cpp11.cpp" + "tests/test_cpp17.cpp") + (("\"\\.\\./extern/ftest/ftest.h\"") + "")))))) (build-system cmake-build-system) + (native-inputs (list ftest)) (arguments - `(#:out-of-source? #f - #:phases - (modify-phases %standard-phases - (replace 'install ; no install target - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (include (string-append out "/include")) - (doc (string-append out "/share/doc/" ,name))) - (copy-recursively "source" include) - (install-file "README.md" doc) - #t)))))) - (home-page "https://github.com/nemtrif/utfcpp") + `(#:build-type "Release")) + (home-page "https://utfcpp.sourceforge.net") (synopsis "Portable C++ library for handling UTF-8") (description "UTF8-CPP is a C++ library for handling UTF-8 encoded text in a portable way.")