Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3553
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/53/3553/1
Uploading LGM2013 version of libcdr
(cherry picked from commit 4757ffcc5cea1d627f57e551b7af0b39c8e40b47)
Conflicts:
libcdr/ExternalProject_libcdr.mk
Change-Id: Icdf57cb8a40256b4a474ededd3ba030bd79497f4
---
M download.lst
M libcdr/ExternalProject_libcdr.mk
M libcdr/prj/build.lst
3 files changed, 8 insertions(+), 4 deletions(-)
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/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/3553
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icdf57cb8a40256b4a474ededd3ba030bd79497f4
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
