diff options
| -rw-r--r-- | download.lst | 4 | ||||
| -rw-r--r-- | libvisio/ExternalProject_libvisio.mk | 9 | ||||
| -rw-r--r-- | libvisio/UnpackedTarball_visio.mk | 5 | ||||
| -rw-r--r-- | libvisio/libvisio-0.0.25.patch | 14 |
4 files changed, 9 insertions, 23 deletions
diff --git a/download.lst b/download.lst index a119ffaeafef..7d79b71bd309 100644 --- a/download.lst +++ b/download.lst @@ -4,8 +4,8 @@ MSPUB_MD5SUM := 881c4628ec5f54d47f35d5d19e335662 export MSPUB_TARBALL := libmspub-0.0.5.tar.bz2 MWAW_MD5SUM := 7c08542921466eee797e0be23e9535b3 export MWAW_TARBALL := libmwaw-0.1.7.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 := 2e482c7567908d334785ce7d69ddfff7-commons-codec-1.6-src.tar.gz diff --git a/libvisio/ExternalProject_libvisio.mk b/libvisio/ExternalProject_libvisio.mk index 30cffae886bc..6364a9e32d8a 100644 --- a/libvisio/ExternalProject_libvisio.mk +++ b/libvisio/ExternalProject_libvisio.mk @@ -19,6 +19,7 @@ $(eval $(call gb_ExternalProject_register_targets,libvisio,\ $(eval $(call gb_ExternalProject_use_externals,libvisio,\ boost_headers \ + icu \ wpd \ wpg \ libxml2 \ @@ -27,8 +28,12 @@ $(eval $(call gb_ExternalProject_use_externals,libvisio,\ $(call gb_ExternalProject_get_state_target,libvisio,build) : $(call gb_ExternalProject_run,build,\ - PKG_CONFIG="" \ - ./configure \ + export PKG_CONFIG="" \ + && export ICU_LIBS=" " \ + && export ICU_CFLAGS="$(if $(filter NO,$(SYSTEM_ICU)),\ + -I$(call gb_UnpackedTarball_get_dir,icu)/source/i18n \ + -I$(call gb_UnpackedTarball_get_dir,icu)/source/common, )" \ + && ./configure \ --with-pic \ --enable-static \ --disable-shared \ diff --git a/libvisio/UnpackedTarball_visio.mk b/libvisio/UnpackedTarball_visio.mk index 98313c170441..59c29ac83a7d 100644 --- a/libvisio/UnpackedTarball_visio.mk +++ b/libvisio/UnpackedTarball_visio.mk @@ -11,10 +11,5 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,visio)) $(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 6294548d1d8f..000000000000 --- 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) |