configure.ac |
2
download.lst |
4
external/libwps/0001-Make-comparison-operator-member-functions-const.patch |
49 ----
external/libwps/Library_wps.mk |
1
external/libwps/UnpackedTarball_libwps.mk |
4
external/libwps/libwps-lotus-version-tdf127887-upstream.patch |
111 ----------
solenv/flatpak-manifest.in |
6
7 files changed, 7 insertions(+), 170 deletions(-)
New commits:
commit 7664ba694c5667c7fdb75e1a6fa505d3e8baa536
Author: David Tardon <dtar...@redhat.com>
AuthorDate: Sat Apr 18 14:27:56 2020 +0200
Commit: David Tardon <dtar...@redhat.com>
CommitDate: Sat Apr 18 15:25:48 2020 +0200
upload libwps 0.4.11
Change-Id: I068c7fe1ecf28755b095c5502d4c2dd42a54489c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92473
Tested-by: Jenkins
Reviewed-by: David Tardon <dtar...@redhat.com>
diff --git a/configure.ac b/configure.ac
index e5888dff7ccb..b5cde04404d5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8546,7 +8546,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.10])
+libo_PKG_VERSION([WPS], [libwps-0.4], [0.4.11])
libo_CHECK_SYSTEM_MODULE([libvisio],[VISIO],[libvisio-0.1])
diff --git a/download.lst b/download.lst
index dc556960d0d6..bfb417bd2919 100644
--- a/download.lst
+++ b/download.lst
@@ -253,8 +253,8 @@ export WPD_TARBALL :=
libwpd-0.10.$(WPD_VERSION_MICRO).tar.xz
export WPG_SHA256SUM :=
99b3f7f8832385748582ab8130fbb9e5607bd5179bebf9751ac1d51a53099d1c
export WPG_VERSION_MICRO := 3
export WPG_TARBALL := libwpg-0.3.$(WPG_VERSION_MICRO).tar.xz
-export WPS_SHA256SUM :=
1421e034286a9f96d3168a1c54ea570ee7aa008ca07b89de005ad5ce49fb29ca
-export WPS_VERSION_MICRO := 10
+export WPS_SHA256SUM :=
a8fdaabc28654a975fa78c81873ac503ba18f0d1cdbb942f470a21d29284b4d1
+export WPS_VERSION_MICRO := 11
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-Make-comparison-operator-member-functions-const.patch
b/external/libwps/0001-Make-comparison-operator-member-functions-const.patch
deleted file mode 100644
index c7bfb1e40aa2..000000000000
--- a/external/libwps/0001-Make-comparison-operator-member-functions-const.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 555b3e0c18ba16843541867d036da782ecdcdeb1 Mon Sep 17 00:00:00 2001
-From: Stephan Bergmann <sberg...@redhat.com>
-Date: Mon, 21 Oct 2019 16:19:13 +0200
-Subject: [PATCH] Make comparison operator member functions const
-
-...which avoids overload resolution ambiguities in C++20, when a synthesized
-candidate of operator == for a reversed-argument rewrite conflicts with the
-actual operator ==, due to the asymmetric const-ness of the implicit object
-parameter and the RHS parameter. (As observed with recent Clang 10 trunk with
--std=c++2a when building libwps as part of LibreOffice:
-
-> QuattroDosChart.cpp:399:18: error: use of overloaded operator '!=' is
ambiguous (with operand types 'WKSChart::Position' and 'WKSChart::Position')
-> if (ranges[0]!=ranges[1])
-> ~~~~~~~~~^ ~~~~~~~~~
-> ./WKSChart.h:78:8: note: candidate function
-> bool operator!=(Position &pos) const
-> ^
-> ./WKSChart.h:73:8: note: candidate function
-> bool operator==(Position &pos) const
-> ^
-> ./WKSChart.h:73:8: note: candidate function (with reversed parameter order)
-
-)
----
- src/lib/WKSChart.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/lib/WKSChart.h b/src/lib/WKSChart.h
-index 268fa4a..e490357 100644
---- a/src/lib/WKSChart.h
-+++ b/src/lib/WKSChart.h
-@@ -70,12 +70,12 @@ public:
- //! operator<<
- friend std::ostream &operator<<(std::ostream &o, Position const
&pos);
- //! operator==
-- bool operator==(Position &pos) const
-+ bool operator==(Position const &pos) const
- {
- return m_pos==pos.m_pos && m_sheetName==pos.m_sheetName;
- }
- //! operator!=
-- bool operator!=(Position &pos) const
-+ bool operator!=(Position const &pos) const
- {
- return !(operator==(pos));
- }
---
-2.21.0
-
diff --git a/external/libwps/Library_wps.mk b/external/libwps/Library_wps.mk
index 500a9ab196b2..349bdbe83c43 100644
--- a/external/libwps/Library_wps.mk
+++ b/external/libwps/Library_wps.mk
@@ -93,6 +93,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,wps,\
UnpackedTarball/libwps/src/lib/WPSTable \
UnpackedTarball/libwps/src/lib/WPSTextParser \
UnpackedTarball/libwps/src/lib/WPSTextSubDocument \
+ UnpackedTarball/libwps/src/lib/XYWrite \
UnpackedTarball/libwps/src/lib/libwps_internal \
UnpackedTarball/libwps/src/lib/libwps_tools_win \
))
diff --git a/external/libwps/UnpackedTarball_libwps.mk
b/external/libwps/UnpackedTarball_libwps.mk
index 4fd566755170..f53a8fffc429 100644
--- a/external/libwps/UnpackedTarball_libwps.mk
+++ b/external/libwps/UnpackedTarball_libwps.mk
@@ -15,13 +15,9 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libwps,1))
$(eval $(call gb_UnpackedTarball_update_autoconf_configs,libwps))
-# * external/libwps/0001-Make-comparison-operator-member-functions-const.patch
is upstream at
-# <https://sourceforge.net/p/libwps/patches/6/> "Make comparison operator
member functions const":
$(eval $(call gb_UnpackedTarball_add_patches,libwps,\
$(if $(SYSTEM_REVENGE),,external/libwps/rpath.patch.0) \
external/libwps/libtool.patch.0 \
-
external/libwps/0001-Make-comparison-operator-member-functions-const.patch \
- external/libwps/libwps-lotus-version-tdf127887-upstream.patch \
))
ifneq ($(OS),MACOSX)
diff --git a/external/libwps/libwps-lotus-version-tdf127887-upstream.patch
b/external/libwps/libwps-lotus-version-tdf127887-upstream.patch
deleted file mode 100644
index 012a8a00e991..000000000000
--- a/external/libwps/libwps-lotus-version-tdf127887-upstream.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-This is a combination of upstream patches.
-
-commit d74790b4bd55a3a11b56dbbd670c3baa1331e6dd
-CommitDate: Thu Oct 31 11:26:08 2019 +0100
-
- lotus[wb1]: try to correct the retrieving of row references in formula...
-
-
-commit 39be60f9045a758178d90526ae66b0e3d24f348e
-CommitDate: Thu Oct 31 13:28:54 2019 +0100
-
- wks,wk1,...: try to read correctly the row cell's references...
-
-
-commit 188933f0d66c77a19ccb0b5f5151a4c9f7203fbc
-CommitDate: Thu Oct 31 14:30:26 2019 +0100
-
- wks,wk1: do not change the maximum number of columns...
-
-
-commit c1ba33b7505cff91f57d5aa7e8c6ff8706b63a21
-CommitDate: Thu Oct 31 15:09:19 2019 +0100
-
- WKS4Spreadsheet.cpp: simplify the code...
-
-
-diff --git a/src/lib/WKS4.cpp b/src/lib/WKS4.cpp
-index 2f222d3..a92eace 100644
---- a/src/lib/WKS4.cpp
-+++ b/src/lib/WKS4.cpp
-@@ -836,7 +836,7 @@ bool WKS4Parser::readZone()
- val=int(libwps::readU8(input));
- f << "Entries(ItCount):dos";
- if (val!=1) f << "=" << val << ",";
-- if (m_state->m_version==2)
-+ else if (m_state->m_version==2)
- m_state->m_version=1;
- isParsed = needWriteInAscii = true;
- break;
-diff --git a/src/lib/WKS4Spreadsheet.cpp b/src/lib/WKS4Spreadsheet.cpp
-index caaf4e1..582f377 100644
---- a/src/lib/WKS4Spreadsheet.cpp
-+++ b/src/lib/WKS4Spreadsheet.cpp
-@@ -1798,10 +1798,14 @@ bool WKS4Spreadsheet::readCell
- for (int dim = 0; dim < 2; dim++)
- {
- auto val = int(libwps::readU16(m_input));
-- if ((val & 0xF000) == 0); // absolue value ?
-- else if ((val & 0xc000) == 0x8000) // relative ?
-+ if ((val & 0x8000) == 0); // absolue value ?
-+ else
- {
-- if (version()==1)
-+ // relative
-+ // wb1: maximum row=0x2000, maximum col=0x100
-+ // wks dos (v3) maximum row=0x4000, maximum col=0x100
-+ // wdb maximum number of data ?
-+ if (version()==1 && dim==0)
- {
- val &= 0xFF;
- if ((val & 0x80) && val+actPos[dim] >= 0x100)
-@@ -1810,27 +1814,17 @@ bool WKS4Spreadsheet::readCell
- }
- else
- {
-- val &= 0x3FFF;
-- if (val & 0x2000) val = val - 0x4000;
-+ // 0x400 for old file(unsure), ie. find many
problematic files on
-+ // the web, so maybe 0x4000 is ok and these
files are
-+ // problematic
-+ int const maxVal= (dim==1 ||
m_mainParser.creator()==libwps::WPS_LOTUS) ? 0x2000 : version()==1 ? 0x400 :
0x4000;
-+ val &= (2*maxVal-1);
-+ if (val & maxVal) val = val - 2*maxVal;
-+ if (val+actPos[dim]>=maxVal) val-=maxVal;
- }
- val += actPos[dim];
- absolute[dim] = false;
- }
-- else if (val==0xFFFF)
-- {
-- static bool first=true;
-- if (first) // in general associated with a nan value,
so maybe be normal
-- {
-- WPS_DEBUG_MSG(("WKS4Spreadsheet::readCell: find
some ffff cell\n"));
-- first=false;
-- }
-- ok = false;
-- }
-- else
-- {
-- WPS_DEBUG_MSG(("WKS4Spreadsheet::readCell: can not read
cell %x\n", unsigned(val)));
-- ok = false;
-- }
- pos[dim] = val;
- }
-
-diff --git a/src/lib/WPSDocument.cpp b/src/lib/WPSDocument.cpp
-index 7e974b6..5b18eb8 100644
---- a/src/lib/WPSDocument.cpp
-+++ b/src/lib/WPSDocument.cpp
-@@ -155,6 +155,10 @@ WPSLIB WPSConfidence
WPSDocument::isFileFormatSupported(librevenge::RVNGInputStr
- WKS4Parser parser(header->getInput(), header);
- if (!parser.checkHeader(header.get(), true))
- return WPS_CONFIDENCE_NONE;
-+ // checkHeader() may set new kind and creator values,
-+ // pass them up to caller.
-+ kind = header->getKind();
-+ creator = header->getCreator();
- needEncoding=header->getNeedEncoding();
- return header->getIsEncrypted() ?
WPS_CONFIDENCE_SUPPORTED_ENCRYPTION : WPS_CONFIDENCE_EXCELLENT;
- }
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 2201e6fe6071..9f64a142dd68 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -321,10 +321,10 @@
"dest-filename": "external/tarballs/libwpg-0.3.3.tar.xz"
},
{
- "url":
"https://dev-www.libreoffice.org/src/libwps-0.4.10.tar.xz";,
- "sha256":
"1421e034286a9f96d3168a1c54ea570ee7aa008ca07b89de005ad5ce49fb29ca",
+ "url":
"https://dev-www.libreoffice.org/src/libwps-0.4.11.tar.xz";,
+ "sha256":
"a8fdaabc28654a975fa78c81873ac503ba18f0d1cdbb942f470a21d29284b4d1",
"type": "file",
- "dest-filename": "external/tarballs/libwps-0.4.10.tar.xz"
+ "dest-filename": "external/tarballs/libwps-0.4.11.tar.xz"
},
{
"url":
"https://dev-www.libreoffice.org/src/libzmf-0.0.2.tar.xz";,
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
