diff options
| -rw-r--r-- | download.lst | 4 | ||||
| -rw-r--r-- | libvisio/UnpackedTarball_libvisio.mk | 4 | ||||
| -rw-r--r-- | libvisio/libvisio-0.0.29-remove_whitespace.patch.1 | 32 |
3 files changed, 2 insertions, 38 deletions
diff --git a/download.lst b/download.lst index c035773112ca..976e02b1eccb 100644 --- a/download.lst +++ b/download.lst @@ -4,8 +4,8 @@ MSPUB_MD5SUM := 1120705cd0f0d9bd5506360bf57b6c2e export MSPUB_TARBALL := libmspub-0.0.6.tar.bz2 MWAW_MD5SUM := 2289bb137bbba9b473ce60168895c036 export MWAW_TARBALL := libmwaw-0.1.10.tar.bz2 -VISIO_MD5SUM := ca7a83bb2d81467e1f0222980cc08939 -export VISIO_TARBALL := libvisio-0.0.29.tar.bz2 +VISIO_MD5SUM := 9d9eb3ae6bee763c161228b2b12e25f8 +export VISIO_TARBALL := libvisio-0.0.30.tar.bz2 export AFMS_TARBALL := 1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz export APACHE_COMMONS_CODEC_TARBALL := 2e482c7567908d334785ce7d69ddfff7-commons-codec-1.6-src.tar.gz diff --git a/libvisio/UnpackedTarball_libvisio.mk b/libvisio/UnpackedTarball_libvisio.mk index 7e9ce6155226..e4c0561f72f8 100644 --- a/libvisio/UnpackedTarball_libvisio.mk +++ b/libvisio/UnpackedTarball_libvisio.mk @@ -11,8 +11,4 @@ $(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 deleted file mode 100644 index 61dc118134e4..000000000000 --- a/libvisio/libvisio-0.0.29-remove_whitespace.patch.1 +++ /dev/null @@ -1,32 +0,0 @@ ---- a/src/lib/libvisio_utils.cpp -+++ b/src/lib/libvisio_utils.cpp -@@ -123,14 +123,15 @@ double libvisio::readDouble(WPXInputStream *input) - return tmpUnion.d; - } - --void libvisio::appendFromBase64(WPXBinaryData &data, const unsigned char *base64String, size_t base64StringLength) -+void libvisio::appendFromBase64(WPXBinaryData &data, const unsigned char *base64Data, size_t base64DataLength) - { -+ std::string base64String((const char*)base64Data, base64DataLength); - 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::remove_whitespace< std::string::const_iterator > >, 8, 6 > base64_decoder; - - std::vector<unsigned char> buffer; -- std::copy(base64_decoder(base64String), base64_decoder(base64String + base64StringLength), std::back_inserter(buffer)); -+ std::copy(base64_decoder(base64String.begin()), base64_decoder(base64String.end()), std::back_inserter(buffer)); - - if (!buffer.empty()) - data.append(&buffer[0], buffer.size()); ---- a/src/lib/libvisio_utils.h -+++ b/src/lib/libvisio_utils.h -@@ -98,7 +98,7 @@ uint64_t readU64(WPXInputStream *input); - - double readDouble(WPXInputStream *input); - --void appendFromBase64(WPXBinaryData &data, const unsigned char *base64String, size_t base64StringLength); -+void appendFromBase64(WPXBinaryData &data, const unsigned char *base64Data, size_t base64DataLength); - - const ::WPXString getColourString(const Colour &c); - |