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 /external | |
| 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>
Diffstat (limited to 'external')
| -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 |
3 files changed, 33 insertions, 0 deletions
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, \ |