diff options
author | David Tardon <dtardon@redhat.com> | 2021-04-08 20:32:19 +0200 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2021-04-09 07:58:09 +0200 |
commit | 5e27230f45c7ecf32a98076302179d96f4f65219 (patch) | |
tree | 30db40985f6cf9d333763954b4c6fec4981b6714 | |
parent | 7c6605bd2c1b27c12c4a492921e537eb4bf5a98e (diff) |
upload libmwaw 0.3.18
Change-Id: I6ffa01f092455f79bb3690875e1b286ae2298832
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113819
Tested-by: Jenkins
Reviewed-by: David Tardon <dtardon@redhat.com>
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | download.lst | 4 | ||||
-rw-r--r-- | external/libmwaw/0001-drop-unneeded-include.patch.1 | 25 | ||||
-rw-r--r-- | external/libmwaw/Library_mwaw.mk | 4 | ||||
-rw-r--r-- | external/libmwaw/UnpackedTarball_libmwaw.mk | 4 | ||||
-rw-r--r-- | solenv/flatpak-manifest.in | 6 |
6 files changed, 39 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index 3df488a662c2..3a03dd38290f 100644 --- a/configure.ac +++ b/configure.ac @@ -9116,7 +9116,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.17]) +libo_PKG_VERSION([MWAW], [libmwaw-0.3], [0.3.18]) 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 3c3462552d74..45fdc3a0e5ff 100644 --- a/download.lst +++ b/download.lst @@ -186,8 +186,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 := 8e1537eb1de1b4714f4bf0a20478f342c5d71a65bf99307a694b1e9e30bb911c -export MWAW_VERSION_MICRO := 17 +export MWAW_SHA256SUM := fc5d051680f8000be64ffebc0b0c58716b1c9bf06003ec399387b109d1ed1e0f +export MWAW_VERSION_MICRO := 18 export MWAW_TARBALL := libmwaw-0.3.$(MWAW_VERSION_MICRO).tar.xz export MYTHES_SHA256SUM := 1e81f395d8c851c3e4e75b568e20fa2fa549354e75ab397f9de4b0e0790a305f export MYTHES_TARBALL := a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz diff --git a/external/libmwaw/0001-drop-unneeded-include.patch.1 b/external/libmwaw/0001-drop-unneeded-include.patch.1 new file mode 100644 index 000000000000..505f38daf80a --- /dev/null +++ b/external/libmwaw/0001-drop-unneeded-include.patch.1 @@ -0,0 +1,25 @@ +From db0450c5bacdf0f3970a8838ff989b7e5390ffff Mon Sep 17 00:00:00 2001 +From: David Tardon <dtardon@redhat.com> +Date: Thu, 8 Apr 2021 23:07:13 +0200 +Subject: [PATCH] drop unneeded include + +--- + src/lib/Canvas5StyleManager.cxx | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/src/lib/Canvas5StyleManager.cxx b/src/lib/Canvas5StyleManager.cxx +index 7cb368f0..f6b3338a 100644 +--- a/src/lib/Canvas5StyleManager.cxx ++++ b/src/lib/Canvas5StyleManager.cxx +@@ -31,8 +31,6 @@ + * instead of those above. + */ + +-#include <strings.h> +- + #include <cmath> + #include <iomanip> + #include <iostream> +-- +2.30.2 + diff --git a/external/libmwaw/Library_mwaw.mk b/external/libmwaw/Library_mwaw.mk index bb1a880fd9ce..d92a1b729b81 100644 --- a/external/libmwaw/Library_mwaw.mk +++ b/external/libmwaw/Library_mwaw.mk @@ -41,6 +41,10 @@ $(eval $(call gb_Library_add_generated_exception_objects,mwaw,\ UnpackedTarball/libmwaw/src/lib/BeagleWksSSParser \ UnpackedTarball/libmwaw/src/lib/BeagleWksStructManager \ UnpackedTarball/libmwaw/src/lib/BeagleWksText \ + UnpackedTarball/libmwaw/src/lib/Canvas5Graph \ + UnpackedTarball/libmwaw/src/lib/Canvas5Parser \ + UnpackedTarball/libmwaw/src/lib/Canvas5Structure \ + UnpackedTarball/libmwaw/src/lib/Canvas5StyleManager \ UnpackedTarball/libmwaw/src/lib/CanvasGraph \ UnpackedTarball/libmwaw/src/lib/CanvasParser \ UnpackedTarball/libmwaw/src/lib/CanvasStyleManager \ diff --git a/external/libmwaw/UnpackedTarball_libmwaw.mk b/external/libmwaw/UnpackedTarball_libmwaw.mk index 935cbc1eb1c3..e15768e91623 100644 --- a/external/libmwaw/UnpackedTarball_libmwaw.mk +++ b/external/libmwaw/UnpackedTarball_libmwaw.mk @@ -15,6 +15,10 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libmwaw,0)) $(eval $(call gb_UnpackedTarball_update_autoconf_configs,libmwaw)) +$(eval $(call gb_UnpackedTarball_add_patches,libmwaw, \ + external/libmwaw/0001-drop-unneeded-include.patch.1 \ +)) + ifneq ($(OS),MACOSX) ifneq ($(OS),WNT) $(eval $(call gb_UnpackedTarball_add_patches,libmwaw, \ diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in index 152c3775828f..7904d7fe15ad 100644 --- a/solenv/flatpak-manifest.in +++ b/solenv/flatpak-manifest.in @@ -273,10 +273,10 @@ "dest-filename": "external/tarballs/libmspub-0.1.4.tar.xz" }, { - "url": "https://dev-www.libreoffice.org/src/libmwaw-0.3.17.tar.xz", - "sha256": "8e1537eb1de1b4714f4bf0a20478f342c5d71a65bf99307a694b1e9e30bb911c", + "url": "https://dev-www.libreoffice.org/src/libmwaw-0.3.18.tar.xz", + "sha256": "fc5d051680f8000be64ffebc0b0c58716b1c9bf06003ec399387b109d1ed1e0f", "type": "file", - "dest-filename": "external/tarballs/libmwaw-0.3.17.tar.xz" + "dest-filename": "external/tarballs/libmwaw-0.3.18.tar.xz" }, { "url": "https://dev-www.libreoffice.org/src/libodfgen-0.1.8.tar.xz", |