Date: prev next · Thread: first prev next last
2013 Archives by date, by thread · List index


Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/3601

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/01/3601/1

Uploading new fresh wonderful libvisio-0.0.26

The release fixes several instances of data loss during conversion:
  * Fix missing WMFs in some Visio files
  * Don't truncate end of the text
and some problems with text encoding and display:
  * Use ICU for text encoding conversions
  * Honour the "HideText" property

(cherry picked from commit 105bb26e53049a317a43c13ebd9f706df760f27f)

Conflicts:
        download.lst
        libvisio/ExternalProject_libvisio.mk

Reviewed-on: https://gerrit.libreoffice.org/3552
Reviewed-by: Michael Meeks <michael.meeks@suse.com>
Tested-by: Michael Meeks <michael.meeks@suse.com>
(cherry picked from commit 0deb04fb8613c8aaf1ca9154b5ac53c0e0889d40)

Change-Id: I00f18e64f60358f826720cc8d6af36c77a98a062
---
M download.lst
M libvisio/ExternalProject_libvisio.mk
M libvisio/UnpackedTarball_visio.mk
D libvisio/libvisio-0.0.25.patch
M libvisio/prj/build.lst
5 files changed, 11 insertions(+), 24 deletions(-)



diff --git a/download.lst b/download.lst
index e0026dd..36c4fe9 100644
--- a/download.lst
+++ b/download.lst
@@ -2,8 +2,8 @@
 export CDR_TARBALL := libcdr-0.0.12.tar.bz2
 MSPUB_MD5SUM := 881c4628ec5f54d47f35d5d19e335662
 export MSPUB_TARBALL := libmspub-0.0.5.tar.bz2
-VISIO_MD5SUM := 92bde158f249b9b27f76f48cc65a0242
-export VISIO_TARBALL := libvisio-0.0.25.tar.bz2
+VISIO_MD5SUM := 2f638cf6f92cec59c9205ac3cbf1702e
+export VISIO_TARBALL := libvisio-0.0.26.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/ExternalProject_libvisio.mk b/libvisio/ExternalProject_libvisio.mk
index 3862799..940d3cd 100644
--- a/libvisio/ExternalProject_libvisio.mk
+++ b/libvisio/ExternalProject_libvisio.mk
@@ -31,6 +31,7 @@
        && export LIBWPG_INCLUDE_DIR=$(OUTDIR)/inc/external \
        && export LIBXML_INCLUDE_DIR=$(OUTDIR)/inc/external \
        && export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \
+       && export ICU_INCLUDE_DIR=$(OUTDIR)/inc/external \
        && $(COMPATH)/vcpackages/vcbuild.exe libvisio.vcproj "Release|Win32" \
        && touch $@
 else ifeq ($(VCVER),100)
@@ -41,6 +42,7 @@
        && export LIBWPG_INCLUDE_DIR=$(OUTDIR)/inc/external \
        && export LIBXML_INCLUDE_DIR=$(OUTDIR)/inc/extrenal \
        && export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \
+       && export ICU_INCLUDE_DIR=$(OUTDIR)/inc/external \
        && msbuild.exe libvisio.vcxproj /p:Configuration=Release \
        && touch $@
 else
@@ -51,6 +53,7 @@
        && export LIBWPG_INCLUDE_DIR=$(OUTDIR)/inc/external \
        && export LIBXML_INCLUDE_DIR=$(OUTDIR)/inc/external \
        && export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \
+       && export ICU_INCLUDE_DIR=$(OUTDIR)/inc/external \
        && msbuild.exe libvisio.vcxproj /p:PlatformToolset=v110 /p:Configuration=Release \
        && touch $@
 endif
@@ -59,8 +62,11 @@
 
 $(call gb_ExternalProject_get_state_target,libvisio,build) :
        cd $(EXTERNAL_WORKDIR) \
-       && PKG_CONFIG="" \
-       ./configure \
+       && export PKG_CONFIG="" \
+       && export ICU_LIBS=" " \
+       $(if $(filter NO,$(SYSTEM_ICU)),&& export ICU_CFLAGS="-I$(OUTDIR)/inc/external") \
+       $(if $(filter YES,$(SYSTEM_ICU)),&& export ICU_CFLAGS=" ") \
+       && ./configure \
                --with-pic \
                --enable-static \
                --disable-shared \
diff --git a/libvisio/UnpackedTarball_visio.mk b/libvisio/UnpackedTarball_visio.mk
index 98313c1..59c29ac 100644
--- a/libvisio/UnpackedTarball_visio.mk
+++ b/libvisio/UnpackedTarball_visio.mk
@@ -11,10 +11,5 @@
 
 $(eval $(call gb_UnpackedTarball_set_tarball,visio,$(VISIO_TARBALL)))
 
-$(eval $(call gb_UnpackedTarball_set_patchlevel,visio,1))
-
-$(eval $(call gb_UnpackedTarball_add_patches,visio,\
-       libvisio/libvisio-0.0.25.patch \
-))
 
 # vim: set noet sw=4 ts=4:
diff --git a/libvisio/libvisio-0.0.25.patch b/libvisio/libvisio-0.0.25.patch
deleted file mode 100644
index 6294548..0000000
--- a/libvisio/libvisio-0.0.25.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/src/lib/VSDContentCollector.cpp
-+++ b/src/lib/VSDContentCollector.cpp
-@@ -2920,10 +2920,8 @@ void libvisio::VSDContentCollector::appendCharacters(WPXString &text, const 
std:
-     while (true)
-     {
-       if (iter == characters.end())
--      {
--        fail = true;
-         break;
--      }
-+
-       uint16_t character = *iter++;
-       character |= (uint16_t)(*iter++) << 8;
-       if (character == 0xfffc)
diff --git a/libvisio/prj/build.lst b/libvisio/prj/build.lst
index 5fdc953..3bb2b3e 100644
--- a/libvisio/prj/build.lst
+++ b/libvisio/prj/build.lst
@@ -1,2 +1,2 @@
-vsd    libvisio        : LIBWPD:libwpd LIBWPD:libwpg BOOST:boost LIBXML2:libxml2 ZLIB:zlib 
soltools NULL
+vsd    libvisio        : LIBWPD:libwpd LIBWPD:libwpg BOOST:boost ICU:icu LIBXML2:libxml2 ZLIB:zlib 
soltools NULL
 vsd    libvisio\prj    nmake   -       all     vsd_libvisio NULL

-- 
To view, visit https://gerrit.libreoffice.org/3601
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I00f18e64f60358f826720cc8d6af36c77a98a062
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0-3
Gerrit-Owner: Fridrich Strba <fridrich@documentfoundation.org>


Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.