From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id gLDxKKdHkGIQbAAAbAwnHQ (envelope-from ) for ; Fri, 27 May 2022 05:38:15 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id IKnmJ6dHkGKk8gAAG6o9tA (envelope-from ) for ; Fri, 27 May 2022 05:38: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 42B091EEFC for ; Fri, 27 May 2022 05:38:15 +0200 (CEST) Received: from localhost ([::1]:43718 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nuQnl-0007Dx-WB for larch@yhetil.org; Thu, 26 May 2022 23:38:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43844) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nuQnZ-0007Dn-UV for guix-patches@gnu.org; Thu, 26 May 2022 23:38:01 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:38396) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nuQnZ-0005rA-Kl for guix-patches@gnu.org; Thu, 26 May 2022 23:38:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nuQnZ-0007Nj-Ia for guix-patches@gnu.org; Thu, 26 May 2022 23:38:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54630] [PATCH] Updating to add utfcpp as a seperate version and to update mkvtoolnix and warzone2100 to use the old version since they need behavior from version 2 and not version 3. References: In-Reply-To: Resent-From: Anadon Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 27 May 2022 03:38:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54630 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch moreinfo To: 54630@debbugs.gnu.org Cc: Anadon Received: via spool by 54630-submit@debbugs.gnu.org id=B54630.165362267428362 (code B ref 54630); Fri, 27 May 2022 03:38:01 +0000 Received: (at 54630) by debbugs.gnu.org; 27 May 2022 03:37:54 +0000 Received: from localhost ([127.0.0.1]:60526 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nuQnS-0007NO-6C for submit@debbugs.gnu.org; Thu, 26 May 2022 23:37:54 -0400 Received: from mail-qv1-f50.google.com ([209.85.219.50]:40551) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nuQnO-0007N9-UU for 54630@debbugs.gnu.org; Thu, 26 May 2022 23:37:53 -0400 Received: by mail-qv1-f50.google.com with SMTP id em1so2873231qvb.7 for <54630@debbugs.gnu.org>; Thu, 26 May 2022 20:37:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=YZwoOPDgDoeg73LpptnJHg4Sm+0A69NHW1DzDT2acpA=; b=qfWhHRZk1NnVrpN02CXTbPmjxgCVwOBJFH8bRzkkQOxgH67qBSTSvThPm0L1CQCCib 1QOsVObHHybSYBr83/zh9VjdaxIX90dXnDzAfy16IU2iwXneB+1yRrQCaXNxrTNKCUOb xXvwwglQuKrTtDS+GZ+nwKADYMZmS9ELwDCj48v9GbVcaEpWCRi+jv/i2BXBrLPP1TyK gtloV/8H3ussGR6SjoRcEQeRD3ig0+VPToGVDnIiV33C9s7eDTWpmmcYspGFd77mbm29 d28uv7vNJSDfUFh5ZIvXTA7e7nxSg9cRVpghPkpAgFywQcjENk4p/MlH7/XB8Vp9s77A u9qA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=YZwoOPDgDoeg73LpptnJHg4Sm+0A69NHW1DzDT2acpA=; b=N5rh/z0796hZCK00WTl9UeiNmQXN096NDIq7R5wEt2h5E56oB6ZBweuScDPBlLx7Bq kUwpzsxtNQJPG2UP3lGEaP3rOwvj01A7yUOLLAKWUemJRdtLbhkyQU7d6FNe33OzAh9o zoOzhvLLdoMMzUBwWWDTLkSJR0CckWRifSHMPj8lbWQNCoevisi8espqMhtaH/ooo7fz 6VhvXgvq/e+U9ul3i8fI5NvDdXFnLeWKrfge99/SDRCEcU8sEskTwj9LEx8iRz3/7lVc rDUugNxm8GwrINUAwXQGxhPjpa4m3whAogDxm19F/YjRgbzgLeZnILbVxtjU0+qMtAcw gAHA== X-Gm-Message-State: AOAM531Guatfo/uosQZDdLD3bXIsYYJq1QWX5b5jcIZoHRgWr/UhEy4B R6IcKlpmxflHGlnvsHDlj+C8Nt3rqcE= X-Google-Smtp-Source: ABdhPJx9Cqetr5tZ1YgIwHY5F53j8V6QQzp3DrDnJScvuKSo3n+55QYMl1uk1mMuWqcUztjoinIX/g== X-Received: by 2002:a05:6214:518e:b0:462:6f2c:df8e with SMTP id kl14-20020a056214518e00b004626f2cdf8emr4903719qvb.130.1653622665144; Thu, 26 May 2022 20:37:45 -0700 (PDT) Received: from Poymon (c-73-123-156-53.hsd1.ct.comcast.net. [73.123.156.53]) by smtp.gmail.com with ESMTPSA id b26-20020a05620a271a00b0069fe1fc72e7sm2170087qkp.90.2022.05.26.20.37.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 May 2022 20:37:44 -0700 (PDT) Received: by Poymon (Postfix, from userid 1000) id 094BC418F90; Thu, 26 May 2022 23:37:44 -0400 (EDT) From: Anadon Date: Thu, 26 May 2022 23:37:42 -0400 Message-Id: <20220527033742.217278-1-joshua.r.marshall.1991@gmail.com> X-Mailer: git-send-email 2.34.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1653622695; h=from:from:sender:sender: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=YZwoOPDgDoeg73LpptnJHg4Sm+0A69NHW1DzDT2acpA=; b=Zx6EuE0f8KazHivYl2Kd2MGXxyoPU9qJkVKewXzw59PNSz+fIyiVQn8MkIqPAyICqLf27R 3pZaTYr4ndW9LLaPq0tiHDBBhNE0lLVczoynXnPna2qlDFzXtdW7A4FplOxCGboWzyyqBG dG/9k0Tehnn4SlyuyuN/4ntAXr+V0dXXVS0H7IJcsPX6gifSvbjbZio7FLN4vU/2/PfVNd XOd3C4cbdRM+i4Ot5EtBd9oPcY+pQqgfxlZD/4ykzvtIikGF7AcuAwKWbjr7yg0zS4S3Ca HBvXfOEDPWA8KXlxrf669WMGAZweId+T0q3Ns3in/8+BbOzKGGrk6XpW1BKDJw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1653622695; a=rsa-sha256; cv=none; b=pumxGaXLyBZPaAhXuN5NQsxXikOY8cT8nitfSXmObqy1LtvUfmWdZbwECR8/eCgkju60lK WhirI5ZXqNOq4ea/Q7HH1myiqqrcbXp4O6sSaye2L5L2NORel//fBNw/VBQAJyKYnkpmBJ l5sl6VW9uG2Vbvcm50nkHJ4zVkShQ2BDzl10YUfcIoDJvDCCxi6wIGhNz8NIZWG3lWh0+k /ycywMIA2zsqjJoomdz6GjAxBS6sVo0/KSYzhoH13R2XTmUo3CTcU0sCake4u84/MSmUYr Rk1s13euSzkFGJw4IzO+WH8e6VKVMw97kCqZ3oCk8RCW8et+Nd2b/TcUun3DrA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=qfWhHRZk; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); 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-Spam-Score: 4.36 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=qfWhHRZk; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); 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: 42B091EEFC X-Spam-Score: 4.36 X-Migadu-Scanner: scn0.migadu.com X-TUID: +JrlGjbKmbA3 --- gnu/packages/games.scm | 2 +- gnu/packages/textutils.scm | 30 ++++++++++++++++++++++++------ gnu/packages/video.scm | 2 +- 3 files changed, 26 insertions(+), 8 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 8cc29b3487..1c01a41ed6 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -5131,7 +5131,7 @@ (define-public warzone2100 ("openssl" ,openssl) ("sdl2" ,sdl2) ("sqlite" ,sqlite) - ("utfcpp" ,utfcpp))) + ("utfcpp" ,utfcpp-2))) (home-page "https://wz2100.net") (synopsis "3D Real-time strategy and real-time tactics game") (description diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index cbc657172d..484884160d 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -24,6 +24,7 @@ ;;; Copyright © 2021 Simon Tournier ;;; Copyright © 2021 Felix Gruber ;;; Copyright © 2021 Bonface Munyoki Kilyungi +;;; Copyright © 2021 Josh Marshall ;;; ;;; This file is part of GNU Guix. ;;; @@ -668,6 +669,28 @@ (define-public catdoc (define-public utfcpp (package + (name "utfcpp") + (version "3.2.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/nemtrif/utfcpp") + (commit (string-append "v" version)) + (recursive? #t))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0gsbwif97i025bxgyax4fbf6v9z44zrca4s6wwd8x36ac8qzjppf")))) + (build-system cmake-build-system) + (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 +in a portable way.") + (license license:boost1.0))) + +(define-public utfcpp-2 + (package + (inherit utfcpp) (name "utfcpp") (version "2.3.5") (source (origin @@ -691,12 +714,7 @@ (define-public utfcpp (doc (string-append out "/share/doc/" ,name))) (copy-recursively "source" include) (install-file "README.md" doc) - #t)))))) - (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 -in a portable way.") - (license license:boost1.0))) + #t)))))))) (define-public dbacl (package diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index dc05c0a222..da383192bc 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -991,7 +991,7 @@ (define-public mkvtoolnix pugixml qtbase-5 qtmultimedia - utfcpp + utfcpp-2 zlib)) (native-inputs `(("docbook-xsl" ,docbook-xsl) -- 2.34.0