diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2013-07-02 14:46:55 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2013-11-05 11:31:26 +0100 |
| commit | 3740664534d6e74b1b3e5d425fcc71d5855a2c6c (patch) | |
| tree | 2377a64bbf018811969cb9fb253e46fa16a37915 /libvisio | |
| parent | 00ad7e5e95fe1ab5886c9454f582166e4d1c892a (diff) | |
Uploading new libvisio 0.0.29, fixing fdo#66421
(cherry picked from commit 50b0bf15bf0e173ba449efed93ef3909253b9988)
Reviewed-on: https://gerrit.libreoffice.org/4678
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
(cherry picked from commit 3820420edfb828e49735becf796803f0558ef844)
Conflicts:
download.lst
Change-Id: I7b9bc581c81caf74cb6f922abc2cfaee87b20572
Allow build with older boost
(cherry picked from commit d37723a2496907bf60829306c6509fe24a9c4dbe)
Reviewed-on: https://gerrit.libreoffice.org/4681
Reviewed-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr>
Tested-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr>
(cherry picked from commit 48259302d6cdf069fccc00461e7ad44b414f93e5)
Conflicts:
libvisio/UnpackedTarball_libvisio.mk
Change-Id: I49902109eb2a1b9561a9ccfa70d89c160a4965a9
Reviewed-on: https://gerrit.libreoffice.org/4711
Reviewed-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr>
Tested-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr>
Diffstat (limited to 'libvisio')
| -rw-r--r-- | libvisio/UnpackedTarball_visio.mk | 3 | ||||
| -rw-r--r-- | libvisio/libvisio-0.0.29-remove_whitespace.patch.1 | 20 |
2 files changed, 23 insertions, 0 deletions
diff --git a/libvisio/UnpackedTarball_visio.mk b/libvisio/UnpackedTarball_visio.mk index 59c29ac83a7d..eacc570d64e5 100644 --- a/libvisio/UnpackedTarball_visio.mk +++ b/libvisio/UnpackedTarball_visio.mk @@ -11,5 +11,8 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,visio)) $(eval $(call gb_UnpackedTarball_set_tarball,visio,$(VISIO_TARBALL))) +$(eval $(call gb_UnpackedTarball_add_patches,visio,\ + 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 000000000000..b8f1eb43d3c7 --- /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)); |