download.lst | 4 +- libvisio/UnpackedTarball_visio.mk | 4 -- libvisio/libvisio-0.0.29-remove_whitespace.patch.1 | 32 --------------------- 3 files changed, 2 insertions(+), 38 deletions(-)
New commits: commit a2fcb02c4bc90c1fce99a42c96e02605e9870669 Author: Fridrich Å trba <fridrich.st...@bluewin.ch> Date: Wed Jul 10 15:41:17 2013 +0200 Uploading new libvisio 0.0.30 with huge performance/memory consumption improvements with NURBS and B-Splines (cherry picked from commit 0f978a88c618af59e77aeba920093c5e67559c88) Conflicts: download.lst libvisio/UnpackedTarball_libvisio.mk Change-Id: I5f338d6c70f948dd2192ec7147efdc1bdeef1e05 Reviewed-on: https://gerrit.libreoffice.org/4812 Reviewed-by: Petr Mladek <pmla...@suse.cz> Tested-by: Petr Mladek <pmla...@suse.cz> diff --git a/download.lst b/download.lst index 7961366..7c9dbd5 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 := 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 := af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz diff --git a/libvisio/UnpackedTarball_visio.mk b/libvisio/UnpackedTarball_visio.mk index eacc570..aa9113b 100644 --- a/libvisio/UnpackedTarball_visio.mk +++ b/libvisio/UnpackedTarball_visio.mk @@ -11,8 +11,4 @@ $(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 deleted file mode 100644 index 61dc118..0000000 --- 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); -
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits