From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.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 EEWhDmBIZmR3WgAASxT56A (envelope-from ) for ; Thu, 18 May 2023 17:46:40 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id OBlGDmBIZmTQjwAAauVa8A (envelope-from ) for ; Thu, 18 May 2023 17:46: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 EA0ACD8E7 for ; Thu, 18 May 2023 17:46:39 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pzfpp-0003gb-PO; Thu, 18 May 2023 11:46:34 -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 1pzfpL-0003H4-BQ for guix-patches@gnu.org; Thu, 18 May 2023 11:46: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 1pzfpK-0007Vb-O1 for guix-patches@gnu.org; Thu, 18 May 2023 11:46:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pzfpK-0006PP-FS for guix-patches@gnu.org; Thu, 18 May 2023 11:46:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63570] [PATCH 1/5] gnu: cli11: Update to 2.3.2. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 18 May 2023 15:46:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63570 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63570@debbugs.gnu.org Received: via spool by 63570-submit@debbugs.gnu.org id=B63570.168442471924527 (code B ref 63570); Thu, 18 May 2023 15:46:02 +0000 Received: (at 63570) by debbugs.gnu.org; 18 May 2023 15:45:19 +0000 Received: from localhost ([127.0.0.1]:54219 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pzfoc-0006NO-UT for submit@debbugs.gnu.org; Thu, 18 May 2023 11:45:19 -0400 Received: from mail-ej1-f66.google.com ([209.85.218.66]:60687) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pzfoW-0006MN-GD for 63570@debbugs.gnu.org; Thu, 18 May 2023 11:45:15 -0400 Received: by mail-ej1-f66.google.com with SMTP id a640c23a62f3a-96aa0cab88dso350106966b.1 for <63570@debbugs.gnu.org>; Thu, 18 May 2023 08:45:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684424706; x=1687016706; h=to:content-transfer-encoding:mime-version:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=rcQrB7qteIdp4613YSG3PLkzn4SvU74NxSv2qYpq9YY=; b=H5oERUcGR7DDS+yJyVmFXavxvGePOcSu6Aljr+i370KGJTHLcTn8VyaHkb34QQhK6h hMEWMoPigrBbY4kVcSo7ItzOp6xKswCe6eKiYXFdzq+PoXFsJCjTinwuOUd4gExyN2oK SBbD74VQAjtpFK20p8ewrODryTMxKA8KsP8Qp8oaHcRfYVQhqoenn/pA/FcaUfHHD6VL LX7xPA4UVxMYYU/KAaTxESKdQOEcR3DeyayXCT3P5kCZXu+NbmC5focViX1354EvjZ5p JbNj6zXMt7rrlLVWFVqY5qp8fxIq9mZc+DdBI7rbWSTWwHEPoj6C5jlmSmZn4ncpIcAh FBMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684424706; x=1687016706; h=to:content-transfer-encoding:mime-version:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=rcQrB7qteIdp4613YSG3PLkzn4SvU74NxSv2qYpq9YY=; b=lwlV+jz+MwB0oLs5JhJ9GcgwJO5BQIQ51r5QrWpaLcdMGI+kWrKbloAzkt7WRcDWSJ g+dw9kd5MTMDk5kkczg1SrqNHYBjDEfJMzESVExNWFZgAZGgTjWftGwEXSSilyVRTqom dFoQgNyD6S1Ttrw8H0MAZaQouiPYjy5A0GVjPnTGuU4ASTTLv9RQXpbBq5imdwiM0xfG 8kIv/O6dgmGRmcoABHwlkmmAAFEiX69TCOXZ09jcXuft60Vwx8Zpfqj6Q4uD2V1MjcEF E/j+5+uFXikolbRcnUch2FIQctMN2N7xDoPxapknTw4b6ySSsh5HAUQu6g5lLC/SH0+d NVtw== X-Gm-Message-State: AC+VfDwt1RGom+lZsbkeuZaokn4v/A3bhr0LY1zgp97yc8jN46LYIjS0 wP7OMjr83fmZd58TIp6YZBAi/NpxPbp4bg== X-Google-Smtp-Source: ACHHUZ7NbzrqfgzbG12E6ZSHRlwczGRZu8isFrqIQodspYL4Pq8jW/UIPUi1qkYihSSRmUX4hboHWA== X-Received: by 2002:a17:907:3f9e:b0:966:54ac:17d7 with SMTP id hr30-20020a1709073f9e00b0096654ac17d7mr39950168ejc.76.1684424706469; Thu, 18 May 2023 08:45:06 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id h23-20020a170906719700b009659c23e78fsm1097530ejk.215.2023.05.18.08.45.05 for <63570@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 May 2023 08:45:06 -0700 (PDT) Message-Id: In-Reply-To: References: From: Liliana Marie Prikler Date: Thu, 18 May 2023 16:55:18 +0200 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-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Seal: i=1; s=key1; d=yhetil.org; t=1684424800; a=rsa-sha256; cv=none; b=jP3NEJU4ikkigqYPTxv4Ed/nt3tPxXt3Bc38sSLWU51e6zQI1g+FMNwB9Om0QKPN7raNgy ko0ggDxfwzrGU89vSH4KE45u+aVJA7LbVXzZm3qDRbHvtX0MAdMG7kTsNyaEBhevNJTcgY mjg9aVp/VoAoPCoDphHO/5mpuIR5k2/zFMY5ejN0HXNkQhgTcsZYv3NfB4Ws0d5tsEAGnM QyteJer3uFfgB/UISoTttvkxT7w+2lNSECoc3c30d4rEnS+iojxS+8ZT+BZbyfWuPu78Mt flpj+6o3hg9ihdO/aHSj3Yw82iUY5do4FHLweLbdBjlCmOBCYqRI2lEPn94Tcw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=H5oERUcG; 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" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1684424800; 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=rcQrB7qteIdp4613YSG3PLkzn4SvU74NxSv2qYpq9YY=; b=KmGd3QREf8x4edKr13+j/BySOgPSyTvvqN/v1IlzTBn/TNJDg8JxKJvqDXo36gX84pjbp0 W8m6nSSN0WyZ93VOqp7wvlUG5uT6NgRzp1Dq6HnVta6nYDaOLy1FNtXJVztpSQfBthWubC jHRuTqZcLm9SrVqW4S8vizAdYuo8BrX/WMh4GgBnKHo4tU1pjLIsli1Q4WZZCVaz1E1Fzj MVaejMVNLdjt8PRriKPUrt6TnzjHuE+iKBCbtzoo4AXZMSvGoDdrfUx3FHcI56lSLB3rDq JgqnboB+F9zeCmTj+zzjSloEdyYeUCxRR0ZvMiMsDUkLlKLLYdrBdTeK+OMTsA== X-Migadu-Scanner: scn1.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=H5oERUcG; 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: 5.81 X-Spam-Score: 5.81 X-Migadu-Queue-Id: EA0ACD8E7 X-TUID: 6/FXUu8IPYLr * gnu/packages/cpp.scm (cli11): Update to 2.3.2. [source]: Remove snippet. [arguments]: Drop #:imported-modules, #:modules, and #:phases. [native-inputs]: Add “catch2”. --- gnu/packages/cpp.scm | 29 ++++------------------------- 1 file changed, 4 insertions(+), 25 deletions(-) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 237e232078..e3d68136cb 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -1580,7 +1580,7 @@ (define-public mcpp (define-public cli11 (package (name "cli11") - (version "1.9.1") + (version "2.3.2") (source (origin (method git-fetch) @@ -1589,35 +1589,14 @@ (define-public cli11 (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0hbch0vk8irgmiaxnfqlqys65v1770rxxdfn3d23m2vqyjh0j9l6")) - (modules '((guix build utils))) - (snippet - '(begin (delete-file-recursively "extern") - #t)))) + (base32 "1iif7kzp3yyjqg4yfar89rqmz44xkbi603gf9kjdqbgraw3f8zy7")))) (build-system cmake-build-system) (arguments `(#:configure-flags '("-DCLI11_SINGLE_FILE=OFF" - "-DCLI11_BUILD_EXAMPLES=OFF") - #:imported-modules ,%cmake-build-system-modules - #:modules ((guix build cmake-build-system) - (guix build utils)) - #:phases - (modify-phases %standard-phases - (add-before 'configure 'no-vendor-gtest - (lambda _ - (substitute* "tests/CMakeLists.txt" - ;; We provide our own googletest, so this is not really a - ;; problem. - (("message\\(FATAL_ERROR \"You have requested") - "message(TRACE \"You have requested")) - (substitute* "cmake/AddGoogletest.cmake" - (("^add_subdirectory\\(.*googletest.*$") "find_package(GTest REQUIRED)") - (("^set_target_properties\\(gtest gtest_main gmock gmock_main") "") - (("^ PROPERTIES FOLDER \"Extern\"\\)") "")) - #t))))) + "-DCLI11_BUILD_EXAMPLES=OFF"))) (native-inputs - (list doxygen googletest)) + (list catch2 doxygen googletest)) (synopsis "Command line parser for C++11") (description "CLI11 is a command line parser for C++11 and beyond that provides a rich -- 2.40.1