[Libreoffice-commits] core.git: libcdr/libcdr-0.0.13.patch libcdr/UnpackedTarball_cdr.mk

Fridrich Å trba fridrich.strba at bluewin.ch
Mon Apr 22 10:40:44 PDT 2013


 libcdr/UnpackedTarball_cdr.mk |    6 ++++++
 libcdr/libcdr-0.0.13.patch    |   12 ++++++++++++
 2 files changed, 18 insertions(+)

New commits:
commit 1e392ea7a0d1504f701f9fed1492e64a78a65339
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Mon Apr 22 19:39:51 2013 +0200

    Trying to avoid linking with boost on Windows
    
    Change-Id: Ic0c538dfad88f850d95f417f2741ef7dba7fc5e4

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_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:
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>


More information about the Libreoffice-commits mailing list