diff options
| author | David Tardon <dtardon@redhat.com> | 2021-05-10 19:16:20 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2021-05-10 20:19:45 +0200 |
| commit | 158737c2aa29904b726829399f9f5b24345dd013 (patch) | |
| tree | 3c41e6c0e119f17cdbe060d3a3a2c19ebf2198ff /external | |
| parent | 9c9f3ae5d8d6aedd71cae5a292bc55ae42eacd1d (diff) | |
upload libmwaw 0.3.19
Change-Id: Ibb26390e6cc13c925f499bf95cfc6177d8c9b735
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115355
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 | 2 | ||||
| -rw-r--r-- | external/libmwaw/UnpackedTarball_libmwaw.mk | 4 |
3 files changed, 2 insertions, 29 deletions
diff --git a/external/libmwaw/0001-drop-unneeded-include.patch.1 b/external/libmwaw/0001-drop-unneeded-include.patch.1 deleted file mode 100644 index 505f38daf80a..000000000000 --- a/external/libmwaw/0001-drop-unneeded-include.patch.1 +++ /dev/null @@ -1,25 +0,0 @@ -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 d92a1b729b81..6fdcded16190 100644 --- a/external/libmwaw/Library_mwaw.mk +++ b/external/libmwaw/Library_mwaw.mk @@ -41,7 +41,9 @@ $(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/Canvas5BMParser \ UnpackedTarball/libmwaw/src/lib/Canvas5Graph \ + UnpackedTarball/libmwaw/src/lib/Canvas5Image \ UnpackedTarball/libmwaw/src/lib/Canvas5Parser \ UnpackedTarball/libmwaw/src/lib/Canvas5Structure \ UnpackedTarball/libmwaw/src/lib/Canvas5StyleManager \ diff --git a/external/libmwaw/UnpackedTarball_libmwaw.mk b/external/libmwaw/UnpackedTarball_libmwaw.mk index e15768e91623..935cbc1eb1c3 100644 --- a/external/libmwaw/UnpackedTarball_libmwaw.mk +++ b/external/libmwaw/UnpackedTarball_libmwaw.mk @@ -15,10 +15,6 @@ $(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, \ |