[Libreoffice-commits] core.git: Branch 'feature/orcus-update' - download.lst liborcus/ExternalProject_liborcus.mk sc/qa translations

[Kohei Yoshida]

 download.lst                         |    2 +-
 liborcus/ExternalProject_liborcus.mk |    2 ++
 sc/qa/unit/helper/qahelper.hxx       |    1 +
 translations                         |    2 +-
 4 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit e876cc0b4b4d1d769401d35ef7ab3eed7571aba4
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date:   Fri Apr 12 23:36:53 2013 -0400

    Get cppunit in sc to link with orcus-parser.
    
    Change-Id: I1f53a4f4b9beee501e29149ed88e3ce5d63d9a3c

diff --git a/download.lst b/download.lst
index b8948f4..90aa6e5 100644
--- a/download.lst
+++ b/download.lst
@@ -68,7 +68,7 @@ export NEON_TARBALL := ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz
 export NSS_TARBALL := a0a861f539f0e7a91d05e6b9457e4db1-nss-3.13.5-with-nspr-4.9.1.tar.gz
 export OPENLDAP_TARBALL := 804c6cb5698db30b75ad0ff1c25baefd-openldap-2.4.31.tgz
 export OPENSSL_TARBALL := 51a40a81b3b7abe8a5c33670bd3da0ce-openssl-0.9.8v.tar.gz
-export ORCUS_TARBALL := 5c4201c038183b2e9b69d317784b2245-liborcus-0.5.1.tar.bz2
+export ORCUS_TARBALL := ea2acaf140ae40a87a952caa75184f4d-liborcus-0.5.1.tar.bz2
 export PIXMAN_TARBALL := c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2
 export PNG_TARBALL := 9e5d864bce8f06751bbd99962ecf4aad-libpng-1.5.10.tar.gz
 export POSTGRESQL_TARBALL := c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2
diff --git a/liborcus/ExternalProject_liborcus.mk b/liborcus/ExternalProject_liborcus.mk
index f70a377..daded4d 100644
--- a/liborcus/ExternalProject_liborcus.mk
+++ b/liborcus/ExternalProject_liborcus.mk
@@ -64,6 +64,8 @@ $(call gb_ExternalProject_get_state_target,liborcus,build) :
 	$(call gb_ExternalProject_run,build,\
 		$(if $(filter ANDROID,$(OS)),LIBS='-lgnustl_shared -lm') \
 		$(if $(filter YES,$(SYSTEM_ZLIB)),LIBS+=-lz) \
+		$(if $(filter MSC,$(COM)),CPPFLAGS+="-DBOOST_ALL_NO_LIB") \
+		$(if $(filter MSC,$(COM)),CXXFLAGS+=$(BOOST_CXXFLAGS)) \
 		$(if $(filter NO,$(SYSTEM_ZLIB)),CPPFLAGS+=-I$(OUTDIR)/inc/external/zlib) \
 		$(if $(filter NO,$(SYSTEM_BOOST)),CXXFLAGS+=-I$(WORKDIR)/UnpackedTarball/boost) \
 		$(if $(filter YES,$(SYSTEM_BOOST)),LDFLAGS=$(BOOST_LDFLAGS)) \
diff --git a/sc/qa/unit/helper/qahelper.hxx b/sc/qa/unit/helper/qahelper.hxx
index 9558691..0599771 100644
--- a/sc/qa/unit/helper/qahelper.hxx
+++ b/sc/qa/unit/helper/qahelper.hxx
@@ -30,6 +30,7 @@
 #define SC_QA_HELPER_HXX
 
 #include <test/bootstrapfixture.hxx>
+#define __ORCUS_STATIC_LIB
 #include "helper/csv_handler.hxx"
 #include "helper/debughelper.hxx"
 #include "orcus/csv_parser.hpp"
diff --git a/translations b/translations
index 85f724f..69838a3 160000
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 85f724f5aa1d6a59662a7d1c7ea406a641814bd2
+Subproject commit 69838a35694be5b656df1ee0c5e5da0e0cc4373b