[packages/catch2] - updated to 3.8.1

qboosh qboosh at pld-linux.org
Wed Apr 30 20:49:28 CEST 2025


commit 7cfd3af63a499624758c61368e6aa0145b82480c
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Wed Apr 30 20:38:16 2025 +0200

    - updated to 3.8.1

 catch2.spec                    | 20 ++++++++--------
 optional-reproducibility.patch | 52 ------------------------------------------
 2 files changed, 9 insertions(+), 63 deletions(-)
---
diff --git a/catch2.spec b/catch2.spec
index 7b01adf..522e8de 100644
--- a/catch2.spec
+++ b/catch2.spec
@@ -1,16 +1,17 @@
 Summary:	A modern, C++-native, test framework for unit-tests, TDD and BDD
 Summary(pl.UTF-8):	Nowoczesny, natywny dla C++ szkielet dla testów jednostkowych, TDD i BDD
 Name:		catch2
-Version:	3.5.0
+Version:	3.8.1
 Release:	1
 License:	Boost v1.0
 Group:		Libraries
+#Source0Download: https://github.com/catchorg/Catch2/releases
 Source0:	https://github.com/catchorg/Catch2/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5:	8e56bcccbc86e68e916cce0d43450116
-Patch0:		optional-reproducibility.patch
+# Source0-md5:	26689984e0a30ff78b94488c1f849f1f
 URL:		https://github.com/catchorg/Catch2
-BuildRequires:	cmake >= 3.10
-BuildRequires:	libstdc++-devel
+BuildRequires:	cmake >= 3.16
+# C++14
+BuildRequires:	libstdc++-devel >= 6:5
 BuildRequires:	rpmbuild(macros) >= 1.605
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -28,7 +29,7 @@ Summary:	Header files for catch2 library
 Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki catch2
 Group:		Development/Libraries
 Requires:	%{name}%{?_isa} = %{version}-%{release}
-Requires:	libstdc++-devel
+Requires:	libstdc++-devel >= 6:5
 
 %description devel
 Header files for catch2 library.
@@ -38,17 +39,14 @@ Pliki nagłówkowe biblioteki catch2.
 
 %prep
 %setup -q -n Catch2-%{version}
-%patch -P0 -p1
 
 %build
-install -d build
-cd build
-%cmake .. \
+%cmake -B build \
 	-DPKGCONFIG_INSTALL_DIR:PATH="%{_pkgconfigdir}" \
 	-DCATCH_INSTALL_DOCS:BOOL=OFF \
 	-DCATCH_ENABLE_REPRODUCIBLE_BUILD:BOOL=OFF
 
-%{__make}
+%{__make} -C build
 
 %install
 rm -rf $RPM_BUILD_ROOT
diff --git a/optional-reproducibility.patch b/optional-reproducibility.patch
deleted file mode 100644
index ed2688e..0000000
--- a/optional-reproducibility.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 1512dac7e4c2fddadcc15f7ab316ce3d5b67e7f3 Mon Sep 17 00:00:00 2001
-From: Jan Palus <jpalus at fastmail.com>
-Date: Thu, 28 Dec 2023 00:41:54 +0100
-Subject: [PATCH] Make compiler flags for reproducible builds optional
-
-no change in default behavior: -ffile-prefix-map is still added if
-supported by compiler but add option for disabling it as it breaks
-generic tools for extracting debuginfo/debugsource from build artifacts
-like: https://sourceware.org/git/?p=debugedit.git;a=blob;f=scripts/find-debuginfo.in
----
- CMakeLists.txt     | 1 +
- src/CMakeLists.txt | 8 ++++++--
- 2 files changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2cfb6cd143..20e4036e18 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -11,6 +11,7 @@ endif()
- option(CATCH_INSTALL_DOCS "Install documentation alongside library" ON)
- option(CATCH_INSTALL_EXTRAS "Install extras (CMake scripts, debugger helpers) alongside library" ON)
- option(CATCH_DEVELOPMENT_BUILD "Build tests, enable warnings, enable Werror, etc" OFF)
-+option(CATCH_ENABLE_REPRODUCIBLE_BUILD "Add compiler flags for improving build reproducibility" ON)
- 
- include(CMakeDependentOption)
- cmake_dependent_option(CATCH_BUILD_TESTING "Build the SelfTest project" ON "CATCH_DEVELOPMENT_BUILD" OFF)
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index d01aab2d5c..eb805ddd0b 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -348,7 +348,9 @@ source_group("generated headers"
- )
- 
- add_library(Catch2 ${ALL_FILES})
--add_build_reproducibility_settings(Catch2)
-+if (CATCH_ENABLE_REPRODUCIBLE_BUILD)
-+    add_build_reproducibility_settings(Catch2)
-+endif()
- add_library(Catch2::Catch2 ALIAS Catch2)
- 
- if (ANDROID)
-@@ -401,7 +403,9 @@ target_include_directories(Catch2
- add_library(Catch2WithMain
-     ${SOURCES_DIR}/internal/catch_main.cpp
- )
--add_build_reproducibility_settings(Catch2WithMain)
-+if (CATCH_ENABLE_REPRODUCIBLE_BUILD)
-+    add_build_reproducibility_settings(Catch2WithMain)
-+endif()
- add_library(Catch2::Catch2WithMain ALIAS Catch2WithMain)
- target_link_libraries(Catch2WithMain PUBLIC Catch2)
- set_target_properties(Catch2WithMain
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/catch2.git/commitdiff/7cfd3af63a499624758c61368e6aa0145b82480c



More information about the pld-cvs-commit mailing list