download.lst | 5 +++--
external/libwpd/ExternalPackage_libwpd.mk | 2 +-
external/libwpd/Library_wpd.mk | 1 +
3 files changed, 5 insertions(+), 3 deletions(-)
New commits:
commit fac9ab428f280ab44d54841254757d0c6f876186
Author: David Tardon <dtar...@redhat.com>
Date: Wed Dec 30 11:20:56 2015 +0100
upload libwpd 0.10.1
(cherry picked from commit 9bfa7afe1563e5429897ca79928ecfe7dff48bb5)
Change-Id: Iba35a273230c96914d527475a8cefcbfab14c341
diff --git a/download.lst b/download.lst
index d14ae47..26912a5 100755
--- a/download.lst
+++ b/download.lst
@@ -147,8 +147,9 @@ export UCPP_TARBALL :=
0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
export VIGRA_TARBALL := d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz
export VISIO_MD5SUM := cbee198a78b842b2087f32d33c522818
export VISIO_TARBALL := libvisio-0.1.5.tar.bz2
-export WPD_MD5SUM := 0773d79a1f240ef9f4f20242b13c5bb7
-export WPD_TARBALL := libwpd-0.10.0.tar.bz2
+export WPD_MD5SUM := 79b56bcc349264d686a67994506ad199
+export WPD_VERSION_MICRO := 1
+export WPD_TARBALL := libwpd-0.10.$(WPD_VERSION_MICRO).tar.bz2
export WPG_MD5SUM := dfd066658ec9d2fb2262417039a8a1c3
export WPG_VERSION_MICRO := 1
export WPG_TARBALL := libwpg-0.3.$(WPG_VERSION_MICRO).tar.bz2
diff --git a/external/libwpd/ExternalPackage_libwpd.mk
b/external/libwpd/ExternalPackage_libwpd.mk
index 61702da..cc1ebb4 100644
--- a/external/libwpd/ExternalPackage_libwpd.mk
+++ b/external/libwpd/ExternalPackage_libwpd.mk
@@ -16,7 +16,7 @@ $(eval $(call
gb_ExternalPackage_add_file,libwpd,$(LIBO_LIB_FOLDER)/libwpd-0.10.
else ifeq ($(OS),WNT)
$(eval $(call
gb_ExternalPackage_add_file,libwpd,$(LIBO_LIB_FOLDER)/libwpd-0.10.dll,src/lib/.libs/libwpd-0.10.dll))
else ifeq ($(DISABLE_DYNLOADING),)
-$(eval $(call
gb_ExternalPackage_add_file,libwpd,$(LIBO_LIB_FOLDER)/libwpd-0.10-lo.so.10,src/lib/.libs/libwpd-0.10-lo.so.10.0.0))
+$(eval $(call
gb_ExternalPackage_add_file,libwpd,$(LIBO_LIB_FOLDER)/libwpd-0.10-lo.so.10,src/lib/.libs/libwpd-0.10-lo.so.10.0.$(WPD_VERSION_MICRO)))
endif
# vim: set noet sw=4 ts=4:
diff --git a/external/libwpd/Library_wpd.mk b/external/libwpd/Library_wpd.mk
index a181745..3668e71 100644
--- a/external/libwpd/Library_wpd.mk
+++ b/external/libwpd/Library_wpd.mk
@@ -165,6 +165,7 @@ $(eval $(call
gb_Library_add_generated_exception_objects,wpd,\
UnpackedTarball/libwpd/src/lib/WP6Header \
UnpackedTarball/libwpd/src/lib/WP6HeaderFooterGroup \
UnpackedTarball/libwpd/src/lib/WP6HighlightGroup \
+ UnpackedTarball/libwpd/src/lib/WP6HyperlinkPacket \
UnpackedTarball/libwpd/src/lib/WP6Listener \
UnpackedTarball/libwpd/src/lib/WP6NumberingMethodGroup \
UnpackedTarball/libwpd/src/lib/WP6OutlineStylePacket \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
