[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - download.lst external/libwpg

[David Tardon]

 download.lst                              |    5 +++--
 external/libwpg/ExternalPackage_libwpg.mk |    2 +-
 external/libwpg/Library_wpg.mk            |    1 +
 3 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 4c0a110a5963d81135a4390fb315f58dbd890250
Author: David Tardon <dtardon at redhat.com>
Date:   Sat Dec 26 19:30:53 2015 +0100

    upload libwpg 0.3.1
    
    Change-Id: I27f8039f65777c37ce8191f37dc3daa8728667dd
    (cherry picked from commit cda2cca1b759b6be7ec9c62dfe5c9e3eed02b140)
    Reviewed-on: https://gerrit.libreoffice.org/20964
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
    Reviewed-by: Fridrich Strba <fridrich at documentfoundation.org>
    Tested-by: Fridrich Strba <fridrich at documentfoundation.org>

diff --git a/download.lst b/download.lst
index 49ff580..998b9bc 100755
--- a/download.lst
+++ b/download.lst
@@ -149,8 +149,9 @@ 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 WPG_MD5SUM := 17da9770cb8b317b7633f9807b32b71a
-export WPG_TARBALL := libwpg-0.3.0.tar.bz2
+export WPG_MD5SUM := dfd066658ec9d2fb2262417039a8a1c3
+export WPG_VERSION_MICRO := 1
+export WPG_TARBALL := libwpg-0.3.$(WPG_VERSION_MICRO).tar.bz2
 export WPS_MD5SUM := 8a6c55542ce80203dd6d3b1cba99d4e5
 export WPS_VERSION_MICRO := 2
 export WPS_TARBALL := libwps-0.4.$(WPS_VERSION_MICRO).tar.bz2
diff --git a/external/libwpg/ExternalPackage_libwpg.mk b/external/libwpg/ExternalPackage_libwpg.mk
index 9de3845..c3eb05c 100644
--- a/external/libwpg/ExternalPackage_libwpg.mk
+++ b/external/libwpg/ExternalPackage_libwpg.mk
@@ -16,7 +16,7 @@ $(eval $(call gb_ExternalPackage_add_file,libwpg,$(LIBO_LIB_FOLDER)/libwpg-0.3.3
 else ifeq ($(OS),WNT)
 $(eval $(call gb_ExternalPackage_add_file,libwpg,$(LIBO_LIB_FOLDER)/libwpg-0.3.dll,src/lib/.libs/libwpg-0.3.dll))
 else ifeq ($(DISABLE_DYNLOADING),)
-$(eval $(call gb_ExternalPackage_add_file,libwpg,$(LIBO_LIB_FOLDER)/libwpg-0.3-lo.so.3,src/lib/.libs/libwpg-0.3-lo.so.3.0.0))
+$(eval $(call gb_ExternalPackage_add_file,libwpg,$(LIBO_LIB_FOLDER)/libwpg-0.3-lo.so.3,src/lib/.libs/libwpg-0.3-lo.so.3.0.$(WPG_VERSION_MICRO)))
 endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libwpg/Library_wpg.mk b/external/libwpg/Library_wpg.mk
index f1ac991..896fab1 100644
--- a/external/libwpg/Library_wpg.mk
+++ b/external/libwpg/Library_wpg.mk
@@ -41,6 +41,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,wpg,\
 	UnpackedTarball/libwpg/src/lib/WPGHeader \
 	UnpackedTarball/libwpg/src/lib/WPGXParser \
 	UnpackedTarball/libwpg/src/lib/WPGraphics \
+	UnpackedTarball/libwpg/src/lib/libwpg_utils \
 ))
 
 # vim: set noet sw=4 ts=4: