From patchwork Sun Jan 28 23:01:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: David Elsing X-Patchwork-Id: 59544 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 3032527BBEA; Sun, 28 Jan 2024 23:03:03 +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 8740B27BBE2 for ; Sun, 28 Jan 2024 23:02:59 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rUEAy-000627-Ak; Sun, 28 Jan 2024 18:02:56 -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 1rUEAw-00061r-GD for guix-patches@gnu.org; Sun, 28 Jan 2024 18:02:54 -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 1rUEAw-0005pl-85 for guix-patches@gnu.org; Sun, 28 Jan 2024 18:02:54 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rUEB4-0004XS-3V for guix-patches@gnu.org; Sun, 28 Jan 2024 18:03:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68790] [PATCH 1/9] gnu: tinydir: Update to 1.2.6. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 28 Jan 2024 23:03:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68790 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68790@debbugs.gnu.org Cc: David Elsing Received: via spool by 68790-submit@debbugs.gnu.org id=B68790.170648296217340 (code B ref 68790); Sun, 28 Jan 2024 23:03:02 +0000 Received: (at 68790) by debbugs.gnu.org; 28 Jan 2024 23:02:42 +0000 Received: from localhost ([127.0.0.1]:58597 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rUEAk-0004Va-9v for submit@debbugs.gnu.org; Sun, 28 Jan 2024 18:02:42 -0500 Received: from mout01.posteo.de ([185.67.36.65]:40965) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rUEAi-0004VL-OZ for 68790@debbugs.gnu.org; Sun, 28 Jan 2024 18:02:41 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id B8F28240028 for <68790@debbugs.gnu.org>; Mon, 29 Jan 2024 00:02:26 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1706482946; bh=RKi7+9nDzwkquDbx5wY0fY8mNMim/yTpnkg6WXgB888=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:Content-Type: Content-Transfer-Encoding:From; b=UrCcTpDolH3t764Y1dgy8D6BjMM+BWdSUmGP5o/dfE4nEryh/viP4PSG1td6U7Iux aaTxZZfcB+Oci78M1AGcItXmJp4COJkh+Bjti9s8Uu4iKyn0sjZ4Qcoe9SKWFZgoWx Cigv8D51jy99aTD6TpWBtt6acwMPQh7qQpnlrV8ytOPvepaXLLeCQ8aHUu9Fe3ZSG0 ccJdVE5ZPhDmerF9KTmXcN2pgg2VwyXeEbbC/zeZH31O/QgJzMXxrStCVJkn0cGBiE az8MJOuslyHdjhjv3jJY2QdVhxik7Dm4G8t2/ldnFBVBlr07zdockK3i2jCqNZ3zxW 5ayMd6E0TtM5A== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4TNRlk1fbTz6tx2; Mon, 29 Jan 2024 00:02:26 +0100 (CET) From: David Elsing Date: Sun, 28 Jan 2024 23:01:54 +0000 Message-ID: <20240128230215.1389-1-david.elsing@posteo.net> In-Reply-To: <20240128225919.795-2-david.elsing@posteo.net> References: <20240128225919.795-2-david.elsing@posteo.net> MIME-Version: 1.0 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/c.scm (tinydir): Update to 1.2.6. * gnu/packages/patches/tinydir-fix-cbehave-test.patch: Adjust patch. --- gnu/packages/c.scm | 6 +++--- .../patches/tinydir-fix-cbehave-test.patch | 16 ++++++++++++++-- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm index 1346605c71..b558145ea0 100644 --- a/gnu/packages/c.scm +++ b/gnu/packages/c.scm @@ -20,7 +20,7 @@ ;;; Copyright © 2022 Antero Mejr ;;; Copyright © 2023 zamfofex ;;; Copyright © 2023 Foundation Devices, Inc. -;;; Copyright © 2023 David Elsing +;;; Copyright © 2023, 2024 David Elsing ;;; ;;; This file is part of GNU Guix. ;;; @@ -1349,7 +1349,7 @@ (define target-machine #$(and=> (%current-target-system) (define-public tinydir (package (name "tinydir") - (version "1.2.5") + (version "1.2.6") (source (origin (method git-fetch) (uri (git-reference @@ -1358,7 +1358,7 @@ (define-public tinydir (file-name (git-file-name name version)) (sha256 (base32 - "1nprgdfx4i8wzc1idw6chan4fjfa75b5ll8kghdc0q2278pny259")) + "143n6yabznxk032gv5g2k8glf0kzicarg9cx0714zsbfmzj8lr07")) (patches (search-patches "tinydir-fix-cbehave-test.patch")) (modules '((guix build utils))) (snippet '(delete-file-recursively "tests/cbehave")))) diff --git a/gnu/packages/patches/tinydir-fix-cbehave-test.patch b/gnu/packages/patches/tinydir-fix-cbehave-test.patch index 84ecee12c2..1cad42c7a0 100644 --- a/gnu/packages/patches/tinydir-fix-cbehave-test.patch +++ b/gnu/packages/patches/tinydir-fix-cbehave-test.patch @@ -2,10 +2,22 @@ Make test work with upstream cbehave (tinydir bundles a modified version) diff --git a/tests/file_open_test.c b/tests/file_open_test.c -index 3e659bc..9f6f88d 100644 +index 09b856e..92b13ca 100644 --- a/tests/file_open_test.c +++ b/tests/file_open_test.c -@@ -19,4 +19,7 @@ FEATURE(file_open, "File open") +@@ -4,6 +4,11 @@ + #include "cbehave.h" + #include "util.h" + ++#define ASSERT(cond, ret) \ ++if (!(cond)) {\ ++ cbehave_feature_return(__FILE__, __LINE__, ret, _state); \ ++ goto _feature_over; \ ++}\ + + FEATURE(file_open, "File open") + SCENARIO("Open file in current directory") +@@ -34,4 +39,7 @@ FEATURE(file_open, "File open") SCENARIO_END FEATURE_END