From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id CPz6Ht+0y2QXTAAASxT56A (envelope-from ) for ; Thu, 03 Aug 2023 16:08:31 +0200 Received: from aspmx1.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id IOfoHt+0y2TmTgEA9RJhRA (envelope-from ) for ; Thu, 03 Aug 2023 16:08:31 +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 ED93641FF7 for ; Thu, 3 Aug 2023 16:08:30 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=ultrarare.space header.s=dkim header.b=HZR1W6Bw; 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"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1691071711; a=rsa-sha256; cv=none; b=Wfs+BgMfSet3AN9D1V5X3+0i2MlQwuSRSwMCyr8xfpS1GBOqh2ZN6gsRlF28r+pqnhnfLb PCmIsgfBGJNyOqlsONaMgK+kyStz1twSG0Ye+Yi4aSjOdPCLpw3RtvHw5qTKiAEWhZon/W a2+Pr6WvHjA8BkxS7xOtnQHuYnB+bxzr7pihnNOr8nfIv8x7wn49MM84VcXAG2SuLGMI8Q QQ3mPntBrwWPN9csT2pV3+Ujj3M/vAmsG31W/nVSRMTgwqrb7r4IvBF3LE00uMo3pSY9Mu m0Oihkgfw6n1fE4dyBZ0rgjtx3ARulaG1L6fiYXwkCMC1Aq3oANpFQz9OC+a6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1691071711; 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=Oc9griOjJIA71UBRnDKg7FsQwhhFYgPF0IbYPaq+s+c=; b=EXsWeUVFntyBmB7xgADObQBy7UjV3OVupA1tmeeTvBO3AY7MFbi8gE2h7Ao5VKcrGLB7mz 68CH975lldnOAeqRyn7LPHEHv6tkPUZsxDwAQVbep/zeWUgWZkmaW6kUu7puPqCh6yttAE ACx17pmCzKKf3BAvSHpsnikh1j8Xzl4fQY/XmDpbKc6/xTygGjjn5dD9hr0gYgX11tK9nc eiaLqYTOVogDI+zAt814oquga+EzFOZ7/MfUEykTM+nq5VauAU/3sCKiZA/nyiowpbBsbO Q3B+RSJ43Cnh1Qh+WgyGrRGmOP3Nk5PUIMKI+zhZuIg6y4wD1Y22XhFrO094NQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=ultrarare.space header.s=dkim header.b=HZR1W6Bw; 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"; dmarc=pass (policy=none) header.from=gnu.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qRYzl-00024C-Gc; Thu, 03 Aug 2023 10:08: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 1qRYzk-00023U-1s for guix-patches@gnu.org; Thu, 03 Aug 2023 10:08:04 -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 1qRYzj-0007n5-J6 for guix-patches@gnu.org; Thu, 03 Aug 2023 10:08:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qRYzi-0006oN-5Y; Thu, 03 Aug 2023 10:08:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64255] [PATCH v2 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: Thu, 03 Aug 2023 14:08: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.169107164626127 (code B ref 64255); Thu, 03 Aug 2023 14:08:02 +0000 Received: (at 64255) by debbugs.gnu.org; 3 Aug 2023 14:07:26 +0000 Received: from localhost ([127.0.0.1]:52647 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qRYz8-0006nK-5k for submit@debbugs.gnu.org; Thu, 03 Aug 2023 10:07:26 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:52360) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qRYz5-0006mz-Ik for 64255@debbugs.gnu.org; Thu, 03 Aug 2023 10:07:24 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1691071639; 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=Oc9griOjJIA71UBRnDKg7FsQwhhFYgPF0IbYPaq+s+c=; b=HZR1W6BwZZScD+vvzGw1j78v/4+ZLCS5K7XDY4kYnUxqH6qmixr3yJNiNtmkrZxo+T5mwD PAeB6f9IbCAc18abgPmm0257TdeMNz+3LaLWtDlRJrv+FunrfVSMJo8RlMiVTs0qeKmmHP XxC2Fj0f5RrecCu9wEdm7Lh7zTLWffJ+vw3QAaHTQuAhHXkJkghrLtyb0cnM0qLb+Fcac4 ZzTyEkgNAI4G1VUC7VZPrigX85D89m5NXtEXxFLaOROblkIHq8znt1SiWCBJ6C7MLGB7VM PdOkWfctAe2WFHTk/CuRIIlolb0/U5C4yp5FWraBPr9nW5esSQWxQwY7wZcnDw== Date: Thu, 3 Aug 2023 22:06:44 +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-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -5.13 X-Migadu-Scanner: mx2.migadu.com X-Migadu-Queue-Id: ED93641FF7 X-Spam-Score: -5.13 X-TUID: ozf2L/+V3fwN 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 1573d7de00..82302852f4 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -5573,7 +5573,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 4e026fc6f9..5fbfdde284 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. ;;; @@ -690,29 +692,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 801c2602e4..f75a528b13 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1050,6 +1050,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.41.0