From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id iKleAe+7lWTMMAEASxT56A (envelope-from ) for ; Fri, 23 Jun 2023 17:36:15 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id KBNWAO+7lWSyDQAAG6o9tA (envelope-from ) for ; Fri, 23 Jun 2023 17:36:15 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 9224DB333 for ; Fri, 23 Jun 2023 17:36:14 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qCipU-0008Ow-FL; Fri, 23 Jun 2023 11:36:08 -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 1qCipQ-0008MX-4F for guix-patches@gnu.org; Fri, 23 Jun 2023 11:36:04 -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 1qCipP-0006ty-6t for guix-patches@gnu.org; Fri, 23 Jun 2023 11:36:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qCipO-0001xc-He; Fri, 23 Jun 2023 11:36:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64255] [PATCH 2/2] 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 15:36:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64255 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64255@debbugs.gnu.org Cc: Hilton Chain , Reza Housseini , Liliana Marie Prikler , =?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= X-Debbugs-Original-Xcc: Liliana Marie Prikler , =?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Received: via spool by 64255-submit@debbugs.gnu.org id=B64255.16875345507507 (code B ref 64255); Fri, 23 Jun 2023 15:36:02 +0000 Received: (at 64255) by debbugs.gnu.org; 23 Jun 2023 15:35:50 +0000 Received: from localhost ([127.0.0.1]:39390 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qCipB-0001x0-IJ for submit@debbugs.gnu.org; Fri, 23 Jun 2023 11:35:50 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:48862) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qCip9-0001wl-Kp for 64255@debbugs.gnu.org; Fri, 23 Jun 2023 11:35:48 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1687534355; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=CYfCg3HCb8Uywpfmq9KOL7lfuNZSGiRNO8OgzHinYbA=; b=FRphiVAOMt20xnM109xCKrjp6OcGLh40jlAD0KlWNcwFbjMbbCr/QNXJirn49gpCikG3FV vqZq4qFSrTcG5TcmN4ZpwaHD/XMNClhl34GCuIPR5TC/BdS7SRIXQKPbxDy8A08y2KkEK7 X5q2A6rY2MQv05thfCxbD4kOmJlpMFfuVX1ZVcleoEwgP+S9yEzLm6ZyuUwlbW2aH6LP/n xRaNZgvicadujym/eeaEfxO1WtNJTZbVNaz4CZ3iVDm6GbDDLVOunvoPSlBK2F3MMfYoXG gcvXOswn9d66oWkHpNGIfH9c7wlwf/j12hLDVVDk1/Vm7ptFkYyH3ib7kF4oMw== Date: Fri, 23 Jun 2023 23:35:26 +0800 Message-Id: In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spamd-Bar: --- 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 From: Hilton Chain via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1687534574; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=CYfCg3HCb8Uywpfmq9KOL7lfuNZSGiRNO8OgzHinYbA=; b=en7idrSjF1puPIpTJ68N1/gLjndqemsn3j1TTQl2Sq7MUGG4M0vwSvRS8jPCyd5rf9mJ3Y L//7glDH74Nl+35Zc2UEyrn8HVgvsvYoRgCuLHp5z560dJsBRT+Dk5c7KSrm82SZe4URfb +nef5jhwLHVbTiubqzak1wkReMzwP2q37CpNMFsBlgcP5adIDgYfAOhNrcToabkBZtonNl ZOixIXWhuddcpeu/6lG5/Zd8jpO3soonEPrW9WqqmVh43OuIfyZNrYwblqLA3SEYIeJqPx WrxJUIcxMqFusV3vseaVK0bBK2NvNJnv2xzkiX8m/NPTLfsrwQ7SHzOCDN0dwQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=ultrarare.space header.s=dkim header.b=FRphiVAO; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1687534574; a=rsa-sha256; cv=none; b=MPqDGgcrDStZPanL91ASq0HYLYkywa4yzPvJQeQfEFvJi/sl333LMz+MZnYwYAvaLCD6Xp SYYQLFI5wr7A0niFtZfuaXMPFv6a0fcAh2Kf+b8q51wdsYZWnVX7tKbmWwb8gmIox8EdCu RCW05uK/xhY3ZTqbYTMf+lM2bHL7pu7hfPhZecFyeM0gSsLTZq1MHPQwU/Yga+1dKyvS79 VqCOOjrjlWV92zoh7tdY+skGStOi4jEOyMW3qJtgz4DdZDfcxujQtSIKPra/Zlqr/r/ryf zPY7bMAhltY6n7yWLTeYu0GxZiJdvQzQjhjAv+VrdMFAGEKlzLMN5wdAZujCKw== X-Migadu-Scanner: scn1.migadu.com X-Migadu-Spam-Score: -2.25 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=ultrarare.space header.s=dkim header.b=FRphiVAO; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 9224DB333 X-Spam-Score: -2.25 X-TUID: X6JVcGAIMogH From: Reza Housseini * gnu/packages/textutils.scm (utfcpp): Update to 3.2.3. [snippet]: Unbundle ftest. [arguments]: Remove field. [native-inputs]: Add ftest. * gnu/packages/games.scm (warzone2100)<#:phases>: Adjust 'fix-utfcpp-include. * gnu/packages/video.scm (mkvtoolnix)<#:phases>: Add 'fix-utfcpp-include. Co-authored-by: Hilton Chain --- gnu/packages/games.scm | 2 +- gnu/packages/textutils.scm | 27 +++++++++++++-------------- gnu/packages/video.scm | 5 +++++ 3 files changed, 19 insertions(+), 15 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 51df3748cd..5f7ab7a438 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -25,6 +25,8 @@ ;;; Copyright © 2021 Felix Gruber ;;; Copyright © 2021 Bonface Munyoki Kilyungi ;;; Copyright © 2022 Gabriel Wicki +;;; Copyright © 2023 Reza Housseini +;;; Copyright © 2023 Hilton Chain ;;; ;;; This file is part of GNU Guix. ;;; @@ -687,29 +689,26 @@ (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)))) (file-name (git-file-name name version)) + (modules '((guix build utils))) + ;; Unbundle ftest + (snippet + '(begin + (delete-file-recursively "extern") + (substitute* (find-files "tests" "\\.cpp") + (("\"../extern/ftest/ftest.h\"") + "")))) (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)))))) + (native-inputs (list 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"))) -- 2.40.1