update cppunit to 1.15.1

Change-Id: Ic27a77addb409a8d63ea44136a8d2410ee40c4d2
Reviewed-on: https://gerrit.libreoffice.org/85539
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>

4 files changed, 7 insertions, 79 deletions

diff --git a/external/cppunit/0001-Unconditionally-use-C-11-noreturn.patch.1 b/external/cppunit/0001-Unconditionally-use-C-11-noreturn.patch.1
deleted file mode 100644
index 70ede229a3e6..000000000000
--- a/external/cppunit/0001-Unconditionally-use-C-11-noreturn.patch.1
+++ /dev/null
@@ -1,57 +0,0 @@
-From c955b1041b9e3ebe7ee8a620340b78bddc820682 Mon Sep 17 00:00:00 2001
-From: Stephan Bergmann <sbergman@redhat.com>
-Date: Fri, 1 Feb 2019 13:37:59 +0100
-Subject: [PATCH] Unconditionally use C++11 [[noreturn]]
-
-This helps avoid issues like <https://gerrit.libreoffice.org/plugins/gitiles/
-core/+/9808486a89c6368f836579f8d8c0dda63fd0063c%5E%21> "Avoid
--Werror,-Wimplicit-fallthrough with clang-cl ...where CPPUNIT_FAIL is marked as
-noreturn only for __GNUC__".
-
-Change-Id: Idb33af7375f103f2dd7a7b4c3dbf20ce731b17ad
----
- include/cppunit/Asserter.h | 12 +++---------
- 1 file changed, 3 insertions(+), 9 deletions(-)
-
-diff --git a/include/cppunit/Asserter.h b/include/cppunit/Asserter.h
-index 3321b87..dd39ead 100644
---- a/include/cppunit/Asserter.h
-+++ b/include/cppunit/Asserter.h
-@@ -43,23 +43,17 @@ class Message;
-  * \endcode
-  */
- 
--#if defined __GNUC__
--#   define NORETURN __attribute__((noreturn))
--#else
--#   define NORETURN
--#endif
--
- struct Asserter
- {
-   /*! \brief Throws a Exception with the specified message and location.
-    */
--  NORETURN static void CPPUNIT_API fail( const Message &message, 
-+  [[noreturn]] static void CPPUNIT_API fail( const Message &message, 
-                                 const SourceLine &sourceLine = SourceLine() );
- 
-   /*! \brief Throws a Exception with the specified message and location.
-    * \deprecated Use fail( Message, SourceLine ) instead.
-    */
--  NORETURN static void CPPUNIT_API fail( std::string message, 
-+  [[noreturn]] static void CPPUNIT_API fail( std::string message, 
-                                 const SourceLine &sourceLine = SourceLine() );
- 
-   /*! \brief Throws a Exception with the specified message and location.
-@@ -165,7 +159,7 @@ struct Asserter
-    *                          what are the differences between the expected and actual value.
-    * \param shortDescription Short description for the failure message.
-    */
--  NORETURN static void CPPUNIT_API failNotEqual( std::string expected, 
-+  [[noreturn]] static void CPPUNIT_API failNotEqual( std::string expected, 
-                                         std::string actual, 
-                                         const SourceLine &sourceLine,
-                                         const AdditionalMessage &additionalMessage = AdditionalMessage(),
--- 
-2.20.1
-
diff --git a/external/cppunit/UnpackedTarball_cppunit.mk b/external/cppunit/UnpackedTarball_cppunit.mk
index 649ba8fc4063..24f75b43415f 100644
--- a/external/cppunit/UnpackedTarball_cppunit.mk
+++ b/external/cppunit/UnpackedTarball_cppunit.mk
@@ -13,18 +13,12 @@ $(eval $(call gb_UnpackedTarball_set_tarball,cppunit,$(CPPUNIT_TARBALL),,cppunit
 
 $(eval $(call gb_UnpackedTarball_update_autoconf_configs,cppunit))
 
-# gcc9.patch.0 addressed upstream with <https://gerrit.libreoffice.org/58690> "Avoid GCC 9
-#  -Wdeprecated-copy":
-# 0001-Unconditionally-use-C-11-noreturn.patch.1 upstream at <https://gerrit.libreoffice.org/67247>
-#  "Unconditionally use C++11 [[noreturn]]"
 $(eval $(call gb_UnpackedTarball_add_patches,cppunit,\
 	external/cppunit/windows.patch \
 	external/cppunit/unix.patch \
 	external/cppunit/CPPUNIT_PLUGIN_EXPORT.patch.0 \
 	external/cppunit/enable-win32-debug.patch \
 	external/cppunit/rtti.patch.0 \
-	external/cppunit/gcc9.patch.0 \
-	external/cppunit/0001-Unconditionally-use-C-11-noreturn.patch.1 \
 ))
 ifeq ($(DISABLE_DYNLOADING),TRUE)
 $(eval $(call gb_UnpackedTarball_add_patches,cppunit,\
diff --git a/external/cppunit/gcc9.patch.0 b/external/cppunit/gcc9.patch.0
deleted file mode 100644
index b05725ac09f2..000000000000
--- a/external/cppunit/gcc9.patch.0
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/cppunit/extensions/TestSuiteBuilderContext.h
-+++ include/cppunit/extensions/TestSuiteBuilderContext.h
-@@ -37,6 +37,8 @@
-   TestSuiteBuilderContextBase( TestSuite &suite,
-                                const TestNamer &namer,
-                                TestFixtureFactory &factory );
-+
-+  TestSuiteBuilderContextBase(TestSuiteBuilderContextBase const &) = default;
- 
-   virtual ~TestSuiteBuilderContextBase();
- 
diff --git a/external/cppunit/windows.patch b/external/cppunit/windows.patch
index c8ea6d7565dc..e6ca26cbb0e3 100644
--- a/external/cppunit/windows.patch
+++ b/external/cppunit/windows.patch
@@ -1,5 +1,5 @@
---- misc/cppunit-1.13.1/include/cppunit/plugin/TestPlugIn.h	2010-01-11 14:42:25.084658287 +0100
-+++ misc/build/cppunit-1.13.1/include/cppunit/plugin/TestPlugIn.h	2010-01-11 14:42:18.660706180 +0100
+--- misc/cppunit-1.15.0/include/cppunit/plugin/TestPlugIn.h	2010-01-11 14:42:25.084658287 +0100
++++ misc/build/cppunit-1.15.0/include/cppunit/plugin/TestPlugIn.h	2010-01-11 14:42:18.660706180 +0100
 @@ -133,9 +133,8 @@
  /*! \def CPPUNIT_PLUGIN_IMPLEMENT_MAIN()
   * \brief Implements the 'main' function for the plug-in.
@@ -12,7 +12,7 @@
   */
  
  // Win32
-@@ -149,21 +149,7 @@
+@@ -149,23 +149,7 @@
  
  // Win32
  #if defined(CPPUNIT_HAVE_WIN32_DLL_LOADER)
@@ -22,7 +22,9 @@
 -#define NOUSER
 -#define NOKERNEL
 -#define NOSOUND
+-#ifndef NOMINMAX
 -#define NOMINMAX
+-#endif
 -#define BLENDFUNCTION void    // for mingw & gcc
 -#include <windows.h>
 -#endif
@@ -34,8 +36,8 @@
    typedef char __CppUnitPlugInImplementMainDummyTypeDef
  
  // Unix
---- misc/cppunit-1.13.1/include/cppunit/TestAssert.h
-+++ misc/build/cppunit-1.13.1/include/cppunit/TestAssert.h
+--- misc/cppunit-1.15.0/include/cppunit/TestAssert.h
++++ misc/build/cppunit-1.15.0/include/cppunit/TestAssert.h
 @@ -76,7 +76,7 @@
         const int precision = 15;
  #endif  // #ifdef DBL_DIG