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

[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 <thomas at 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 <thomas at arnhold.org>
    Tested-by: Thomas Arnhold <thomas at 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 "";
- }
- 
-