[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - download.lst libvisio/libvisio-0.0.29-remove_whitespace.patch.1 libvisio/UnpackedTarball_visio.mk

[Fridrich Å trba]

 download.lst                                       |    4 ++--
 libvisio/UnpackedTarball_visio.mk                  |    3 +++
 libvisio/libvisio-0.0.29-remove_whitespace.patch.1 |   20 ++++++++++++++++++++
 3 files changed, 25 insertions(+), 2 deletions(-)

New commits:
commit 815e1cb47080df5a85ae747856228db8441336f2
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Tue Jul 2 14:46:55 2013 +0200

    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 at redhat.com>
    Tested-by: David Tardon <dtardon at 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 at free.fr>
    Tested-by: Bosdonnat Cedric <cedric.bosdonnat at 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 at free.fr>
    Tested-by: Bosdonnat Cedric <cedric.bosdonnat at free.fr>

diff --git a/download.lst b/download.lst
index ee3a84d..7961366 100644
--- a/download.lst
+++ b/download.lst
@@ -2,8 +2,8 @@ CDR_MD5SUM := d88f9b94df880d2c05be943b000ca112
 export CDR_TARBALL := libcdr-0.0.14.tar.bz2
 MSPUB_MD5SUM := 1120705cd0f0d9bd5506360bf57b6c2e
 export MSPUB_TARBALL := libmspub-0.0.6.tar.bz2
-VISIO_MD5SUM := 05574c2ec54dd0c29d75cacdf9419f44
-export VISIO_TARBALL := libvisio-0.0.28.tar.bz2
+VISIO_MD5SUM := ca7a83bb2d81467e1f0222980cc08939
+export VISIO_TARBALL := libvisio-0.0.29.tar.bz2
 
 export AFMS_TARBALL := 1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz
 export APACHE_COMMONS_CODEC_TARBALL := af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz
diff --git a/libvisio/UnpackedTarball_visio.mk b/libvisio/UnpackedTarball_visio.mk
index 59c29ac..eacc570 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 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));