Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3559
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/59/3559/1
Uploading LGM2013 version of libcdr
(cherry picked from commit 4757ffcc5cea1d627f57e551b7af0b39c8e40b47)
Conflicts:
libcdr/ExternalProject_libcdr.mk
Change-Id: Icdf57cb8a40256b4a474ededd3ba030bd79497f4
Trying to fix a boost::property_tree::json_parser error on windows
(cherry picked from commit 41d2b58b1ed5c1c4a1ca6ab3e6d7c4f15874d3a3)
Conflicts:
boost/UnpackedTarball_boost.mk
Change-Id: Iea3ec9a56eb008c6a0729a151b392f1e62925720
Trying to avoid linking with boost on Windows
Change-Id: Ic0c538dfad88f850d95f417f2741ef7dba7fc5e4
(cherry picked from commit 1e392ea7a0d1504f701f9fed1492e64a78a65339)
---
M boost/UnpackedTarball_boost.mk
A boost/boost.ptree.patch
M download.lst
M libcdr/ExternalProject_libcdr.mk
M libcdr/UnpackedTarball_cdr.mk
A libcdr/libcdr-0.0.13.patch
M libcdr/prj/build.lst
7 files changed, 39 insertions(+), 4 deletions(-)
diff --git a/boost/UnpackedTarball_boost.mk b/boost/UnpackedTarball_boost.mk
index 4db9aef..b7c22f5 100644
--- a/boost/UnpackedTarball_boost.mk
+++ b/boost/UnpackedTarball_boost.mk
@@ -52,6 +52,8 @@
# 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)))
diff --git a/boost/boost.ptree.patch b/boost/boost.ptree.patch
new file mode 100644
index 0000000..3fa98d8
--- /dev/null
+++ b/boost/boost.ptree.patch
@@ -0,0 +1,11 @@
+--- 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();
+ }
diff --git a/download.lst b/download.lst
index e0026dd..42f66d2 100644
--- a/download.lst
+++ b/download.lst
@@ -1,5 +1,5 @@
-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 := 92bde158f249b9b27f76f48cc65a0242
diff --git a/libcdr/ExternalProject_libcdr.mk b/libcdr/ExternalProject_libcdr.mk
index 9193c3c..d7e7693 100644
--- a/libcdr/ExternalProject_libcdr.mk
+++ b/libcdr/ExternalProject_libcdr.mk
@@ -26,6 +26,7 @@
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 @@
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 @@
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 @@
&& 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 @@
--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 $@
diff --git a/libcdr/UnpackedTarball_cdr.mk b/libcdr/UnpackedTarball_cdr.mk
index be1e7d7..a4a427d 100644
--- a/libcdr/UnpackedTarball_cdr.mk
+++ b/libcdr/UnpackedTarball_cdr.mk
@@ -11,4 +11,10 @@
$(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:
diff --git a/libcdr/libcdr-0.0.13.patch b/libcdr/libcdr-0.0.13.patch
new file mode 100644
index 0000000..29b2b28
--- /dev/null
+++ b/libcdr/libcdr-0.0.13.patch
@@ -0,0 +1,12 @@
+--- 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>
diff --git a/libcdr/prj/build.lst b/libcdr/prj/build.lst
index 6c1552e..bbeb2ce 100644
--- a/libcdr/prj/build.lst
+++ b/libcdr/prj/build.lst
@@ -1,2 +1,2 @@
-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
--
To view, visit https://gerrit.libreoffice.org/3559
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic0c538dfad88f850d95f417f2741ef7dba7fc5e4
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Fridrich Strba <fridr...@documentfoundation.org>
_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
