From 8d0e8d5d291cbb98de6964eab2f629a405c7e813 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Mon, 27 Nov 2017 10:16:07 +0100 Subject: [PATCH] upload libwps 0.4.8 Change-Id: Ib285c227cd935987311be40df3745316943a54e0 Reviewed-on: https://gerrit.libreoffice.org/45331 Tested-by: Jenkins Reviewed-by: David Tardon --- configure.ac | 2 +- download.lst | 4 +-- .../libwps/0001-drop-unneeded-include.patch.1 | 24 ++++++++++++++++ ...-try-to-fix-build-with-older-clang.patch.1 | 27 ------------------ external/libwps/Library_wps.mk | 9 ++++++ external/libwps/UnpackedTarball_libwps.mk | 4 +-- external/libwps/libwps-bundled-soname.patch.0 | 4 +-- .../types/calc_WPS_QPro_Document.xcu | 2 +- solenv/flatpak-manifest.in | 6 ++-- writerperfect/qa/unit/WpftCalcFilterTest.cxx | 1 + .../unit/data/calc/libwps/pass/QuattroPro.wb1 | Bin 0 -> 174166 bytes 11 files changed, 45 insertions(+), 38 deletions(-) create mode 100644 external/libwps/0001-drop-unneeded-include.patch.1 delete mode 100644 external/libwps/0001-try-to-fix-build-with-older-clang.patch.1 create mode 100755 writerperfect/qa/unit/data/calc/libwps/pass/QuattroPro.wb1 diff --git a/configure.ac b/configure.ac index 4ff7655c0f36..3543d5874771 100644 --- a/configure.ac +++ b/configure.ac @@ -7696,7 +7696,7 @@ libo_CHECK_SYSTEM_MODULE([libwpd],[WPD],[libwpd-0.10],["-I${WORKDIR}/UnpackedTar libo_CHECK_SYSTEM_MODULE([libwpg],[WPG],[libwpg-0.3]) libo_CHECK_SYSTEM_MODULE([libwps],[WPS],[libwps-0.4]) -libo_PKG_VERSION([WPS], [libwps-0.4], [0.4.7]) +libo_PKG_VERSION([WPS], [libwps-0.4], [0.4.8]) libo_CHECK_SYSTEM_MODULE([libvisio],[VISIO],[libvisio-0.1]) diff --git a/download.lst b/download.lst index 98dd3526f783..5c15b2be12e8 100644 --- a/download.lst +++ b/download.lst @@ -230,8 +230,8 @@ export WPD_TARBALL := libwpd-0.10.$(WPD_VERSION_MICRO).tar.xz export WPG_SHA256SUM := 57faf1ab97d63d57383ac5d7875e992a3d190436732f4083310c0471e72f8c33 export WPG_VERSION_MICRO := 2 export WPG_TARBALL := libwpg-0.3.$(WPG_VERSION_MICRO).tar.xz -export WPS_SHA256SUM := 2f2cab630bceace24f9dbb7d187cd6cd1f4c9f8a7b682c5f7e49c1e2cb58b217 -export WPS_VERSION_MICRO := 7 +export WPS_SHA256SUM := e478e825ef33f6a434a19ff902c5469c9da7acc866ea0d8ab610a8b2aa94177e +export WPS_VERSION_MICRO := 8 export WPS_TARBALL := libwps-0.4.$(WPS_VERSION_MICRO).tar.xz export XSLTML_SHA256SUM := 75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870 export XSLTML_TARBALL := a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 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 +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 + #include +-#include + + #include + #include +-- +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 -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 \ diff --git a/filter/source/config/fragments/types/calc_WPS_QPro_Document.xcu b/filter/source/config/fragments/types/calc_WPS_QPro_Document.xcu index a335004bd8cc..2c8529db0936 100644 --- a/filter/source/config/fragments/types/calc_WPS_QPro_Document.xcu +++ b/filter/source/config/fragments/types/calc_WPS_QPro_Document.xcu @@ -18,7 +18,7 @@ com.sun.star.comp.Calc.MSWorksCalcImportFilter - wq1 wq2 + wb1 wb2 wq1 wq2 true WPS_QPro_Calc diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in index 2c5a3ff1df47..8119f892c189 100644 --- a/solenv/flatpak-manifest.in +++ b/solenv/flatpak-manifest.in @@ -280,10 +280,10 @@ "dest-filename": "external/tarballs/libwpg-0.3.2.tar.xz" }, { - "url": "https://dev-www.libreoffice.org/src/libwps-0.4.7.tar.xz", - "sha256": "2f2cab630bceace24f9dbb7d187cd6cd1f4c9f8a7b682c5f7e49c1e2cb58b217", + "url": "https://dev-www.libreoffice.org/src/libwps-0.4.8.tar.xz", + "sha256": "e478e825ef33f6a434a19ff902c5469c9da7acc866ea0d8ab610a8b2aa94177e", "type": "file", - "dest-filename": "external/tarballs/libwps-0.4.7.tar.xz" + "dest-filename": "external/tarballs/libwps-0.4.8.tar.xz" }, { "url": "https://dev-www.libreoffice.org/src/libzmf-0.0.2.tar.xz", diff --git a/writerperfect/qa/unit/WpftCalcFilterTest.cxx b/writerperfect/qa/unit/WpftCalcFilterTest.cxx index 7a7dc531826c..0e5584e1ff85 100644 --- a/writerperfect/qa/unit/WpftCalcFilterTest.cxx +++ b/writerperfect/qa/unit/WpftCalcFilterTest.cxx @@ -39,6 +39,7 @@ void WpftCalcFilterTest::test() { {"Lotus123_3.123", REQUIRE_WPS_VERSION(0, 4, 5)}, {"Lotus123_98.123", REQUIRE_WPS_VERSION(0, 4, 6)}, + {"QuattroPro.wb1", REQUIRE_WPS_VERSION(0, 4, 8)}, }; doTest("com.sun.star.comp.Calc.MWAWCalcImportFilter", "/writerperfect/qa/unit/data/calc/libmwaw/"); diff --git a/writerperfect/qa/unit/data/calc/libwps/pass/QuattroPro.wb1 b/writerperfect/qa/unit/data/calc/libwps/pass/QuattroPro.wb1 new file mode 100755 index 0000000000000000000000000000000000000000..95a6331c9c3dbb8ae387d0a9066d7a72032bc37b GIT binary patch literal 174166 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 literal 0 HcmV?d00001