[Libreoffice-commits] core.git: download.lst external/cppunit
Markus Mohrhard (via logerrit)
logerrit at kemper.freedesktop.org
Tue Dec 24 19:46:59 UTC 2019
download.lst | 4
external/cppunit/0001-Unconditionally-use-C-11-noreturn.patch.1 | 57 ----------
external/cppunit/UnpackedTarball_cppunit.mk | 6 -
external/cppunit/gcc9.patch.0 | 11 -
external/cppunit/windows.patch | 12 +-
5 files changed, 9 insertions(+), 81 deletions(-)
New commits:
commit ffe9ff2cf63112ac04a695740a5637f25c16abe8
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
AuthorDate: Fri Dec 20 01:28:54 2019 +0800
Commit: Markus Mohrhard <markus.mohrhard at googlemail.com>
CommitDate: Tue Dec 24 20:45:53 2019 +0100
update cppunit to 1.15.1
Change-Id: Ic27a77addb409a8d63ea44136a8d2410ee40c4d2
Reviewed-on: https://gerrit.libreoffice.org/85539
Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
diff --git a/download.lst b/download.lst
index fdd0b866c373..690f43cc419d 100644
--- a/download.lst
+++ b/download.lst
@@ -25,8 +25,8 @@ export LIBCMIS_SHA256SUM := d7b18d9602190e10d437f8a964a32e983afd57e2db316a07d874
export LIBCMIS_TARBALL := libcmis-0.5.2.tar.xz
export COINMP_SHA256SUM := 86c798780b9e1f5921fe4efe651a93cb420623b45aa1fdff57af8c37f116113f
export COINMP_TARBALL := CoinMP-1.7.6.tgz
-export CPPUNIT_SHA256SUM := 3d569869d27b48860210c758c4f313082103a5e58219a7669b52bfd29d674780
-export CPPUNIT_TARBALL := cppunit-1.14.0.tar.gz
+export CPPUNIT_SHA256SUM := 89c5c6665337f56fd2db36bc3805a5619709d51fb136e51937072f63fcc717a7
+export CPPUNIT_TARBALL := cppunit-1.15.1.tar.gz
export CT2N_SHA256SUM := 71b238efd2734be9800af07566daea8d6685aeed28db5eb5fa0e6453f4d85de3
export CT2N_TARBALL := 1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt
export CURL_SHA256SUM := 7766d263929404f693905b5e5222aa0f2bdf8c66ab4b8758f0c0820a42b966cd
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 at 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
More information about the Libreoffice-commits
mailing list