[Libreoffice-commits] core.git: configure.ac download.lst external/libwps solenv/flatpak-manifest.in
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Wed Aug 8 11:11:51 UTC 2018
configure.ac | 2
download.lst | 4
external/libwps/0001-avoid-name-clash-with-MultiplanParser-from-libmwaw.patch.1 | 56 ----------
external/libwps/Library_wps.mk | 6 +
external/libwps/UnpackedTarball_libwps.mk | 4
solenv/flatpak-manifest.in | 6 -
6 files changed, 12 insertions(+), 66 deletions(-)
New commits:
commit ca8d5f5478b02fd9ef6f2c80479c381af841e269
Author: David Tardon <dtardon at redhat.com>
AuthorDate: Tue Aug 7 20:59:52 2018 +0200
Commit: David Tardon <dtardon at redhat.com>
CommitDate: Wed Aug 8 13:11:29 2018 +0200
upload libwps 0.4.10
Change-Id: Ib29c429a34a3895fa0747a54194dcd60ad41e45d
Reviewed-on: https://gerrit.libreoffice.org/58704
Tested-by: Jenkins
Reviewed-by: David Tardon <dtardon at redhat.com>
diff --git a/configure.ac b/configure.ac
index abbd9b8975b0..fbb74238379b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7884,7 +7884,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.9])
+libo_PKG_VERSION([WPS], [libwps-0.4], [0.4.10])
libo_CHECK_SYSTEM_MODULE([libvisio],[VISIO],[libvisio-0.1])
diff --git a/download.lst b/download.lst
index 04a70ea84e0c..ca63722e90d4 100644
--- a/download.lst
+++ b/download.lst
@@ -244,8 +244,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 := 13beb0c733bb1544a542b6ab1d9d205f218e9a2202d1d4cac056f79f6db74922
-export WPS_VERSION_MICRO := 9
+export WPS_SHA256SUM := 1421e034286a9f96d3168a1c54ea570ee7aa008ca07b89de005ad5ce49fb29ca
+export WPS_VERSION_MICRO := 10
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-avoid-name-clash-with-MultiplanParser-from-libmwaw.patch.1 b/external/libwps/0001-avoid-name-clash-with-MultiplanParser-from-libmwaw.patch.1
deleted file mode 100644
index 46983dd9eed2..000000000000
--- a/external/libwps/0001-avoid-name-clash-with-MultiplanParser-from-libmwaw.patch.1
+++ /dev/null
@@ -1,56 +0,0 @@
-From 9181ad021cf1c200bc80edb9f5a6df5b780be046 Mon Sep 17 00:00:00 2001
-From: David Tardon <dtardon at redhat.com>
-Date: Thu, 26 Apr 2018 14:24:55 +0200
-Subject: [PATCH] avoid name clash with MultiplanParser from libmwaw
-
----
- src/lib/Multiplan.cpp | 5 ++++-
- src/lib/Multiplan.h | 5 +++++
- 2 files changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/src/lib/Multiplan.cpp b/src/lib/Multiplan.cpp
-index 278f699..26ceca3 100644
---- a/src/lib/Multiplan.cpp
-+++ b/src/lib/Multiplan.cpp
-@@ -44,7 +44,8 @@
-
- #include "Multiplan.h"
-
--using namespace libwps;
-+namespace libwps
-+{
-
- //! Internal: namespace to define internal class of MultiplanParser
- namespace MultiplanParserInternal
-@@ -2912,4 +2913,6 @@ RVNGInputStreamPtr MultiplanParser::decodeStream(RVNGInputStreamPtr input)
- return res;
- }
-
-+}
-+
- /* vim:set shiftwidth=4 softtabstop=4 noexpandtab: */
-diff --git a/src/lib/Multiplan.h b/src/lib/Multiplan.h
-index 87e0565..83c83f2 100644
---- a/src/lib/Multiplan.h
-+++ b/src/lib/Multiplan.h
-@@ -34,6 +34,9 @@
-
- #include "WKSParser.h"
-
-+namespace libwps
-+{
-+
- namespace MultiplanParserInternal
- {
- struct State;
-@@ -127,5 +130,7 @@ protected:
- std::shared_ptr<MultiplanParserInternal::State> m_state;
- };
-
-+}
-+
- #endif /* WPS4_H */
- /* vim:set shiftwidth=4 softtabstop=4 noexpandtab: */
---
-2.14.3
-
diff --git a/external/libwps/Library_wps.mk b/external/libwps/Library_wps.mk
index 60709ab77603..9c4f5330fd69 100644
--- a/external/libwps/Library_wps.mk
+++ b/external/libwps/Library_wps.mk
@@ -40,9 +40,13 @@ $(eval $(call gb_Library_add_generated_exception_objects,wps,\
UnpackedTarball/libwps/src/lib/MSWrite \
UnpackedTarball/libwps/src/lib/Multiplan \
UnpackedTarball/libwps/src/lib/Quattro \
+ UnpackedTarball/libwps/src/lib/Quattro9 \
+ UnpackedTarball/libwps/src/lib/Quattro9Graph \
+ UnpackedTarball/libwps/src/lib/Quattro9Spreadsheet \
UnpackedTarball/libwps/src/lib/QuattroDos \
UnpackedTarball/libwps/src/lib/QuattroDosChart \
UnpackedTarball/libwps/src/lib/QuattroDosSpreadsheet \
+ UnpackedTarball/libwps/src/lib/QuattroFormula \
UnpackedTarball/libwps/src/lib/QuattroGraph \
UnpackedTarball/libwps/src/lib/QuattroSpreadsheet \
UnpackedTarball/libwps/src/lib/WKS4 \
@@ -66,11 +70,13 @@ $(eval $(call gb_Library_add_generated_exception_objects,wps,\
UnpackedTarball/libwps/src/lib/WPSContentListener \
UnpackedTarball/libwps/src/lib/WPSDebug \
UnpackedTarball/libwps/src/lib/WPSDocument \
+ UnpackedTarball/libwps/src/lib/WPSEntry \
UnpackedTarball/libwps/src/lib/WPSFont \
UnpackedTarball/libwps/src/lib/WPSGraphicShape \
UnpackedTarball/libwps/src/lib/WPSGraphicStyle \
UnpackedTarball/libwps/src/lib/WPSHeader \
UnpackedTarball/libwps/src/lib/WPSList \
+ UnpackedTarball/libwps/src/lib/WPSListener \
UnpackedTarball/libwps/src/lib/WPSOLE1Parser \
UnpackedTarball/libwps/src/lib/WPSOLEObject \
UnpackedTarball/libwps/src/lib/WPSOLEParser \
diff --git a/external/libwps/UnpackedTarball_libwps.mk b/external/libwps/UnpackedTarball_libwps.mk
index 6805e746f2cc..f982c778a218 100644
--- a/external/libwps/UnpackedTarball_libwps.mk
+++ b/external/libwps/UnpackedTarball_libwps.mk
@@ -35,10 +35,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,libwps, \
endif
endif
-$(eval $(call gb_UnpackedTarball_add_patches,libwps,\
- external/libwps/0001-avoid-name-clash-with-MultiplanParser-from-libmwaw.patch.1 \
-))
-
ifeq ($(OS),ANDROID)
$(eval $(call gb_UnpackedTarball_add_patches,libwps, \
external/libwps/0001-Fix-nan-is-not-a-member-of-std.patch.1 \
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 7021d12c5688..129e325cea12 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -351,10 +351,10 @@
"dest-filename": "external/tarballs/libwpg-0.3.2.tar.xz"
},
{
- "url": "https://dev-www.libreoffice.org/src/libwps-0.4.9.tar.xz",
- "sha256": "13beb0c733bb1544a542b6ab1d9d205f218e9a2202d1d4cac056f79f6db74922",
+ "url": "https://dev-www.libreoffice.org/src/libwps-0.4.10.tar.xz",
+ "sha256": "1421e034286a9f96d3168a1c54ea570ee7aa008ca07b89de005ad5ce49fb29ca",
"type": "file",
- "dest-filename": "external/tarballs/libwps-0.4.9.tar.xz"
+ "dest-filename": "external/tarballs/libwps-0.4.10.tar.xz"
},
{
"url": "https://dev-www.libreoffice.org/src/libzmf-0.0.2.tar.xz",
More information about the Libreoffice-commits
mailing list