From patchwork Wed Jan 17 17:03:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Hogan X-Patchwork-Id: 59008 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 0822A27BBEA; Wed, 17 Jan 2024 17:05:35 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A358E27BBE9 for ; Wed, 17 Jan 2024 17:05:33 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rQ9Ls-0008UJ-2j; Wed, 17 Jan 2024 12:05:20 -0500 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 1rQ9LZ-0008Qx-8K for guix-patches@gnu.org; Wed, 17 Jan 2024 12:05:04 -0500 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 1rQ9LY-0006nL-Vy for guix-patches@gnu.org; Wed, 17 Jan 2024 12:05:00 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rQ9LZ-00018T-Rb for guix-patches@gnu.org; Wed, 17 Jan 2024 12:05:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68535] [PATCH] gnu: spdlog: Update to 1.13.0. Resent-From: Greg Hogan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 17 Jan 2024 17:05:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 68535 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68535@debbugs.gnu.org Cc: Greg Hogan X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.17055110554281 (code B ref -1); Wed, 17 Jan 2024 17:05:01 +0000 Received: (at submit) by debbugs.gnu.org; 17 Jan 2024 17:04:15 +0000 Received: from localhost ([127.0.0.1]:53175 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rQ9Ko-00016z-Cq for submit@debbugs.gnu.org; Wed, 17 Jan 2024 12:04:14 -0500 Received: from lists.gnu.org ([2001:470:142::17]:45878) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rQ9Km-00016j-Ry for submit@debbugs.gnu.org; Wed, 17 Jan 2024 12:04:13 -0500 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 1rQ9Kg-00083L-7g for guix-patches@gnu.org; Wed, 17 Jan 2024 12:04:06 -0500 Received: from mail-qt1-x82a.google.com ([2607:f8b0:4864:20::82a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rQ9Ke-0006iY-7T for guix-patches@gnu.org; Wed, 17 Jan 2024 12:04:05 -0500 Received: by mail-qt1-x82a.google.com with SMTP id d75a77b69052e-429c9c4c572so37669011cf.1 for ; Wed, 17 Jan 2024 09:04:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=greghogan-com.20230601.gappssmtp.com; s=20230601; t=1705511043; x=1706115843; darn=gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=j24n8yeKjscQvAMjOF9956gySKvA7T9o/T+CWdy/ah8=; b=sjqSXC+coqFAb/fUXSFa+GvSoa+5FZGV7N62aTAdyGpoz5KWfDTXiS6Or/rcfqrXcb 8jyMO77JYobYYfSiWv01Fr+fa+v4Z4yt05uiXIDih5VWf8jhXipLfvuPMNu3uXNcm4aS KhhLpH1e7keeB/WjSCiZ+nLHACYVt3WeUVRRp+6dMvZM0d3lnm3o7xn5ZwBTcTW6YdLh 3fBRu7VcM7z77ssfVHuJhahGpiJ7VmqrWR3Q2XPOH092ln3MSiSYvCFEZRkNcKTv5A6R WrqtWVun/Sr+jCowp8WQgp9q73e87ZtSRAPWgp9OeXOY79C20mmGUZySIDkk/nr+vL4e uyyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705511043; x=1706115843; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=j24n8yeKjscQvAMjOF9956gySKvA7T9o/T+CWdy/ah8=; b=oHqW2jAt6CUgKuWMI8I3uMHuUQq7UvAEnbcWG/keIGA/V/dqR/aJwYfViirrzfhr32 D12sRDPeM4e1f9wmJ7tVfeZO6OzeKRF+UyVT2BFApAUo/E/uWUmcr21HiaR8/cX7JCBo b2eNmoWY+NVdrqWJnFMl2tN9OM/lcrEVIOlrVVPOmwMLbBxqD0XRQ7HEnk2ycSvqBOVy kGWA+PSIpy7L0r9sJX42WTucBIVvr//iie0JwxOw0P+1giswHt8mhBjlOqJ8IwQL/Ppv juZJ03LhtvXNkX5j1nrimCJP+b7tSjatuSWhFRaFEg3X5ZOVnSKjSPYYHA+FMrqKBwwD YYYQ== X-Gm-Message-State: AOJu0YwTnUiyGiHZZ0g5BCyiGvmhEnRTJozma3VRM5Lvsvn2IVhn4Mj4 s8A8uCNQgdqFQ9C8a7X62KNRppx/L5qZxIPS3VI66UzjfQo= X-Google-Smtp-Source: AGHT+IFXJjJuhCRWw86cSPl9drmnnE96yNBre9hBohO51DDvWYzu01v2YbeN9NDCdx71azAunrWOhw== X-Received: by 2002:a05:622a:11c9:b0:429:cbbb:384c with SMTP id n9-20020a05622a11c900b00429cbbb384cmr10823091qtk.31.1705511042923; Wed, 17 Jan 2024 09:04:02 -0800 (PST) Received: from ip-172-31-16-52.us-east-2.compute.internal (ec2-3-141-183-131.us-east-2.compute.amazonaws.com. [3.141.183.131]) by smtp.gmail.com with ESMTPSA id r16-20020ac87ef0000000b004280cad48basm5902068qtc.77.2024.01.17.09.04.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Jan 2024 09:04:02 -0800 (PST) From: Greg Hogan Date: Wed, 17 Jan 2024 17:03:58 +0000 Message-Id: <20240117170358.18836-1-code@greghogan.com> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Received-SPF: none client-ip=2607:f8b0:4864:20::82a; envelope-from=code@greghogan.com; helo=mail-qt1-x82a.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/logging.scm (spdlog): Update to 1.13.0. [source]: Remove upstreamed patch. * gnu/local.mk: Unregister it. * gnu/packages/patches/spdlog-fix-tests.patch: Delete file. Change-Id: I78b5021b9841d16f43a283eaee931b4f92746ab8 --- gnu/local.mk | 1 - gnu/packages/logging.scm | 5 ++-- gnu/packages/patches/spdlog-fix-tests.patch | 26 --------------------- 3 files changed, 2 insertions(+), 30 deletions(-) delete mode 100644 gnu/packages/patches/spdlog-fix-tests.patch base-commit: 81e7d293941928f6ef1e945eb9644f3b97142c41 diff --git a/gnu/local.mk b/gnu/local.mk index 2b0f6eaa60..c27aa5ef38 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2040,7 +2040,6 @@ dist_patch_DATA = \ %D%/packages/patches/source-highlight-gcc-compat.patch \ %D%/packages/patches/softhsm-fix-openssl3-tests.patch \ %D%/packages/patches/spectre-meltdown-checker-externalize-fwdb.patch \ - %D%/packages/patches/spdlog-fix-tests.patch \ %D%/packages/patches/sphinxbase-fix-doxygen.patch \ %D%/packages/patches/sssd-system-directories.patch \ %D%/packages/patches/steghide-fixes.patch \ diff --git a/gnu/packages/logging.scm b/gnu/packages/logging.scm index 0efd828f8a..47e8cd39c2 100644 --- a/gnu/packages/logging.scm +++ b/gnu/packages/logging.scm @@ -213,7 +213,7 @@ (define-public multitail (define-public spdlog (package (name "spdlog") - (version "1.12.0") + (version "1.13.0") (source (origin (method git-fetch) @@ -221,9 +221,8 @@ (define-public spdlog (url "https://github.com/gabime/spdlog") (commit (string-append "v" version)))) (file-name (git-file-name name version)) - (patches (search-patches "spdlog-fix-tests.patch")) (sha256 - (base32 "0yyncv6wjs5rqm76rkqyxpfbsingk1dq5zfcqhy1a7fpw8xdl53k")))) + (base32 "0zgdmdgnp2y36jrlk85d4fiyjkjd6anly8pambyc3f3v6sg02zyy")))) (build-system cmake-build-system) ;; TODO run benchmark. Currently not possible, as adding ;; (gnu packages benchmark) forms a dependency cycle diff --git a/gnu/packages/patches/spdlog-fix-tests.patch b/gnu/packages/patches/spdlog-fix-tests.patch deleted file mode 100644 index 13dffb309e..0000000000 --- a/gnu/packages/patches/spdlog-fix-tests.patch +++ /dev/null @@ -1,26 +0,0 @@ -Remove after next release and package update: -https://github.com/gabime/spdlog/commit/2ee8bac78e6525a8ad9a9196e65d502ce390d83a - -From 2ee8bac78e6525a8ad9a9196e65d502ce390d83a Mon Sep 17 00:00:00 2001 -From: xvitaly -Date: Sun, 23 Jul 2023 10:15:25 +0200 -Subject: [PATCH] Added missing square bracket to fix the level_to_string_view - test. (#2827) - ---- - tests/test_misc.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/test_misc.cpp b/tests/test_misc.cpp -index 9f3cb1744..6199641ff 100644 ---- a/tests/test_misc.cpp -+++ b/tests/test_misc.cpp -@@ -43,7 +43,7 @@ TEST_CASE("log_levels", "[log_levels]") - REQUIRE(log_info("Hello", spdlog::level::trace) == "Hello"); - } - --TEST_CASE("level_to_string_view", "[convert_to_string_view") -+TEST_CASE("level_to_string_view", "[convert_to_string_view]") - { - REQUIRE(spdlog::level::to_string_view(spdlog::level::trace) == "trace"); - REQUIRE(spdlog::level::to_string_view(spdlog::level::debug) == "debug");