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 APjzHTh1kGJ5RQEAbAwnHQ (envelope-from ) for ; Fri, 27 May 2022 08:52:40 +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 yO4DHTh1kGIjIAAAG6o9tA (envelope-from ) for ; Fri, 27 May 2022 08:52:40 +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 D2A9321FA1 for ; Fri, 27 May 2022 08:52:39 +0200 (CEST) Received: from localhost ([::1]:56748 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nuTpu-0001cc-Hs for larch@yhetil.org; Fri, 27 May 2022 02:52:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42368) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nuTpK-0001cO-9M for guix-patches@gnu.org; Fri, 27 May 2022 02:52:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:38628) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nuTpK-00030Y-16 for guix-patches@gnu.org; Fri, 27 May 2022 02:52:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nuTpJ-0006Mm-Vl for guix-patches@gnu.org; Fri, 27 May 2022 02:52:02 -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. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 27 May 2022 06:52: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: Anadon , 54630@debbugs.gnu.org Received: via spool by 54630-submit@debbugs.gnu.org id=B54630.165363430224445 (code B ref 54630); Fri, 27 May 2022 06:52:01 +0000 Received: (at 54630) by debbugs.gnu.org; 27 May 2022 06:51:42 +0000 Received: from localhost ([127.0.0.1]:60758 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nuTp0-0006MC-9n for submit@debbugs.gnu.org; Fri, 27 May 2022 02:51:42 -0400 Received: from mail-ej1-f68.google.com ([209.85.218.68]:39902) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nuTov-0006Lu-21 for 54630@debbugs.gnu.org; Fri, 27 May 2022 02:51:41 -0400 Received: by mail-ej1-f68.google.com with SMTP id gh17so6963578ejc.6 for <54630@debbugs.gnu.org>; Thu, 26 May 2022 23:51:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:subject:from:to:date:in-reply-to:references:user-agent :mime-version:content-transfer-encoding; bh=QF7AfBOt2Mcg6izc5usR0HK+VFCWWlvjxIfm3dmUBAo=; b=DFACbLjwY3+rpu6eBKdYXmFllSOsCIJQkBQABlwY6DtYXJCGSNBGteuEYmRyeScpnG GxnERhS1j0UN73UnGS2bT/RurLw2kgUSF0zkMYw0rX8QTmunLoYM+lRFLTPk4eM3KvD+ cmekOTj/VhxA7NvToyM9t/G54G7hvySzhAGvC2d4drrp9Rr2MOBdQ24geSr3qguODGXE HA8FJsGIobmBp/dCO5WU0/vTD/4xmL5TYkRXSPQMlq4YE74T1tn0zfgTfqgmeZtB51Fg lZa+gIiom4qRW8KHtA4IKxw8e76ovk0BeJi3AnBzgIkeWFZonAPOgCdSqcO6hrKoVQQM 2uXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:subject:from:to:date:in-reply-to :references:user-agent:mime-version:content-transfer-encoding; bh=QF7AfBOt2Mcg6izc5usR0HK+VFCWWlvjxIfm3dmUBAo=; b=3bbRmxYY6x4uk2znpETztaLar1s3EwvSeuvgS1DKQYZkdKScaOdHqDgL4KdmWYvd4q l0LDagtyAb2W7rxd3zRHlz5EJ+vePwx7V1p4MvvRbzz5pj7+q2JsP6mBvtsasspjqQt0 wfy53ywW13BIjFzFv2kyP/aOMLCTbhVCVyiZzPOFEssBkgolIw7aeSJ5SqspjDwXBHdK Ec4Ydltq78c1J7fnQeP5oP6Dl/E6N7UM3tBrGzZYJ7hGVm+Wy+eLozRcJtFBlozvdS4P pKC9ySiI5T2sZ4m0+3WE7wK3stML4HHy4X6lCJrkOZzUc3nAdSkpfulKQpkQO2TQQkkh LqHA== X-Gm-Message-State: AOAM5310VQfZJeMYLwLfsDAfpyT8pUe2jSAdXD3EnRrhn+TYQC2izCGb 4VPSqpxzT6BxBjtwni4XMso= X-Google-Smtp-Source: ABdhPJzDB5O+2qTtZeTr5wqxL8eHAd/8jAjPhZsYOMpzZCnvitwDKJqphXnxtIpYuOSkOzA7iIgjhw== X-Received: by 2002:a17:906:d554:b0:6f5:2242:a499 with SMTP id cr20-20020a170906d55400b006f52242a499mr35724225ejc.488.1653634291017; Thu, 26 May 2022 23:51:31 -0700 (PDT) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id z19-20020a50e693000000b0042ab2127051sm1696520edm.64.2022.05.26.23.51.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 May 2022 23:51:30 -0700 (PDT) Message-ID: From: Liliana Marie Prikler Date: Fri, 27 May 2022 08:51:29 +0200 In-Reply-To: <20220527030350.211135-1-joshua.r.marshall.1991@gmail.com> References: <20220527030350.211135-1-joshua.r.marshall.1991@gmail.com> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.42.1 MIME-Version: 1.0 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=1653634359; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to: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=QF7AfBOt2Mcg6izc5usR0HK+VFCWWlvjxIfm3dmUBAo=; b=laixtNIMamkkOZHZQy3gOajB9uarUzeRZktjTUQQ4FkzhdzA7vb8kerymI/InFAL5cZrP7 1leGoAkujKEND1VDUALTr0NdeGbQ7723IFJ7BZiOGn97jsaeeMWIqT6DL+3FZTkoAOIACv 0smVihK5uQzCab3jVtxu1a+QtLXyQQEW04kris6nV59xLI5/I2fG16LTNNIlbB2H0s4sB1 ebehYcELoscW6qmzPtxo5IEQRq9163dlCTOOeKgmsSwGvRgK8NqRuGZs7EacDGK0dJzlbD XPfTa5iA0QS5ztWvkfwAUTmG10B9BUj97KmEI96MTVa0DcXqsQd6YXQv5Y6xrA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1653634360; a=rsa-sha256; cv=none; b=rTGK8COlxK9FsCllCihzdnYp5mCNtcFUMBhPyQg9LpfCk2IEjujU8v80LtmQXl+9LKDk/b 6Wz868mR84djUASewJAvZFOEdHdVoVJsoz7Gp/N5G9A1WXvBlvokBAPIMG4I3UwqLqKv6j szN04hV4p5Rg8gjhlAxfDnkLAwtC7DauSv89oXQ5twY+VXSIZneDEliC91ky+hmX30EVys O/ESZ0hRMCY5o21n6a7KbiJwU6x6pGZlBB1We9AmQEGCoIDL5/Q0XOj0t2X0Pupryg3Wk0 6DMhpea6O/heeoFublNZ+zVaZbnPWLFD6Sb0GzcEieGoOX0F6WEx8g2KyK1k4Q== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=DFACbLjw; 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.96 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=DFACbLjw; 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: D2A9321FA1 X-Spam-Score: 4.96 X-Migadu-Scanner: scn0.migadu.com X-TUID: OWCxN4cwkB1q Hi, Am Donnerstag, dem 26.05.2022 um 23:03 -0400 schrieb Anadon: > --- We don't do light novel title commit messages. Use a short summary, e.g. "gnu: textutils: Update to 3.2.1", followed by an empty line followed by a ChangeLog. >  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))) utfcpp installs its headers in a different location. Chances are you only need to patch warzone2100 to look them up. >      (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 Likewise. Cheers