Accepting request 972874 from home:susnux:branches:devel:libraries:c_c++

Update to 2.13.9

OBS-URL: https://build.opensuse.org/request/show/972874
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/Catch2?expand=0&rev=14
This commit is contained in:
Luigi Baldoni 2022-04-26 19:13:45 +00:00 committed by Git OBS Bridge
parent ea5699e06a
commit f18bc9be08
5 changed files with 49 additions and 9 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3cdb4138a072e4c0290034fe22d9f0a80d3bcfb8d7a8a5c49ad75d3a5da24fae
size 661014

3
Catch2-2.13.9.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:06dbc7620e3b96c2b69d57bf337028bf245a211b3cddb843835bfe258f427a52
size 661915

View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Tue Apr 26 12:06:41 UTC 2022 - Ferdinand Thiessen <rpm@fthiessen.de>
- Update to 2.13.9
* Fixed issue with -# (filename-as-tag) flag when __FILE__ expands
into filename without directories
* Fixed CAPTURE macro not being variadic when disabled through
CATCH_CONFIG_DISABLE
- Update to 2.13.8
* Fix: Made Approx::operator() const
* Improved pkg-config files
* The macro-generated names for things like TEST_CASE no longer
create reserved identifiers
* Clang-tidy should no longer warn about missing virtual dispatch
in FilterGenerator's constructor
- Added fix-pragmas-old-gcc.patch
-------------------------------------------------------------------
Thu Aug 5 11:24:30 UTC 2021 - Luigi Baldoni <aloisio@gmx.com>

View File

@ -1,7 +1,7 @@
#
# spec file for package Catch2
#
# Copyright (c) 2021 SUSE LLC
# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -17,14 +17,16 @@
Name: Catch2
Version: 2.13.7
Version: 2.13.9
Release: 0
Summary: A modern, C++-native, header-only, test framework for unit-tests, TDD and BDD
License: BSL-1.0
URL: https://github.com/catchorg/%{name}/
Source: https://github.com/catchorg/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
#PATCH-FIX-OPENSUSE fix-pragmas-old-gcc.patch -- Fix usage of gcc pragmas for old gcc version on Leap gh#catchorg/Catch2#2416
Patch0: fix-pragmas-old-gcc.patch
BuildRequires: cmake >= 3.5
BuildRequires: gcc-c++
BuildRequires: gcc-c++ >= 6
BuildRequires: pkgconfig
%description
@ -33,9 +35,6 @@ test framework for C++. which also supports Objective-C (and maybe C).
It is primarily distributed as a single header file, although certain
extensions may require additional headers.
%prep
%autosetup
%package devel
Summary: A modern, C++-native, header-only, test framework for unit-tests, TDD and BDD
@ -45,6 +44,9 @@ test framework for C++. which also supports Objective-C (and maybe C).
It is primarily distributed as a single header file, although certain
extensions may require additional headers.
%prep
%autosetup -p1
%build
%cmake -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_DOCDIR=%{_defaultdocdir}/%{name} \

21
fix-pragmas-old-gcc.patch Normal file
View File

@ -0,0 +1,21 @@
diff -Nur Catch2-2.13.9/projects/SelfTest/UsageTests/Message.tests.cpp new/projects/SelfTest/UsageTests/Message.tests.cpp
--- Catch2-2.13.9/projects/SelfTest/UsageTests/Message.tests.cpp 2022-04-12 22:38:17.000000000 +0200
+++ new/projects/SelfTest/UsageTests/Message.tests.cpp 2022-04-26 14:20:39.792719016 +0200
@@ -243,7 +243,7 @@
// Clang and gcc have different names for this warning, and clang also
// warns about an unused value
-#if defined(__GNUG__) && !defined(__clang__)
+#if defined(__GNUG__) && __GNUG__ >= 8 && !defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wcomma-subscript"
#elif defined(__clang__)
@@ -262,7 +262,7 @@
SUCCEED();
}
-#ifdef __GNUG__
+#if defined(__GNUG__) && __GNUG__ >= 8
#pragma GCC diagnostic pop
#endif