From patchwork Thu Apr 27 13:08:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josselin Poiret X-Patchwork-Id: 49562 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 8BAB227BBEA; Thu, 27 Apr 2023 14:09:28 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 1A2E927BBE9 for ; Thu, 27 Apr 2023 14:09:27 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ps1My-0003oC-1A; Thu, 27 Apr 2023 09:09:08 -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 1ps1Mu-0003np-90 for guix-patches@gnu.org; Thu, 27 Apr 2023 09:09: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 1ps1Mt-0008Ow-Ip for guix-patches@gnu.org; Thu, 27 Apr 2023 09:09:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ps1Ms-0008WF-1o for guix-patches@gnu.org; Thu, 27 Apr 2023 09:09:02 -0400 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== Date: Thu, 27 Apr 2023 15:08:25 +0200 Message-Id: <945f28c9a106e483b9650278a647e4f3332fa5be.1682600895.git.dev@jpoiret.xyz> MIME-Version: 1.0 X-Spamd-Bar: +++ Authentication-Results: jpoiret.xyz; auth=pass smtp.auth=jpoiret@jpoiret.xyz smtp.mailfrom=dev@jpoiret.xyz 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-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: , Reply-to: Josselin Poiret X-ACL-Warn: , Josselin Poiret via Guix-patches X-Patchwork-Original-From: Josselin Poiret via Guix-patches via From: Josselin Poiret 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 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.patch base-commit: fa685c87eaa9888a4278f39bb2b815673589dced 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 = \ %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) - - option(EXPECTED_ENABLE_TESTS "Enable tests." ON) - --include(FetchContent) --FetchContent_Declare( -- tl_cmake -- GIT_REPOSITORY https://github.com/TartanLlama/tl-cmake.git --) --FetchContent_GetProperties(tl_cmake) --if(NOT tl_cmake_POPULATED) -- FetchContent_Populate(tl_cmake) -- set(CMAKE_MODULE_PATH ${tl_cmake_SOURCE_DIR} ${CMAKE_MODULE_PATH}) --endif() -+set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/tl-cmake ${CMAKE_MODULE_PATH}) - include(add-tl) - - tl_add_library(expected SOURCES diff --git a/gnu/packages/patches/libexpected-use-provided-catch2.patch b/gnu/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@jpoiret.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) + + if (NOT DEFINED CMAKE_CXX_STANDARD) +@@ -63,14 +62,7 @@ install(FILES + install(DIRECTORY "include/" TYPE INCLUDE) + + 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) +- 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}") +-- +2.39.2 +