* [bug#63112] [PATCH] gnu: libexpected: Update to 1.1.0.
@ 2023-04-27 13:08 Josselin Poiret via Guix-patches via
2023-04-28 2:40 ` [bug#63112] (no subject) Steven Roose
2023-04-28 19:14 ` bug#63112: [PATCH] gnu: libexpected: Update to 1.1.0 Ludovic Courtès
0 siblings, 2 replies; 4+ messages in thread
From: Josselin Poiret via Guix-patches via @ 2023-04-27 13:08 UTC (permalink / raw)
To: 63112; +Cc: Josselin Poiret
From: Josselin Poiret <dev@jpoiret.xyz>
* 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
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 <guriev-ns@ya.ru>
-Last-Update: Wed, 22 Jan 2020 21:51:33 +0300
-
-Modified by Brett Gilio <brettg@gnu.org> 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 <dev@jpoiret.xyz>
+Date: Thu, 27 Apr 2023 14:51:51 +0200
+Subject: [PATCH] Use provided catch2
+
+From: Josselin Poiret <dev@jpoiret.xyz>
+
+---
+ 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
+
base-commit: fa685c87eaa9888a4278f39bb2b815673589dced
--
2.39.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-04-28 19:16 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-04-27 13:08 [bug#63112] [PATCH] gnu: libexpected: Update to 1.1.0 Josselin Poiret via Guix-patches via
2023-04-28 2:40 ` [bug#63112] (no subject) Steven Roose
2023-04-28 13:27 ` Josselin Poiret via Guix-patches via
2023-04-28 19:14 ` bug#63112: [PATCH] gnu: libexpected: Update to 1.1.0 Ludovic Courtès
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).