diff options
| author | David Tardon <dtardon@redhat.com> | 2018-12-29 14:14:13 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2018-12-29 16:42:23 +0100 |
| commit | 87742f16e2d3f1c58534508b724268b9ce675c8e (patch) | |
| tree | 5654c20f59b383272faa170ae1d1ae93ec95f54f | |
| parent | aeb54120a47768ca3dc92f5bbb715ee491646e48 (diff) | |
upload libwpd 0.10.3
Change-Id: I68e3791f50b95956bfe6aae743978994a5f232b4
Reviewed-on: https://gerrit.libreoffice.org/65714
Tested-by: Jenkins
Reviewed-by: David Tardon <dtardon@redhat.com>
| -rw-r--r-- | download.lst | 4 | ||||
| -rw-r--r-- | external/libwpd/Library_wpd.mk | 2 | ||||
| -rw-r--r-- | external/libwpd/libwpd-bundled-soname.patch.0 | 3 | ||||
| -rw-r--r-- | solenv/flatpak-manifest.in | 6 |
4 files changed, 8 insertions, 7 deletions
diff --git a/download.lst b/download.lst index 947d1869cfd2..792c808d8a2b 100644 --- a/download.lst +++ b/download.lst @@ -238,8 +238,8 @@ export UCPP_SHA256SUM := 983941d31ee8d366085cadf28db75eb1f5cb03ba1e5853b98f12f7f export UCPP_TARBALL := 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz export VISIO_SHA256SUM := fe1002d3671d53c09bc65e47ec948ec7b67e6fb112ed1cd10966e211a8bb50f9 export VISIO_TARBALL := libvisio-0.1.6.tar.xz -export WPD_SHA256SUM := 323f68beaf4f35e5a4d7daffb4703d0566698280109210fa4eaa90dea27d6610 -export WPD_VERSION_MICRO := 2 +export WPD_SHA256SUM := 2465b0b662fdc5d4e3bebcdc9a79027713fb629ca2bff04a3c9251fdec42dd09 +export WPD_VERSION_MICRO := 3 export WPD_TARBALL := libwpd-0.10.$(WPD_VERSION_MICRO).tar.xz export WPG_SHA256SUM := 57faf1ab97d63d57383ac5d7875e992a3d190436732f4083310c0471e72f8c33 export WPG_VERSION_MICRO := 2 diff --git a/external/libwpd/Library_wpd.mk b/external/libwpd/Library_wpd.mk index 62285858468f..2c84a5b5bb24 100644 --- a/external/libwpd/Library_wpd.mk +++ b/external/libwpd/Library_wpd.mk @@ -192,6 +192,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,wpd,\ UnpackedTarball/libwpd/src/lib/WPXContentListener \ UnpackedTarball/libwpd/src/lib/WPXEncryption \ UnpackedTarball/libwpd/src/lib/WPXHeader \ + UnpackedTarball/libwpd/src/lib/WPXHeaderFooter \ UnpackedTarball/libwpd/src/lib/WPXListener \ UnpackedTarball/libwpd/src/lib/WPXMemoryStream \ UnpackedTarball/libwpd/src/lib/WPXPageSpan \ @@ -199,6 +200,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,wpd,\ UnpackedTarball/libwpd/src/lib/WPXStylesListener \ UnpackedTarball/libwpd/src/lib/WPXSubDocument \ UnpackedTarball/libwpd/src/lib/WPXTable \ + UnpackedTarball/libwpd/src/lib/WPXTableList \ UnpackedTarball/libwpd/src/lib/libwpd_internal \ UnpackedTarball/libwpd/src/lib/libwpd_math \ )) diff --git a/external/libwpd/libwpd-bundled-soname.patch.0 b/external/libwpd/libwpd-bundled-soname.patch.0 index 04661f2d464b..2a669748f21d 100644 --- a/external/libwpd/libwpd-bundled-soname.patch.0 +++ b/external/libwpd/libwpd-bundled-soname.patch.0 @@ -1,7 +1,6 @@ --- src/lib/Makefile.in.orig 2015-08-06 21:41:41.073622494 +0200 +++ src/lib/Makefile.in 2015-08-06 21:42:09.377622009 +0200 -@@ -429,7 +429,7 @@ - AM_CXXFLAGS = -I$(top_srcdir)/inc $(REVENGE_CFLAGS) $(DEBUG_CXXFLAGS) -DLIBWPD_BUILD=1 +@@ -429,6 +429,6 @@ libwpd_@WPD_MAJOR_VERSION@_@WPD_MINOR_VERSION@_la_LIBADD = $(REVENGE_LIBS) @LIBWPD_WIN32_RESOURCE@ libwpd_@WPD_MAJOR_VERSION@_@WPD_MINOR_VERSION@_la_DEPENDENCIES = @LIBWPD_WIN32_RESOURCE@ -libwpd_@WPD_MAJOR_VERSION@_@WPD_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic $(no_undefined) diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in index 3cb422ab70cd..3f8323a66935 100644 --- a/solenv/flatpak-manifest.in +++ b/solenv/flatpak-manifest.in @@ -301,10 +301,10 @@ "dest-filename": "external/tarballs/libvisio-0.1.6.tar.xz" }, { - "url": "https://dev-www.libreoffice.org/src/libwpd-0.10.2.tar.xz", - "sha256": "323f68beaf4f35e5a4d7daffb4703d0566698280109210fa4eaa90dea27d6610", + "url": "https://dev-www.libreoffice.org/src/libwpd-0.10.3.tar.xz", + "sha256": "2465b0b662fdc5d4e3bebcdc9a79027713fb629ca2bff04a3c9251fdec42dd09", "type": "file", - "dest-filename": "external/tarballs/libwpd-0.10.2.tar.xz" + "dest-filename": "external/tarballs/libwpd-0.10.3.tar.xz" }, { "url": "https://dev-www.libreoffice.org/src/libwpg-0.3.2.tar.xz", |