From fca1b591039c34d879ca3805769c47aeba3ed61b94d6d8db16bbd9904740b5c2 Mon Sep 17 00:00:00 2001
From: Atri Bhattacharya <badshah400@gmail.com>
Date: Fri, 20 Jan 2023 05:06:05 +0000
Subject: [PATCH] Accepting request 1059295 from
 home:badshah400:branches:devel:libraries:c_c++

Update to version 2.13.10:

OBS-URL: https://build.opensuse.org/request/show/1059295
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/Catch2-2?expand=0&rev=3
---
 Catch2-2.13.10.tar.gz     |  3 +++
 Catch2-2.13.9.tar.gz      |  3 ---
 Catch2-2.changes          | 13 +++++++++++++
 Catch2-2.spec             |  4 ++--
 fix-pragmas-old-gcc.patch | 35 ++++++++++++++++++-----------------
 5 files changed, 36 insertions(+), 22 deletions(-)
 create mode 100644 Catch2-2.13.10.tar.gz
 delete mode 100644 Catch2-2.13.9.tar.gz

diff --git a/Catch2-2.13.10.tar.gz b/Catch2-2.13.10.tar.gz
new file mode 100644
index 0000000..9ba5d39
--- /dev/null
+++ b/Catch2-2.13.10.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d54a712b7b1d7708bc7a819a8e6e47b2fde9536f487b89ccbca295072a7d9943
+size 662225
diff --git a/Catch2-2.13.9.tar.gz b/Catch2-2.13.9.tar.gz
deleted file mode 100644
index 036c5c7..0000000
--- a/Catch2-2.13.9.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:06dbc7620e3b96c2b69d57bf337028bf245a211b3cddb843835bfe258f427a52
-size 661915
diff --git a/Catch2-2.changes b/Catch2-2.changes
index 5859690..82f24cb 100644
--- a/Catch2-2.changes
+++ b/Catch2-2.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Wed Jan 18 08:32:54 UTC 2023 - Atri Bhattacharya <badshah400@gmail.com>
+
+- Update to version 2.13.10:
+  * Fixed issue with catch_discover_tests when there is multiple of
+    256 tests (gh#catchorg/Catch2#2401, gh#catchorg/Catch2#2503).
+  * Catch2-provided main and wmain are explicitly marked as __cdecl
+    when compiled with MSVC (gh#catchorg/Catch2#2486,
+    gh#catchorg/Catch2#2487).
+  * Replaced deprecated std::aligned_storage
+    (gh#catchorg/Catch2#2419, gh#catchorg/Catch2#2420).
+- Minor rebase of fix-pragmas-old-gcc.patch to apply cleanly.
+
 -------------------------------------------------------------------
 Sat Oct  8 04:21:27 UTC 2022 - Atri Bhattacharya <badshah400@gmail.com>
 
diff --git a/Catch2-2.spec b/Catch2-2.spec
index c7c282b..785ac1e 100644
--- a/Catch2-2.spec
+++ b/Catch2-2.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package Catch2-2
 #
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,7 @@
 
 %define srcname Catch2
 Name:           Catch2-2
-Version:        2.13.9
+Version:        2.13.10
 Release:        0
 Summary:        A modern, C++-native, header-only, test framework for unit-tests, TDD and BDD
 License:        BSL-1.0
diff --git a/fix-pragmas-old-gcc.patch b/fix-pragmas-old-gcc.patch
index ee20f5e..1c46855 100644
--- a/fix-pragmas-old-gcc.patch
+++ b/fix-pragmas-old-gcc.patch
@@ -1,21 +1,22 @@
-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();
+Index: Catch2-2.13.10/projects/SelfTest/UsageTests/Message.tests.cpp
+===================================================================
+--- Catch2-2.13.10.orig/projects/SelfTest/UsageTests/Message.tests.cpp
++++ Catch2-2.13.10/projects/SelfTest/UsageTests/Message.tests.cpp
+@@ -242,7 +242,7 @@ std::ostream& operator<<(std::ostream& o
  }
  
--#ifdef __GNUG__
-+#if defined(__GNUG__) && __GNUG__ >= 8
- #pragma GCC diagnostic pop
+ // clang can handle GCC's diagnostic pragma
+-#if defined( __GNUG__ ) || defined(__clang__)
++#if defined( __GNUG__ ) && __GNUG__ >= 8 || defined(__clang__)
+ #    pragma GCC diagnostic push
+ #endif
+ // Clang and gcc have different names for this warning, and clang also
+@@ -263,7 +263,7 @@ TEST_CASE("CAPTURE can deal with complex
+     CAPTURE( (1, 2), (2, 3) );
+     SUCCEED();
+ }
+-#if defined( __GNUG__ ) || defined(__clang__)
++#if defined( __GNUG__ ) && __GNUG__ >= 8 || defined(__clang__)
+ #    pragma GCC diagnostic pop
  #endif