diff options
| author | David Tardon <dtardon@redhat.com> | 2016-02-15 09:29:24 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2016-02-15 10:59:13 +0000 |
| commit | 4db6402917bb5aecfb2bfc5fcd093abbb79a8ed3 (patch) | |
| tree | df71caedd8554452c0a04f666ecfd19d9a8505fd /external/libwps | |
| parent | xmlsecurity OOXML export: fix missing rels content-type (diff) | |
| download | core-4db6402917bb5aecfb2bfc5fcd093abbb79a8ed3.tar.gz core-4db6402917bb5aecfb2bfc5fcd093abbb79a8ed3.zip | |
upload libwps 0.4.3
Change-Id: I4f147c3d55de86eb4bd56bb4c728df19c925b376
Reviewed-on: https://gerrit.libreoffice.org/22366
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'external/libwps')
| -rw-r--r-- | external/libwps/0001-add-missing-include.patch | 24 | ||||
| -rw-r--r-- | external/libwps/Library_wps.mk | 1 | ||||
| -rw-r--r-- | external/libwps/UnpackedTarball_libwps.mk | 1 |
3 files changed, 1 insertions, 25 deletions
diff --git a/external/libwps/0001-add-missing-include.patch b/external/libwps/0001-add-missing-include.patch deleted file mode 100644 index 9afe2aa0c30e..000000000000 --- a/external/libwps/0001-add-missing-include.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 53c03b23520005aac0fb9b3036a200d63c7a8f06 Mon Sep 17 00:00:00 2001 -From: Sean Young <sean@mess.org> -Date: Tue, 6 Oct 2015 09:16:11 +0100 -Subject: [PATCH] add missing include - ---- - src/lib/MSWrite.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/lib/MSWrite.cpp b/src/lib/MSWrite.cpp -index 2bc2511..ab5fdd6 100644 ---- a/src/lib/MSWrite.cpp -+++ b/src/lib/MSWrite.cpp -@@ -32,6 +32,7 @@ - - #include "MSWrite.h" - -+#include <algorithm> - #include <cstring> - - namespace MSWriteParserInternal --- -2.1.4 - diff --git a/external/libwps/Library_wps.mk b/external/libwps/Library_wps.mk index 337f8625e96a..79e5774277cc 100644 --- a/external/libwps/Library_wps.mk +++ b/external/libwps/Library_wps.mk @@ -32,6 +32,7 @@ $(eval $(call gb_Library_add_defs,wps,\ $(eval $(call gb_Library_set_generated_cxx_suffix,wps,cpp)) $(eval $(call gb_Library_add_generated_exception_objects,wps,\ + UnpackedTarball/libwps/src/lib/DosWord \ UnpackedTarball/libwps/src/lib/Lotus \ UnpackedTarball/libwps/src/lib/LotusGraph \ UnpackedTarball/libwps/src/lib/LotusSpreadsheet \ diff --git a/external/libwps/UnpackedTarball_libwps.mk b/external/libwps/UnpackedTarball_libwps.mk index 754bd59a09c5..8551ef9bea18 100644 --- a/external/libwps/UnpackedTarball_libwps.mk +++ b/external/libwps/UnpackedTarball_libwps.mk @@ -14,7 +14,6 @@ $(eval $(call gb_UnpackedTarball_set_tarball,libwps,$(WPS_TARBALL))) $(eval $(call gb_UnpackedTarball_set_patchlevel,libwps,1)) $(eval $(call gb_UnpackedTarball_add_patches,libwps,\ - external/libwps/0001-add-missing-include.patch \ $(if $(SYSTEM_REVENGE),,external/libwps/rpath.patch.0) \ )) |