[Libreoffice-commits] core.git: download.lst external/cppunit

2019-12-24 Thread Markus Mohrhard (via logerrit) 
 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 
AuthorDate: Fri Dec 20 01:28:54 2019 +0800
Commit: Markus Mohrhard 
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 
Tested-by: Markus Mohrhard 

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..
--- 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 
-Date: Fri, 1 Feb 2019 13:37:59 +0100
-Subject: [PATCH] Unconditionally use C++11 [[noreturn]]
-
-This helps avoid issues like  "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 , 
-+  [[noreturn]] static void CPPUNIT_API fail( const Message , 
- const 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() );
- 
-   /*! \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 ,
- const 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  
"Avoid GCC 9
-#  -Wdeprecated-copy":
-# 0001-Unconditionally-use-C-11-noreturn.patch.1 upstream at

[Libreoffice-commits] core.git: download.lst external/cppunit

2014-08-14 Thread Thomas Arnhold 
 download.lst|3 ++-
 external/cppunit/ExternalProject_cppunit.mk |1 +
 external/cppunit/coverity.patch |2 +-
 external/cppunit/unix.patch |   13 -
 4 files changed, 4 insertions(+), 15 deletions(-)

New commits:
commit 4b8a131d3897a3fda8d4e8fe635f19cc41bed36a
Author: Thomas Arnhold tho...@arnhold.org
Date:   Sun Aug 10 14:04:53 2014 +0200

upgrade to cppunit 1.13.2

* remove obsolete patch part
* enable x64 target for vc project file on win64

Change-Id: Ie794c08c9f739ad8c9c68c423f72e79ed4f6b0ff
Reviewed-on: https://gerrit.libreoffice.org/10856
Reviewed-by: Thomas Arnhold tho...@arnhold.org
Tested-by: Thomas Arnhold tho...@arnhold.org

diff --git a/download.lst b/download.lst
index ac0682c..b58596d 100644
--- a/download.lst
+++ b/download.lst
@@ -24,7 +24,8 @@ export CMIS_TARBALL := 
22f8a85daf4a012180322e1f52a7563b-libcmis-0.4.1.tar.gz
 export COINMP_MD5SUM := 1cce53bf4b40ae29790d2c5c9f8b1129
 export COINMP_TARBALL := CoinMP-1.7.6.tgz
 export COLLADA2GLTF_TARBALL := 
4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2
-export CPPUNIT_TARBALL := 
ac4781e01619be13461bb2d562b94a7b-cppunit-1.13.1.tar.gz
+export CPPUNIT_MD5SUM := d1c6bdd5a76c66d2c38331e2d287bc01
+export CPPUNIT_TARBALL := cppunit-1.13.2.tar.gz
 export CT2N_TARBALL := 
451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt
 export CURL_MD5SUM := e6d1f9d1b59da5062109ffe14e0569a4
 export CURL_TARBALL := curl-7.36.0.tar.bz2
diff --git a/external/cppunit/ExternalProject_cppunit.mk 
b/external/cppunit/ExternalProject_cppunit.mk
index b5b7f8a..351c5a6 100644
--- a/external/cppunit/ExternalProject_cppunit.mk
+++ b/external/cppunit/ExternalProject_cppunit.mk
@@ -17,6 +17,7 @@ ifeq ($(OS)$(COM),WNTMSC)
 $(call gb_ExternalProject_get_state_target,cppunit,build) :
$(call gb_ExternalProject_run,build,\
PROFILEFLAGS=$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \
+   /p:Platform=$(if $(filter INTEL,$(CPUNAME)),Win32,x64) \
$(if $(filter 110,$(VCVER)),/p:PlatformToolset=$(if 
$(filter 80,$(WINDOWS_SDK_VERSION)),v110,v110_xp) \
/p:VisualStudioVersion=11.0) \
$(if $(filter 120,$(VCVER)),/p:PlatformToolset=v120 
/p:VisualStudioVersion=12.0 /ToolsVersion:12.0) \
diff --git a/external/cppunit/coverity.patch b/external/cppunit/coverity.patch
index 5e5e64d..6fb3261 100644
--- a/external/cppunit/coverity.patch
+++ b/external/cppunit/coverity.patch
@@ -1,6 +1,6 @@
 --- misc/cppunit-1.13.1/src/cppunit/Asserter.cpp
 +++ misc/build/cppunit-1.13.1/src/cppunit/Asserter.cpp
-@@ -13,7 +13,7 @@
+@@ -13,7 +13,7 @@ Asserter::fail( std::string message,
fail( Message( assertion failed, message ), sourceLine );
  }
  
diff --git a/external/cppunit/unix.patch b/external/cppunit/unix.patch
index 74de602..e75e72c 100644
--- a/external/cppunit/unix.patch
+++ b/external/cppunit/unix.patch
@@ -8,16 +8,3 @@
  }
  
  
-@@ -34,7 +33,11 @@
- std::string 
- DynamicLibraryManager::getLastErrorDetail() const
- {
--  return ;
-+  const char *last_dlerror = ::dlerror();
-+  if (last_dlerror != NULL)
-+return last_dlerror;
-+  else
-+return ;
- }
- 
- 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits