From ee311d2ad221e5a26cacde6aba3bd3b982d99c83 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Sat, 18 Apr 2020 13:54:18 +0200 Subject: upload libmwaw 0.3.16 Change-Id: Idc7ed6bbcd3298138fb92c81ddf7dd6278d201dc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92472 Tested-by: Jenkins Reviewed-by: David Tardon (cherry picked from commit 56c4444638c0ebb21711b02d1ff235a3ffd3f232) --- configure.ac | 2 +- download.lst | 4 ++-- external/libmwaw/Library_mwaw.mk | 4 ++++ solenv/flatpak-manifest.in | 6 +++--- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index b6e661d07e33..9a77d34082b2 100644 --- a/configure.ac +++ b/configure.ac @@ -7876,7 +7876,7 @@ libo_CHECK_SYSTEM_MODULE([libcdr],[CDR],[libcdr-0.1]) libo_CHECK_SYSTEM_MODULE([libmspub],[MSPUB],[libmspub-0.1]) libo_CHECK_SYSTEM_MODULE([libmwaw],[MWAW],[libmwaw-0.3 >= 0.3.1]) -libo_PKG_VERSION([MWAW], [libmwaw-0.3], [0.3.15]) +libo_PKG_VERSION([MWAW], [libmwaw-0.3], [0.3.16]) libo_CHECK_SYSTEM_MODULE([libetonyek],[ETONYEK],[libetonyek-0.1]) libo_PKG_VERSION([ETONYEK], [libetonyek-0.1], [0.1.8]) diff --git a/download.lst b/download.lst index c0cf41682685..0dcb91c97f77 100644 --- a/download.lst +++ b/download.lst @@ -172,8 +172,8 @@ export MDNSRESPONDER_SHA256SUM := e777b4d7dbf5eb1552cb80090ad1ede319067ab6e45e39 export MDNSRESPONDER_TARBALL := mDNSResponder-878.200.35.tar.gz export MSPUB_SHA256SUM := ef36c1a1aabb2ba3b0bedaaafe717bf4480be2ba8de6f3894be5fd3702b013ba export MSPUB_TARBALL := libmspub-0.1.4.tar.xz -export MWAW_SHA256SUM := 0440bb09f05e3419423d8dfa36ee847056ebfd837f9cbc091fdb5b057daab0b1 -export MWAW_VERSION_MICRO := 15 +export MWAW_SHA256SUM := 0c639edba5297bde5575193bf5b5f2f469956beaff5c0206d91ce9df6bde1868 +export MWAW_VERSION_MICRO := 16 export MWAW_TARBALL := libmwaw-0.3.$(MWAW_VERSION_MICRO).tar.xz export MYSQL_CONNECTOR_CPP_SHA256SUM := a25f14dad39e93a2f9cdf09166ee53981f7212dce829e4208e07a522963a8585 export MYSQL_CONNECTOR_CPP_TARBALL := 7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz diff --git a/external/libmwaw/Library_mwaw.mk b/external/libmwaw/Library_mwaw.mk index 4c9a8b43c56f..2e7d1e2246fa 100644 --- a/external/libmwaw/Library_mwaw.mk +++ b/external/libmwaw/Library_mwaw.mk @@ -119,6 +119,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,mwaw,\ UnpackedTarball/libmwaw/src/lib/MWAWSpreadsheetDecoder \ UnpackedTarball/libmwaw/src/lib/MWAWSpreadsheetEncoder \ UnpackedTarball/libmwaw/src/lib/MWAWSpreadsheetListener \ + UnpackedTarball/libmwaw/src/lib/MWAWStream \ UnpackedTarball/libmwaw/src/lib/MWAWStringStream \ UnpackedTarball/libmwaw/src/lib/MWAWSubDocument \ UnpackedTarball/libmwaw/src/lib/MWAWTable \ @@ -172,10 +173,13 @@ $(eval $(call gb_Library_add_generated_exception_objects,mwaw,\ UnpackedTarball/libmwaw/src/lib/PowerPoint7Text \ UnpackedTarball/libmwaw/src/lib/RagTime5Chart \ UnpackedTarball/libmwaw/src/lib/RagTime5ClusterManager \ + UnpackedTarball/libmwaw/src/lib/RagTime5Document \ + UnpackedTarball/libmwaw/src/lib/RagTime5Formula \ UnpackedTarball/libmwaw/src/lib/RagTime5Graph \ UnpackedTarball/libmwaw/src/lib/RagTime5Layout \ UnpackedTarball/libmwaw/src/lib/RagTime5Parser \ UnpackedTarball/libmwaw/src/lib/RagTime5Pipeline \ + UnpackedTarball/libmwaw/src/lib/RagTime5SSParser \ UnpackedTarball/libmwaw/src/lib/RagTime5Spreadsheet \ UnpackedTarball/libmwaw/src/lib/RagTime5StructManager \ UnpackedTarball/libmwaw/src/lib/RagTime5StyleManager \ diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in index e0bc79e80a38..fca238659291 100644 --- a/solenv/flatpak-manifest.in +++ b/solenv/flatpak-manifest.in @@ -297,10 +297,10 @@ "dest-filename": "external/tarballs/libmspub-0.1.4.tar.xz" }, { - "url": "https://dev-www.libreoffice.org/src/libmwaw-0.3.15.tar.xz", - "sha256": "0440bb09f05e3419423d8dfa36ee847056ebfd837f9cbc091fdb5b057daab0b1", + "url": "https://dev-www.libreoffice.org/src/libmwaw-0.3.16.tar.xz", + "sha256": "0c639edba5297bde5575193bf5b5f2f469956beaff5c0206d91ce9df6bde1868", "type": "file", - "dest-filename": "external/tarballs/libmwaw-0.3.15.tar.xz" + "dest-filename": "external/tarballs/libmwaw-0.3.16.tar.xz" }, { "url": "https://dev-www.libreoffice.org/src/libodfgen-0.1.6.tar.bz2", -- cgit