diff options
Diffstat (limited to 'external/libwps')
| -rw-r--r-- | external/libwps/0001-drop-unneeded-include.patch.1 | 24 | ||||
| -rw-r--r-- | external/libwps/0001-try-to-fix-build-with-older-clang.patch.1 | 27 | ||||
| -rw-r--r-- | external/libwps/Library_wps.mk | 9 | ||||
| -rw-r--r-- | external/libwps/UnpackedTarball_libwps.mk | 4 | ||||
| -rw-r--r-- | external/libwps/libwps-bundled-soname.patch.0 | 4 |
5 files changed, 37 insertions, 31 deletions
diff --git a/external/libwps/0001-drop-unneeded-include.patch.1 b/external/libwps/0001-drop-unneeded-include.patch.1 new file mode 100644 index 000000000000..4d7b5a494530 --- /dev/null +++ b/external/libwps/0001-drop-unneeded-include.patch.1 @@ -0,0 +1,24 @@ +From cec7e4b57b0e10139d5a5dcede9027b0ea85e07d Mon Sep 17 00:00:00 2001 +From: David Tardon <dtardon@redhat.com> +Date: Mon, 27 Nov 2017 19:32:53 +0100 +Subject: [PATCH] drop unneeded include + +--- + src/lib/QuattroSpreadsheet.cpp | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/lib/QuattroSpreadsheet.cpp b/src/lib/QuattroSpreadsheet.cpp +index 8d7e1c0..bc35bdf 100644 +--- a/src/lib/QuattroSpreadsheet.cpp ++++ b/src/lib/QuattroSpreadsheet.cpp +@@ -21,7 +21,6 @@ + + #include <stdlib.h> + #include <string.h> +-#include <strings.h> + + #include <algorithm> + #include <cctype> +-- +2.14.3 + diff --git a/external/libwps/0001-try-to-fix-build-with-older-clang.patch.1 b/external/libwps/0001-try-to-fix-build-with-older-clang.patch.1 deleted file mode 100644 index c5aca0e7d380..000000000000 --- a/external/libwps/0001-try-to-fix-build-with-older-clang.patch.1 +++ /dev/null @@ -1,27 +0,0 @@ -From 01d2ef67b9076fd82ecc6937bdbb306b489fd29e Mon Sep 17 00:00:00 2001 -From: David Tardon <dtardon@redhat.com> -Date: Mon, 17 Jul 2017 14:34:12 +0200 -Subject: [PATCH] try to fix build with older clang - ---- - src/lib/libwps_internal.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/lib/libwps_internal.h b/src/lib/libwps_internal.h -index 8e91806..8a5fccc 100644 ---- a/src/lib/libwps_internal.h -+++ b/src/lib/libwps_internal.h -@@ -85,8 +85,8 @@ struct WPS_shared_ptr_noop_deleter - - /** fall through attributes */ - #define WPS_FALLTHROUGH --#if defined(__clang__) --# if defined(__has_cpp_attribute) && __has_cpp_attribute(clang::fallthrough) -+#if defined(__clang__) && defined(__has_cpp_attribute) -+# if __has_cpp_attribute(clang::fallthrough) - # undef WPS_FALLTHROUGH - # define WPS_FALLTHROUGH [[clang::fallthrough]] - # endif --- -2.13.0 - diff --git a/external/libwps/Library_wps.mk b/external/libwps/Library_wps.mk index 4089c8b244bb..d1525ecdeb11 100644 --- a/external/libwps/Library_wps.mk +++ b/external/libwps/Library_wps.mk @@ -34,15 +34,22 @@ $(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/LotusChart \ UnpackedTarball/libwps/src/lib/LotusGraph \ UnpackedTarball/libwps/src/lib/LotusSpreadsheet \ UnpackedTarball/libwps/src/lib/LotusStyleManager \ UnpackedTarball/libwps/src/lib/MSWrite \ UnpackedTarball/libwps/src/lib/Quattro \ + UnpackedTarball/libwps/src/lib/QuattroDos \ + UnpackedTarball/libwps/src/lib/QuattroDosChart \ + UnpackedTarball/libwps/src/lib/QuattroDosSpreadsheet \ + UnpackedTarball/libwps/src/lib/QuattroGraph \ UnpackedTarball/libwps/src/lib/QuattroSpreadsheet \ UnpackedTarball/libwps/src/lib/WKS4 \ + UnpackedTarball/libwps/src/lib/WKS4Chart \ UnpackedTarball/libwps/src/lib/WKS4Format \ UnpackedTarball/libwps/src/lib/WKS4Spreadsheet \ + UnpackedTarball/libwps/src/lib/WKSChart \ UnpackedTarball/libwps/src/lib/WKSContentListener \ UnpackedTarball/libwps/src/lib/WKSParser \ UnpackedTarball/libwps/src/lib/WKSSubDocument \ @@ -65,7 +72,9 @@ $(eval $(call gb_Library_add_generated_exception_objects,wps,\ UnpackedTarball/libwps/src/lib/WPSHeader \ UnpackedTarball/libwps/src/lib/WPSList \ UnpackedTarball/libwps/src/lib/WPSOLE1Parser \ + UnpackedTarball/libwps/src/lib/WPSOLEObject \ UnpackedTarball/libwps/src/lib/WPSOLEParser \ + UnpackedTarball/libwps/src/lib/WPSOLEStream \ UnpackedTarball/libwps/src/lib/WPSPageSpan \ UnpackedTarball/libwps/src/lib/WPSParagraph \ UnpackedTarball/libwps/src/lib/WPSParser \ diff --git a/external/libwps/UnpackedTarball_libwps.mk b/external/libwps/UnpackedTarball_libwps.mk index 3aa0251a7bd5..58c3710d9e03 100644 --- a/external/libwps/UnpackedTarball_libwps.mk +++ b/external/libwps/UnpackedTarball_libwps.mk @@ -35,8 +35,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,libwps, \ endif endif -$(eval $(call gb_UnpackedTarball_add_patches,libwps, \ - external/libwps/0001-try-to-fix-build-with-older-clang.patch.1 \ +$(eval $(call gb_UnpackedTarball_add_patches,libwps,\ + external/libwps/0001-drop-unneeded-include.patch.1 \ )) # vim: set noet sw=4 ts=4: diff --git a/external/libwps/libwps-bundled-soname.patch.0 b/external/libwps/libwps-bundled-soname.patch.0 index 734cdc670d18..013ba7a88b9e 100644 --- a/external/libwps/libwps-bundled-soname.patch.0 +++ b/external/libwps/libwps-bundled-soname.patch.0 @@ -7,5 +7,5 @@ -libwps_@WPS_MAJOR_VERSION@_@WPS_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic -no-undefined +libwps_@WPS_MAJOR_VERSION@_@WPS_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic -no-undefined -release lo libwps_@WPS_MAJOR_VERSION@_@WPS_MINOR_VERSION@_la_SOURCES = \ - libwps_internal.cpp \ - libwps_tools_win.h \ + libwps_internal.cpp \ + libwps_tools_win.h \ |