[Libreoffice-commits] core.git: libvisio/libvisio-0.0.29-remove_whitespace.patch.1 libvisio/UnpackedTarball_libvisio.mk

[Fridrich Å trba]

 libvisio/UnpackedTarball_libvisio.mk               |    3 +++
 libvisio/libvisio-0.0.29-remove_whitespace.patch.1 |   20 ++++++++++++++++++++
 2 files changed, 23 insertions(+)

New commits:
commit d37723a2496907bf60829306c6509fe24a9c4dbe
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Tue Jul 2 17:00:57 2013 +0200

    Allow build with older boost
    
    Change-Id: I49902109eb2a1b9561a9ccfa70d89c160a4965a9

diff --git a/libvisio/UnpackedTarball_libvisio.mk b/libvisio/UnpackedTarball_libvisio.mk
index f71161a..7e9ce61 100644
--- a/libvisio/UnpackedTarball_libvisio.mk
+++ b/libvisio/UnpackedTarball_libvisio.mk
@@ -11,5 +11,8 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libvisio))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,libvisio,$(VISIO_TARBALL)))
 
+$(eval $(call gb_UnpackedTarball_add_patches,libvisio,\
+	libvisio/libvisio-0.0.29-remove_whitespace.patch.1 \
+))
 
 # vim: set noet sw=4 ts=4:
diff --git a/libvisio/libvisio-0.0.29-remove_whitespace.patch.1 b/libvisio/libvisio-0.0.29-remove_whitespace.patch.1
new file mode 100644
index 0000000..b8f1eb4
--- /dev/null
+++ b/libvisio/libvisio-0.0.29-remove_whitespace.patch.1
@@ -0,0 +1,20 @@
+--- a/src/lib/libvisio_utils.cpp
++++ b/src/lib/libvisio_utils.cpp
+@@ -33,7 +33,6 @@
+ #include "libvisio_utils.h"
+ 
+ #include <boost/archive/iterators/binary_from_base64.hpp>
+-#include <boost/archive/iterators/remove_whitespace.hpp>
+ #include <boost/archive/iterators/transform_width.hpp>
+ 
+ uint8_t libvisio::readU8(WPXInputStream *input)
+@@ -126,8 +125,7 @@ double libvisio::readDouble(WPXInputStream *input)
+ void libvisio::appendFromBase64(WPXBinaryData &data, const unsigned char *base64String, size_t base64StringLength)
+ {
+   typedef boost::archive::iterators::transform_width<
+-  boost::archive::iterators::binary_from_base64<
+-  boost::archive::iterators::remove_whitespace< const char * > >, 8, 6 > base64_decoder;
++  boost::archive::iterators::binary_from_base64< const char * >, 8, 6 > base64_decoder;
+ 
+   std::vector<unsigned char> buffer;
+   std::copy(base64_decoder(base64String), base64_decoder(base64String + base64StringLength), std::back_inserter(buffer));