From unknown Mon Aug 18 11:26:41 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#63112] [PATCH] gnu: libexpected: Update to 1.1.0. Resent-From: Josselin Poiret Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 27 Apr 2023 13:09:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 63112 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63112@debbugs.gnu.org Cc: Josselin Poiret X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.168260092332714 (code B ref -1); Thu, 27 Apr 2023 13:09:01 +0000 Received: (at submit) by debbugs.gnu.org; 27 Apr 2023 13:08:43 +0000 Received: from localhost ([127.0.0.1]:57744 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ps1MZ-0008VZ-33 for submit@debbugs.gnu.org; Thu, 27 Apr 2023 09:08:43 -0400 Received: from lists.gnu.org ([209.51.188.17]:49138) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ps1MU-0008VP-7b for submit@debbugs.gnu.org; Thu, 27 Apr 2023 09:08:40 -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 1ps1MT-0003aH-Jf for guix-patches@gnu.org; Thu, 27 Apr 2023 09:08:37 -0400 Received: from jpoiret.xyz ([206.189.101.64]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ps1MR-0008Gf-HT for guix-patches@gnu.org; Thu, 27 Apr 2023 09:08:37 -0400 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id AF715184F2D; Thu, 27 Apr 2023 13:08:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1682600905; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=vs4Hu84vFT2vba201pHav+F8IX3sPkFOd68xXgEWv7Q=; b=gw44u69cTfiAzMPzKeR7TeC2BXYaY/W+OnXNJINJvfb/BFuAdoe5kRcMZyJTd3h1WcMQzT ThMbb1o+7tgdInnAT+/M395jKu0eADVnam6egz4JqupCrunrWOWRB4eyRdM8/CPXqIxtCn kIh5RFooscGadRwTLi3+XRunTUwj29aNMCmlRXOZHrZ0aP2tsmZv2HSBK7M1Pleh5j0Wb0 WntBLzsah+OKa7PLx4vlyCzraEoxjUWg/sBfK2ENM93tEzs3EFSAAT4ZW5oebCy2+gTCmg c4zpPyEuaYy5f2vwkLnmn10iho59YhYkETlFLv1Zf9rmmCuqy1a+0UUEgxITeA== From: Josselin Poiret Date: Thu, 27 Apr 2023 15:08:25 +0200 Message-Id: <945f28c9a106e483b9650278a647e4f3332fa5be.1682600895.git.dev@jpoiret.xyz> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Spamd-Bar: +++ Authentication-Results: jpoiret.xyz; auth=pass smtp.auth=jpoiret@jpoiret.xyz smtp.mailfrom=dev@jpoiret.xyz X-Spam-Level: *** Received-SPF: pass client-ip=206.189.101.64; envelope-from=dev@jpoiret.xyz; helo=jpoiret.xyz X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.6 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) From: Josselin Poiret * gnu/packages/patches/libexpected-use-provided-catch2.patch: Add new patch. * gnu/packages/patches/libexpected-nofetch.patch: Remove unused patch. * gnu/local.mk (dist_patch_DATA): Register changes. * gnu/packages/cpp.scm (libexpected): Update to 1.1.0, and use new patch. --- gnu/local.mk | 2 +- gnu/packages/cpp.scm | 14 ++---- .../patches/libexpected-nofetch.patch | 27 ------------ .../libexpected-use-provided-catch2.patch | 43 +++++++++++++++++++ 4 files changed, 47 insertions(+), 39 deletions(-) delete mode 100644 gnu/packages/patches/libexpected-nofetch.patch create mode 100644 gnu/packages/patches/libexpected-use-provided-catch2.pa= tch diff --git a/gnu/local.mk b/gnu/local.mk index c0a5c721fc..f85eda991a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1442,7 +1442,7 @@ dist_patch_DATA =3D \ %D%/packages/patches/libcanberra-wayland-crash.patch \ %D%/packages/patches/libcroco-CVE-2020-12825.patch \ %D%/packages/patches/libcyaml-libyaml-compat.patch \ - %D%/packages/patches/libexpected-nofetch.patch \ + %D%/packages/patches/libexpected-use-provided-catch2.patch \ %D%/packages/patches/libgda-cve-2021-39359.patch \ %D%/packages/patches/libgda-fix-build.patch \ %D%/packages/patches/libgda-fix-missing-initialization.patch \ diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index bb1f216e2a..023d1c0337 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -1363,7 +1363,7 @@ (define-public aws-sdk-cpp (define-public libexpected (package (name "libexpected") - (version "1.0.0") + (version "1.1.0") (source (origin (method git-fetch) @@ -1374,18 +1374,10 @@ (define-public libexpected ;; repository. Should not affect reproducibility. (recursive? #t))) (file-name (git-file-name name version)) - ;; NOTE: This patch will be unnecessary on subsequent tags. - (patches (search-patches "libexpected-nofetch.patch")) (sha256 - (base32 "1ckzfrljzzdw9wf8hvdfjz4wjx5na57iwxc48mbv9rf5067m21a5")))) + (base32 "17akrv80h0n4cfmxwvlvbb8ycqza7y3qqygjyphv95rrabqm9r02")) + (patches (search-patches "libexpected-use-provided-catch2.patch")))) (build-system cmake-build-system) - ;; TODO: Clean up install phase. - (arguments - `(#:phases - (modify-phases %standard-phases - (replace 'check - (lambda _ - (invoke "./tests")))))) (native-inputs (list catch2)) (synopsis "C++11/14/17 std::expected with functional-style extensions") diff --git a/gnu/packages/patches/libexpected-nofetch.patch b/gnu/packages/= patches/libexpected-nofetch.patch deleted file mode 100644 index e1d104f6f4..0000000000 --- a/gnu/packages/patches/libexpected-nofetch.patch +++ /dev/null @@ -1,27 +0,0 @@ -Description: Disable FetchContent module - No online operations are permitted during build package. -Author: Nicholas Guriev -Last-Update: Wed, 22 Jan 2020 21:51:33 +0300 - -Modified by Brett Gilio on Dec 5, 2020 - ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -4,16 +4,7 @@ project(tl-expected VERSION 1.0.0 LANGUAGES CXX) -=20 - option(EXPECTED_ENABLE_TESTS "Enable tests." ON) -=20 --include(FetchContent) --FetchContent_Declare(=0D -- tl_cmake=0D -- GIT_REPOSITORY https://github.com/TartanLlama/tl-cmake.git=0D --) --FetchContent_GetProperties(tl_cmake)=0D --if(NOT tl_cmake_POPULATED)=0D -- FetchContent_Populate(tl_cmake)=0D -- set(CMAKE_MODULE_PATH ${tl_cmake_SOURCE_DIR} ${CMAKE_MODULE_PATH})=0D --endif() -+set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/tl-cmake ${CMAKE_= MODULE_PATH}) - include(add-tl) -=20 - tl_add_library(expected SOURCES=20 diff --git a/gnu/packages/patches/libexpected-use-provided-catch2.patch b/g= nu/packages/patches/libexpected-use-provided-catch2.patch new file mode 100644 index 0000000000..49d06e2d8f --- /dev/null +++ b/gnu/packages/patches/libexpected-use-provided-catch2.patch @@ -0,0 +1,43 @@ +From 8f03ca270d1aa5dcafa945c941cf52ff14cb47da Mon Sep 17 00:00:00 2001 +Message-Id: <8f03ca270d1aa5dcafa945c941cf52ff14cb47da.1682600200.git.dev@j= poiret.xyz> +From: Josselin Poiret +Date: Thu, 27 Apr 2023 14:51:51 +0200 +Subject: [PATCH] Use provided catch2 + +From: Josselin Poiret + +--- + CMakeLists.txt | 10 +--------- + 1 file changed, 1 insertion(+), 9 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ddab64e..2d5eac8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -8,7 +8,6 @@ project(tl-expected + include(CMakePackageConfigHelpers) + include(CMakeDependentOption) + include(GNUInstallDirs) +-include(FetchContent) + include(CTest) +=20 + if (NOT DEFINED CMAKE_CXX_STANDARD) +@@ -63,14 +62,7 @@ install(FILES + install(DIRECTORY "include/" TYPE INCLUDE) +=20 + if(EXPECTED_BUILD_TESTS) +- set(CMAKE_POLICY_DEFAULT_CMP0077 NEW) +- set(CATCH_INSTALL_HELPERS OFF) +- set(CATCH_BUILD_TESTING OFF) +- set(CATCH_INSTALL_DOCS OFF) +- FetchContent_Declare(Catch2 URL +- https://github.com/catchorg/Catch2/archive/v2.13.10.zip)=20 +- FetchContent_MakeAvailable(Catch2) +- ++ find_package(Catch2 CONFIG) + file(GLOB test-sources CONFIGURE_DEPENDS tests/*.cpp) + list(FILTER test-sources EXCLUDE REGEX "tests/test.cpp") + add_executable(${PROJECT_NAME}-tests "${test-sources}") +--=20 +2.39.2 + base-commit: fa685c87eaa9888a4278f39bb2b815673589dced --=20 2.39.2 From unknown Mon Aug 18 11:26:41 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#63112] (no subject) References: <945f28c9a106e483b9650278a647e4f3332fa5be.1682600895.git.dev@jpoiret.xyz> In-Reply-To: <945f28c9a106e483b9650278a647e4f3332fa5be.1682600895.git.dev@jpoiret.xyz> Resent-From: Steven Roose Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 28 Apr 2023 02:41:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63112 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63112@debbugs.gnu.org Received: via spool by 63112-submit@debbugs.gnu.org id=B63112.16826496192389 (code B ref 63112); Fri, 28 Apr 2023 02:41:01 +0000 Received: (at 63112) by debbugs.gnu.org; 28 Apr 2023 02:40:19 +0000 Received: from localhost ([127.0.0.1]:60163 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1psE1z-0000cT-Kl for submit@debbugs.gnu.org; Thu, 27 Apr 2023 22:40:19 -0400 Received: from hosted.mailcow.de ([5.1.76.202]:43859) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1psE1t-0000c7-Tc for 63112@debbugs.gnu.org; Thu, 27 Apr 2023 22:40:18 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=roose.io; s=default; t=1682649607; h=from:date:message-id:to:mime-version:content-type: content-transfer-encoding; bh=KiXVGxtNQ/OjwEKadDWkpDzp1OWgusvfqCP/xl0QkQE=; b=NTaSADMHf1z1poU+7qbybAy5cgi7Hb049GNnNkm4x7suPEnhs8qREXSvH02xVQGOxZtT2u 7P+gFGp0foCLgizuOHMO+Zl6BK5KkBzp9xaBK6aO1RBR58RTXfupt04/WChyxypTdcgJFu VHZ77Qrr2HP1KBl5MtaoCxDLL5+Z8WJdHo+l5azYI/Du0ddOzlpw0ZkJu8NvQwvzXhMYie X1rzeru0h49bZ5W3sow5z3sVnmt6scd2RAoIYUPTZpJMUYanYd2GouLrny2Ck6D+1ebptN LQobCmSRl93u8FGgXGIE0odHG2Al1dJXKCu9bH6ARm4uecS22Dmv4cUsfvxOrg== Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 3B1875C135B for <63112@debbugs.gnu.org>; Fri, 28 Apr 2023 04:40:05 +0200 (CEST) Message-ID: Date: Fri, 28 Apr 2023 03:40:03 +0100 MIME-Version: 1.0 Content-Language: en-US From: Steven Roose Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: 1.3 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Would this solve the recent error that showed up?: builder for `/gnu/store/mhraxa29ppvh1r4v9vcc9nvgzwbh6l3n-libexpected-1.0.0.drv' failed with exit code 1 build of /gnu/store/mhraxa29ppvh1r4v9vcc9nvgzwbh6l3n-libexpected-1.0.0.drv failed View build log [...] Content analysis details: (1.3 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, low trust [5.1.76.202 listed in list.dnswl.org] 1.8 MISSING_SUBJECT Missing Subject: header 0.2 NO_SUBJECT Extra score for no subject X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.3 (/) Would this solve the recent error that showed up?: builder for `/gnu/store/mhraxa29ppvh1r4v9vcc9nvgzwbh6l3n-libexpected-1.0.0.drv' failed with exit code 1 build of /gnu/store/mhraxa29ppvh1r4v9vcc9nvgzwbh6l3n-libexpected-1.0.0.drv failed View build log at '/var/log/guix/drvs/mh/raxa29ppvh1r4v9vcc9nvgzwbh6l3n-libexpected-1.0.0.drv.gz'. From unknown Mon Aug 18 11:26:41 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#63112] (no subject) Resent-From: Josselin Poiret Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 28 Apr 2023 13:28:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63112 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Steven Roose , 63112@debbugs.gnu.org Received: via spool by 63112-submit@debbugs.gnu.org id=B63112.1682688441996 (code B ref 63112); Fri, 28 Apr 2023 13:28:02 +0000 Received: (at 63112) by debbugs.gnu.org; 28 Apr 2023 13:27:21 +0000 Received: from localhost ([127.0.0.1]:60777 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1psO89-0000G0-7h for submit@debbugs.gnu.org; Fri, 28 Apr 2023 09:27:21 -0400 Received: from jpoiret.xyz ([206.189.101.64]:37060) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1psO87-0000Fp-2A for 63112@debbugs.gnu.org; Fri, 28 Apr 2023 09:27:20 -0400 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id 9CB0C184F1E; Fri, 28 Apr 2023 13:27:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1682688436; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=RSjFeKR9j4VdBj7F9pGDcbxAOO3ylEI63dj8i/u+pao=; b=NkdTGh97l06OOGvUMaFy2w+L0NSmef1yFuPNcS6HVtgKURDIi3IWQ9eZfv0bxTaHuhpsig tGv5dHRq2RaHgX2+zXJxTPPBccg7DQO5jjs1bEmsInJ6lDuOUk7IcpcuVJiJqjNiyIn9j7 Da67xgt6fk8O8exqujwFUao+T9wzhie1zPDqrLGWlsyncrhdhsD700ey7NFPSNd2BQUi1N 6Nf/f05Ezv35ePJ2JpY7AvTvtMbeXAGtt/ISJrsmg9We8SGWC3V09tQI+8rEnHXSV6bdjT zADYtQJEMLB6awIwERHLeGXk4Gf28AL4Ug32gXgfLPRY6700b80g94SRSJ26fw== From: Josselin Poiret In-Reply-To: References: <945f28c9a106e483b9650278a647e4f3332fa5be.1682600895.git.dev@jpoiret.xyz> Date: Fri, 28 Apr 2023 15:27:12 +0200 Message-ID: <87ttx0gmrz.fsf@jpoiret.xyz> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-Spamd-Bar: / Authentication-Results: jpoiret.xyz; auth=pass smtp.auth=jpoiret@jpoiret.xyz smtp.mailfrom=dev@jpoiret.xyz X-Spam-Score: 2.0 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Hi Steven, Steven Roose writes: > Would this solve the recent error that showed up?: > > builder for > `/gnu/store/mhraxa29ppvh1r4v9vcc9nvgzwbh6l3n-libexpected-1.0.0.drv' > failed with exit code 1 build of > /gnu/store/mhraxa29ppvh1 [...] Content analysis details: (2.0 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 2.0 SLIGHTLY_BAD_SUBJECT Subject contains something slightly spammy 0.0 T_PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: jpoiret.xyz (xyz)] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FROM_SUSPICIOUS_NTLD From abused NTLD X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 2.0 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Hi Steven, Steven Roose writes: > Would this solve the recent error that showed up?: > > builder for > `/gnu/store/mhraxa29ppvh1r4v9vcc9nvgzwbh6l3n-libexpected-1.0.0.drv' > failed with exit code 1 build of > /gnu/store/mhraxa29ppvh1 [...] Content analysis details: (2.0 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 2.0 SLIGHTLY_BAD_SUBJECT Subject contains something slightly spammy 0.0 T_PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: jpoiret.xyz (xyz)] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FROM_SUSPICIOUS_NTLD From abused NTLD 1.0 BULK_RE_SUSP_NTLD Precedence bulk and RE: from a suspicious TLD -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Hi Steven, Steven Roose writes: > Would this solve the recent error that showed up?: > > builder for=20 > `/gnu/store/mhraxa29ppvh1r4v9vcc9nvgzwbh6l3n-libexpected-1.0.0.drv'=20 > failed with exit code 1 build of=20 > /gnu/store/mhraxa29ppvh1r4v9vcc9nvgzwbh6l3n-libexpected-1.0.0.drv failed= =20 > View build log at=20 > '/var/log/guix/drvs/mh/raxa29ppvh1r4v9vcc9nvgzwbh6l3n-libexpected-1.0.0.d= rv.gz'. Yes, this was the idea. Best, =2D-=20 Josselin Poiret --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQHEBAEBCAAuFiEEOSSM2EHGPMM23K8vUF5AuRYXGooFAmRLybAQHGRldkBqcG9p cmV0Lnh5egAKCRBQXkC5FhcaihusC/0cHvsGZGhaW333JPfQpOL2BxnDh3CtecRI 0ruhuxFka4bJCGHTjYWUja6NBQDc7NrEck+6NSGnjQNwBmMnA4OqDCRvnjL0Uqws 4HASQmyF59D0qaK4QXyWtsPAKLYEWn+pqTtvfXq/HI9eIXHkA42rv9gSOBPkjAfW zhbHaF3zLKTjWMFdaKDcbVl5XuOmZuZIl3vmXGgeAUZLruwn1l0SbwJyCIKEJP9c neMCfSJdj+AvITQAzgTXi01xpH9qK9hJNkbQc8NiNlVtNQk1o+PekmHQPAe2BGjB tDsebVJiLXSpjyQNoIqaB5A6bbKmDaDWiRDtlGTbfdZboX2tR4ViEZSxuHAKxKZK ZouimnRtwlbn0pZc6OnA2ks/0bBbLawGc5i3Bw71MVfMJuveehjM0VrxxO7Wj770 ovkqOrCaU++5Raet5bxiMH7UMkHP6Zt4RWZtIdsB2VWJ6bIG4eCojER/uPBt5XpG D+4GpRFeJrL9mLsRElETspuDKbce+Bg= =bY1F -----END PGP SIGNATURE----- --=-=-=-- From unknown Mon Aug 18 11:26:41 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Josselin Poiret Subject: bug#63112: closed (Re: bug#63112: [PATCH] gnu: libexpected: Update to 1.1.0.) Message-ID: References: <87bkj7stst.fsf@gnu.org> <945f28c9a106e483b9650278a647e4f3332fa5be.1682600895.git.dev@jpoiret.xyz> X-Gnu-PR-Message: they-closed 63112 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 63112@debbugs.gnu.org Date: Fri, 28 Apr 2023 19:15:01 +0000 Content-Type: multipart/mixed; boundary="----------=_1682709301-22598-1" This is a multi-part message in MIME format... ------------=_1682709301-22598-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #63112: [PATCH] gnu: libexpected: Update to 1.1.0. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 63112@debbugs.gnu.org. --=20 63112: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D63112 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1682709301-22598-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 63112-done) by debbugs.gnu.org; 28 Apr 2023 19:14:57 +0000 Received: from localhost ([127.0.0.1]:34520 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1psTYX-0005s3-1c for submit@debbugs.gnu.org; Fri, 28 Apr 2023 15:14:57 -0400 Received: from eggs.gnu.org ([209.51.188.92]:42688) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1psTYQ-0005rm-L7 for 63112-done@debbugs.gnu.org; Fri, 28 Apr 2023 15:14:54 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1psTYK-0003Fn-Uy; Fri, 28 Apr 2023 15:14:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=Beu5IhWQ2b/Cbygv+UA/9Lkhi5OAGbt6+EL2nN0+qkI=; b=KSMFW2aVPlcNDpdIFvEN lkKa9iO6JlfJtuOyHQF5cc7qPrU0oj11GAIBTvPrZzi3cTMtAdDlaJ8WSWuAZ6Jb5Rbi6dZ85XOv2 R78ojQBh3vvWeFCNcLveuig8Y2SmlWILsa6fm9ajQ9yoa9vEo/BH6VpL8pp8dIqmdIcJdLQ48C2jb lBiXqjSNGBVF9DE+t8hkbiOiWbDBEgUWWXeUB9jxVJM9fZQeBk4djWI6gCiOE8Njp9H4qqbE6ilQK ILjcCVvyzFXsGTH5lfMiNXqykz5ATGyKwqszJyHDXhxrd3iD/f7oBP2LQ9CWxvqtixFdh3ts+s0yz e9EkuSy6Xg57MQ==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201] helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1psTYJ-0002Ku-Pi; Fri, 28 Apr 2023 15:14:44 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Josselin Poiret Subject: Re: bug#63112: [PATCH] gnu: libexpected: Update to 1.1.0. References: <945f28c9a106e483b9650278a647e4f3332fa5be.1682600895.git.dev@jpoiret.xyz> Date: Fri, 28 Apr 2023 21:14:42 +0200 In-Reply-To: <945f28c9a106e483b9650278a647e4f3332fa5be.1682600895.git.dev@jpoiret.xyz> (Josselin Poiret's message of "Thu, 27 Apr 2023 15:08:25 +0200") Message-ID: <87bkj7stst.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 63112-done Cc: 63112-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Josselin Poiret skribis: > From: Josselin Poiret > > * gnu/packages/patches/libexpected-use-provided-catch2.patch: Add new patch. > * gnu/packages/patches/libexpected-nofetch.patch: Remove unused patch. > * gnu/local.mk (dist_patch_DATA): Register changes. > * gnu/packages/cpp.scm (libexpected): Update to 1.1.0, and use new patch. Applied! ------------=_1682709301-22598-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 27 Apr 2023 13:08:43 +0000 Received: from localhost ([127.0.0.1]:57744 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ps1MZ-0008VZ-33 for submit@debbugs.gnu.org; Thu, 27 Apr 2023 09:08:43 -0400 Received: from lists.gnu.org ([209.51.188.17]:49138) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ps1MU-0008VP-7b for submit@debbugs.gnu.org; Thu, 27 Apr 2023 09:08:40 -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 1ps1MT-0003aH-Jf for guix-patches@gnu.org; Thu, 27 Apr 2023 09:08:37 -0400 Received: from jpoiret.xyz ([206.189.101.64]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ps1MR-0008Gf-HT for guix-patches@gnu.org; Thu, 27 Apr 2023 09:08:37 -0400 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id AF715184F2D; Thu, 27 Apr 2023 13:08:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1682600905; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=vs4Hu84vFT2vba201pHav+F8IX3sPkFOd68xXgEWv7Q=; b=gw44u69cTfiAzMPzKeR7TeC2BXYaY/W+OnXNJINJvfb/BFuAdoe5kRcMZyJTd3h1WcMQzT ThMbb1o+7tgdInnAT+/M395jKu0eADVnam6egz4JqupCrunrWOWRB4eyRdM8/CPXqIxtCn kIh5RFooscGadRwTLi3+XRunTUwj29aNMCmlRXOZHrZ0aP2tsmZv2HSBK7M1Pleh5j0Wb0 WntBLzsah+OKa7PLx4vlyCzraEoxjUWg/sBfK2ENM93tEzs3EFSAAT4ZW5oebCy2+gTCmg c4zpPyEuaYy5f2vwkLnmn10iho59YhYkETlFLv1Zf9rmmCuqy1a+0UUEgxITeA== From: Josselin Poiret To: guix-patches@gnu.org Subject: [PATCH] gnu: libexpected: Update to 1.1.0. Date: Thu, 27 Apr 2023 15:08:25 +0200 Message-Id: <945f28c9a106e483b9650278a647e4f3332fa5be.1682600895.git.dev@jpoiret.xyz> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Spamd-Bar: +++ Authentication-Results: jpoiret.xyz; auth=pass smtp.auth=jpoiret@jpoiret.xyz smtp.mailfrom=dev@jpoiret.xyz X-Spam-Level: *** Received-SPF: pass client-ip=206.189.101.64; envelope-from=dev@jpoiret.xyz; helo=jpoiret.xyz X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.6 (/) X-Debbugs-Envelope-To: submit Cc: Josselin Poiret X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) From: Josselin Poiret * gnu/packages/patches/libexpected-use-provided-catch2.patch: Add new patch. * gnu/packages/patches/libexpected-nofetch.patch: Remove unused patch. * gnu/local.mk (dist_patch_DATA): Register changes. * gnu/packages/cpp.scm (libexpected): Update to 1.1.0, and use new patch. --- gnu/local.mk | 2 +- gnu/packages/cpp.scm | 14 ++---- .../patches/libexpected-nofetch.patch | 27 ------------ .../libexpected-use-provided-catch2.patch | 43 +++++++++++++++++++ 4 files changed, 47 insertions(+), 39 deletions(-) delete mode 100644 gnu/packages/patches/libexpected-nofetch.patch create mode 100644 gnu/packages/patches/libexpected-use-provided-catch2.pa= tch diff --git a/gnu/local.mk b/gnu/local.mk index c0a5c721fc..f85eda991a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1442,7 +1442,7 @@ dist_patch_DATA =3D \ %D%/packages/patches/libcanberra-wayland-crash.patch \ %D%/packages/patches/libcroco-CVE-2020-12825.patch \ %D%/packages/patches/libcyaml-libyaml-compat.patch \ - %D%/packages/patches/libexpected-nofetch.patch \ + %D%/packages/patches/libexpected-use-provided-catch2.patch \ %D%/packages/patches/libgda-cve-2021-39359.patch \ %D%/packages/patches/libgda-fix-build.patch \ %D%/packages/patches/libgda-fix-missing-initialization.patch \ diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index bb1f216e2a..023d1c0337 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -1363,7 +1363,7 @@ (define-public aws-sdk-cpp (define-public libexpected (package (name "libexpected") - (version "1.0.0") + (version "1.1.0") (source (origin (method git-fetch) @@ -1374,18 +1374,10 @@ (define-public libexpected ;; repository. Should not affect reproducibility. (recursive? #t))) (file-name (git-file-name name version)) - ;; NOTE: This patch will be unnecessary on subsequent tags. - (patches (search-patches "libexpected-nofetch.patch")) (sha256 - (base32 "1ckzfrljzzdw9wf8hvdfjz4wjx5na57iwxc48mbv9rf5067m21a5")))) + (base32 "17akrv80h0n4cfmxwvlvbb8ycqza7y3qqygjyphv95rrabqm9r02")) + (patches (search-patches "libexpected-use-provided-catch2.patch")))) (build-system cmake-build-system) - ;; TODO: Clean up install phase. - (arguments - `(#:phases - (modify-phases %standard-phases - (replace 'check - (lambda _ - (invoke "./tests")))))) (native-inputs (list catch2)) (synopsis "C++11/14/17 std::expected with functional-style extensions") diff --git a/gnu/packages/patches/libexpected-nofetch.patch b/gnu/packages/= patches/libexpected-nofetch.patch deleted file mode 100644 index e1d104f6f4..0000000000 --- a/gnu/packages/patches/libexpected-nofetch.patch +++ /dev/null @@ -1,27 +0,0 @@ -Description: Disable FetchContent module - No online operations are permitted during build package. -Author: Nicholas Guriev -Last-Update: Wed, 22 Jan 2020 21:51:33 +0300 - -Modified by Brett Gilio on Dec 5, 2020 - ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -4,16 +4,7 @@ project(tl-expected VERSION 1.0.0 LANGUAGES CXX) -=20 - option(EXPECTED_ENABLE_TESTS "Enable tests." ON) -=20 --include(FetchContent) --FetchContent_Declare(=0D -- tl_cmake=0D -- GIT_REPOSITORY https://github.com/TartanLlama/tl-cmake.git=0D --) --FetchContent_GetProperties(tl_cmake)=0D --if(NOT tl_cmake_POPULATED)=0D -- FetchContent_Populate(tl_cmake)=0D -- set(CMAKE_MODULE_PATH ${tl_cmake_SOURCE_DIR} ${CMAKE_MODULE_PATH})=0D --endif() -+set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/tl-cmake ${CMAKE_= MODULE_PATH}) - include(add-tl) -=20 - tl_add_library(expected SOURCES=20 diff --git a/gnu/packages/patches/libexpected-use-provided-catch2.patch b/g= nu/packages/patches/libexpected-use-provided-catch2.patch new file mode 100644 index 0000000000..49d06e2d8f --- /dev/null +++ b/gnu/packages/patches/libexpected-use-provided-catch2.patch @@ -0,0 +1,43 @@ +From 8f03ca270d1aa5dcafa945c941cf52ff14cb47da Mon Sep 17 00:00:00 2001 +Message-Id: <8f03ca270d1aa5dcafa945c941cf52ff14cb47da.1682600200.git.dev@j= poiret.xyz> +From: Josselin Poiret +Date: Thu, 27 Apr 2023 14:51:51 +0200 +Subject: [PATCH] Use provided catch2 + +From: Josselin Poiret + +--- + CMakeLists.txt | 10 +--------- + 1 file changed, 1 insertion(+), 9 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ddab64e..2d5eac8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -8,7 +8,6 @@ project(tl-expected + include(CMakePackageConfigHelpers) + include(CMakeDependentOption) + include(GNUInstallDirs) +-include(FetchContent) + include(CTest) +=20 + if (NOT DEFINED CMAKE_CXX_STANDARD) +@@ -63,14 +62,7 @@ install(FILES + install(DIRECTORY "include/" TYPE INCLUDE) +=20 + if(EXPECTED_BUILD_TESTS) +- set(CMAKE_POLICY_DEFAULT_CMP0077 NEW) +- set(CATCH_INSTALL_HELPERS OFF) +- set(CATCH_BUILD_TESTING OFF) +- set(CATCH_INSTALL_DOCS OFF) +- FetchContent_Declare(Catch2 URL +- https://github.com/catchorg/Catch2/archive/v2.13.10.zip)=20 +- FetchContent_MakeAvailable(Catch2) +- ++ find_package(Catch2 CONFIG) + file(GLOB test-sources CONFIGURE_DEPENDS tests/*.cpp) + list(FILTER test-sources EXCLUDE REGEX "tests/test.cpp") + add_executable(${PROJECT_NAME}-tests "${test-sources}") +--=20 +2.39.2 + base-commit: fa685c87eaa9888a4278f39bb2b815673589dced --=20 2.39.2 ------------=_1682709301-22598-1--