Uploading LGM2013 version of libcdr

(cherry picked from commit 4757ffcc)

Conflicts:
	libcdr/ExternalProject_libcdr.mk

Change-Id: Icdf57cb8a40256b4a474ededd3ba030bd79497f4

Trying to fix a boost::property_tree::json_parser error on windows

(cherry picked from commit 41d2b58b)

Conflicts:
	boost/UnpackedTarball_boost.mk

Change-Id: Iea3ec9a56eb008c6a0729a151b392f1e62925720

Trying to avoid linking with boost on Windows

Change-Id: Ic0c538dfad88f850d95f417f2741ef7dba7fc5e4
(cherry picked from commit 1e392ea7)
Reviewed-on: https://gerrit.libreoffice.org/3559Reviewed-by: Michael Meeks <michael.meeks@suse.com>
Tested-by: Michael Meeks <michael.meeks@suse.com>

boost/UnpackedTarball_boost.mk

@@ -52,6 +52,8 @@ boost_patches += boost_1_44_0-clang-warnings.patch
 # in GCC-4.7 experimental":
 boost_patches += boost_1_44_0-gthreads.patch
 
+boost_patches += boost.ptree.patch
+
 $(eval $(call gb_UnpackedTarball_UnpackedTarball,boost))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,boost,$(BOOST_TARBALL)))

boost/boost.ptree.patch

+--- misc/build/boost_1_44_0/boost/property_tree/detail/json_parser_read.hpp	2013-04-22 18:22:16.961642320 +0200
++++ misc/build/boost_1_44_0/boost/property_tree/detail/json_parser_read.hpp	2013-04-22 18:22:59.991632602 +0200
+@@ -102,7 +102,7 @@
+             void operator()(It b, It e) const
+             {
+                 BOOST_ASSERT(c.stack.size() >= 1);
+-                c.stack.back()->push_back(std::make_pair(c.name, Str(b, e)));
++                c.stack.back()->push_back(std::make_pair(c.name, Ptree(Str(b, e))));
+                 c.name.clear();
+                 c.string.clear();
+             }

download.lst

-CDR_MD5SUM := 6db2c96a4ae5977da8b84893c1441038
-export CDR_TARBALL := libcdr-0.0.12.tar.bz2
+CDR_MD5SUM := 75700c61b3a8e7d49a1f04c62048ff00
+export CDR_TARBALL := libcdr-0.0.13.tar.bz2
 MSPUB_MD5SUM := 881c4628ec5f54d47f35d5d19e335662
 export MSPUB_TARBALL := libmspub-0.0.5.tar.bz2
 VISIO_MD5SUM := 2f638cf6f92cec59c9205ac3cbf1702e

libcdr/ExternalProject_libcdr.mk

@@ -26,6 +26,7 @@ ifeq ($(OS)$(COM),WNTMSC)
 ifeq ($(VCVER),90)
 $(call gb_ExternalProject_get_state_target,libcdr,build) :
 	cd $(EXTERNAL_WORKDIR)/build/win32 \
+	&& export BOOST_INCLUDE_DIR=$(OUTDIR)/inc/external \
 	&& export LIBWPD_INCLUDE_DIR=$(OUTDIR)/inc/external \
 	&& export LIBWPG_INCLUDE_DIR=$(OUTDIR)/inc/external \
 	&& export LCMS2_INCLUDE_DIR=$(call gb_UnpackedTarball_get_dir,lcms2/include) \
@@ -36,6 +37,7 @@ $(call gb_ExternalProject_get_state_target,libcdr,build) :
 else ifeq ($(VCVER),100)
 $(call gb_ExternalProject_get_state_target,libcdr,build) :
 	cd $(EXTERNAL_WORKDIR)/build/win32 \
+	&& export BOOST_INCLUDE_DIR=$(OUTDIR)/inc/external \
 	&& export LIBWPD_INCLUDE_DIR=$(OUTDIR)/inc/external \
 	&& export LIBWPG_INCLUDE_DIR=$(OUTDIR)/inc/external \
 	&& export LCMS2_INCLUDE_DIR=$(call gb_UnpackedTarball_get_dir,lcms2/include) \
@@ -46,6 +48,7 @@ $(call gb_ExternalProject_get_state_target,libcdr,build) :
 else
 $(call gb_ExternalProject_get_state_target,libcdr,build) :
 	cd $(EXTERNAL_WORKDIR)/build/win32 \
+	&& export BOOST_INCLUDE_DIR=$(OUTDIR)/inc/external \
 	&& export LIBWPD_INCLUDE_DIR=$(OUTDIR)/inc/external \
 	&& export LIBWPG_INCLUDE_DIR=$(OUTDIR)/inc/external \
 	&& export LCMS2_INCLUDE_DIR=$(call gb_UnpackedTarball_get_dir,lcms2/include) \
@@ -62,7 +65,7 @@ $(call gb_ExternalProject_get_state_target,libcdr,build) :
 	&& export PKG_CONFIG="" \
 	&& export ICU_LIBS=" " \
 	$(if $(filter NO,$(SYSTEM_ICU)),&& export ICU_CFLAGS="-I$(OUTDIR)/inc/external") \
-	$(if $(filter YES,$(SYSTEM_ICU)),&& ICU_CFLAGS=" ") \
+	$(if $(filter YES,$(SYSTEM_ICU)),&& export ICU_CFLAGS=" ") \
 	&& ./configure \
 		--with-pic \
 		--enable-static \
@@ -70,6 +73,7 @@ $(call gb_ExternalProject_get_state_target,libcdr,build) :
 		--without-docs \
 		--disable-debug \
 		--disable-werror \
+		$(if $(filter NO,$(SYSTEM_BOOST)),CXXFLAGS=-I$(OUTDIR)/inc/external) \
 		$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 	&& (cd $(EXTERNAL_WORKDIR)/src/lib && $(MAKE)) \
 	&& touch $@

libcdr/UnpackedTarball_cdr.mk

@@ -11,4 +11,10 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,cdr))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,cdr,$(CDR_TARBALL)))
 
+$(eval $(call gb_UnpackedTarball_set_patchlevel,cdr,1))
+
+$(eval $(call gb_UnpackedTarball_add_patches,cdr,\
+       libcdr/libcdr-0.0.13.patch \
+))
+
 # vim: set noet sw=4 ts=4:

libcdr/libcdr-0.0.13.patch

+--- a/src/lib/CDRParser.cpp
++++ b/src/lib/CDRParser.cpp
+@@ -32,6 +32,9 @@
+ #include <string.h>
+ #include <sstream>
+ #include <set>
++#ifndef BOOST_ALL_NO_LIB
++#define BOOST_ALL_NO_LIB 1
++#endif
+ #include <boost/property_tree/json_parser.hpp>
+ #include <boost/property_tree/ptree.hpp>
+ #include <boost/spirit/include/classic.hpp>

libcdr/prj/build.lst

-cdr	libcdr	: libwpd libwpg ICU:icu LCMS2:lcms2 ZLIB:zlib soltools NULL
+cdr	libcdr	: libwpd libwpg BOOST:boost ICU:icu LCMS2:lcms2 ZLIB:zlib soltools NULL
 cdr	libcdr\prj	nmake	-	all	cdr_libcdr NULL