From patchwork Fri Jun 23 06:24:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 51200 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 1A85127BBE9; Fri, 23 Jun 2023 07:26:03 +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.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 3D62127BBE2 for ; Fri, 23 Jun 2023 07:26:02 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qCaEK-0002pT-CC; Fri, 23 Jun 2023 02:25:12 -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 1qCaEC-0002ny-6c for guix-patches@gnu.org; Fri, 23 Jun 2023 02:25:05 -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 1qCaEB-0001up-7u for guix-patches@gnu.org; Fri, 23 Jun 2023 02:25:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qCaEB-0000YR-1A; Fri, 23 Jun 2023 02:25:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63765] [PATCH v3 2/8] gnu: utfcpp: Update to 3.2.3. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Fri, 23 Jun 2023 06:25:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63765 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63765@debbugs.gnu.org Cc: Hilton Chain , Liliana Marie Prikler , =?utf-8?b?5a6L5paH5q2m?= X-Debbugs-Original-Xcc: Liliana Marie Prikler , =?utf-8?b?5a6L5paH5q2m?= Received: via spool by 63765-submit@debbugs.gnu.org id=B63765.16875014992084 (code B ref 63765); Fri, 23 Jun 2023 06:25:02 +0000 Received: (at 63765) by debbugs.gnu.org; 23 Jun 2023 06:24:59 +0000 Received: from localhost ([127.0.0.1]:37297 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qCaE6-0000XT-FS for submit@debbugs.gnu.org; Fri, 23 Jun 2023 02:24:58 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:46336) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qCaE2-0000X2-RP for 63765@debbugs.gnu.org; Fri, 23 Jun 2023 02:24:57 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1687501303; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=vnA8rqvUNrE/4uCkekbCDyHObpcrLVeNOKiL1vRGJLM=; b=tfyD0736fz2RRURaUoMhEpILR3bwD8XSoaw4TWIvzqoX3pLFZxREH2vBqaEsaS05K3/P4B D7HmrVcBC/t5WdzAM5EC5SgLBmouiadafRiWdIs6D4XxywMNG0eoNSlLfXhdHn/77H/Rz7 wk7TspRAZQDeEkz5sTcSk6FCBpD2vGTWxonWuwxMYaOkchVRFi2AB1yOf2+enVOPO4J0GQ ngcUeamOrXLYWKOB1PjLd7PfXpxUqW/8hlmFtdJDsi/kGFEpUJl9W5yqqcHiqQlSUadvzU BmViQXvnsWMqX55GD8Vfy0eyX57asuO3UH9cj+P08K6wSc9TLyQyH5hv4D1XoQ== Date: Fri, 23 Jun 2023 14:24:43 +0800 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Spamd-Bar: -- Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space 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: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches X-Patchwork-Original-From: Hilton Chain via Guix-patches via From: Hilton Chain 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 (utfcpp): Update to 3.2.3. [arguments]: Remove arguments, then... <#:phases>: ...Add 'unpack-ftest. * gnu/packages/games.scm (warzone2100)<#:phases>: Adjust 'fix-utfcpp-include. * gnu/packages/video.scm (mkvtoolnix)<#:phases>: Add 'fix-utfcpp-include. --- gnu/packages/games.scm | 2 +- gnu/packages/textutils.scm | 20 +++++++------------- gnu/packages/video.scm | 5 +++++ 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 83704dd720..9dbf5a3739 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -5510,7 +5510,7 @@ (define-public warzone2100 (lambda _ (substitute* "lib/framework/wzstring.cpp" (("") - "")))) + "")))) (add-after 'unpack 'link-tests-with-qt (lambda _ (substitute* "tests/Makefile.am" diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index 26d0234390..81b403d559 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -701,7 +701,7 @@ (define ftest-for-utfcpp (define-public utfcpp (package (name "utfcpp") - (version "2.3.5") + (version "3.2.3") (source (origin (method git-fetch) (uri (git-reference @@ -710,20 +710,14 @@ (define-public utfcpp (file-name (git-file-name name version)) (sha256 (base32 - "1gr98d826z6wa58r1s5i7rz7q2x3r31v7zj0pjjlrc7gfxwklr4s")))) + "00hzh39iddbc6nxg13813qd6d55g2kccwjf5dr96wykfhway9wbr")))) (build-system cmake-build-system) (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)))))) + (list #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'unpack-ftest + (lambda* (#:key native-inputs #:allow-other-keys) + (copy-recursively #$ftest-for-utfcpp "extern/ftest")))))) (home-page "https://github.com/nemtrif/utfcpp") (synopsis "Portable C++ library for handling UTF-8") (description "UTF8-CPP is a C++ library for handling UTF-8 encoded text diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 55eab972b9..43ae3899f9 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1048,6 +1048,11 @@ (define-public mkvtoolnix "--enable-precompiled-headers=no") #:phases (modify-phases %standard-phases + (add-after 'unpack 'fix-utfcpp-include + (lambda _ + (substitute* "src/common/strings/utf8.cpp" + (("") + "")))) (add-after 'unpack 'patch-relative-file-names (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out")))