[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - configure.ac download.lst external/libetonyek solenv/flatpak-manifest.in
David Tardon (via logerrit)
logerrit at kemper.freedesktop.org
Thu Aug 19 22:44:13 UTC 2021
configure.ac | 2
download.lst | 4
external/libetonyek/0001-add-missing-include-for-std-for_each.patch | 33 -----
external/libetonyek/0001-fix-build-with-MSVC.patch.1 | 28 ++++
external/libetonyek/0002-fix-build-with-MSVC.patch.1 | 55 ++++++++
external/libetonyek/Library_etonyek.mk | 1
external/libetonyek/UnpackedTarball_libetonyek.mk | 4
external/libetonyek/glm-force-dmat3-initialization-needed-from-v0.9.9.0.patch.1 | 62 ----------
solenv/flatpak-manifest.in | 6
9 files changed, 92 insertions(+), 103 deletions(-)
New commits:
commit eaa73b86648e2c6017ef66868c6ce2fe5302390d
Author: David Tardon <dtardon at redhat.com>
AuthorDate: Tue May 18 20:18:42 2021 +0200
Commit: Aron Budea <aron.budea at collabora.com>
CommitDate: Fri Aug 20 00:43:36 2021 +0200
upload libetonyek 0.1.10
Change-Id: Iad586802e89b19701a20bebff06b238b617af2a9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115769
Tested-by: Jenkins
Reviewed-by: David Tardon <dtardon at redhat.com>
(cherry picked from commit 5471dc3238e8005fa146cfa0a81c5784ea018e95)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120734
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
Reviewed-by: Aron Budea <aron.budea at collabora.com>
diff --git a/configure.ac b/configure.ac
index 5d991218cef4..6b0e72a5d573 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9115,7 +9115,7 @@ libo_CHECK_SYSTEM_MODULE([libmwaw],[MWAW],[libmwaw-0.3 >= 0.3.1])
libo_PKG_VERSION([MWAW], [libmwaw-0.3], [0.3.17])
libo_CHECK_SYSTEM_MODULE([libetonyek],[ETONYEK],[libetonyek-0.1])
-libo_PKG_VERSION([ETONYEK], [libetonyek-0.1], [0.1.8])
+libo_PKG_VERSION([ETONYEK], [libetonyek-0.1], [0.1.10])
libo_CHECK_SYSTEM_MODULE([libfreehand],[FREEHAND],[libfreehand-0.1])
diff --git a/download.lst b/download.lst
index 043112285902..a2a08016976e 100644
--- a/download.lst
+++ b/download.lst
@@ -49,8 +49,8 @@ export EPM_SHA256SUM := b3fc4c5445de6c9a801504a3ea3efb2d4ea9d5a622c9427e716736e7
export EPM_TARBALL := 3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz
export EPUBGEN_SHA256SUM := 03e084b994cbeffc8c3dd13303b2cb805f44d8f2c3b79f7690d7e3fc7f6215ad
export EPUBGEN_TARBALL := libepubgen-0.1.1.tar.xz
-export ETONYEK_SHA256SUM := e61677e8799ce6e55b25afc11aa5339113f6a49cff031f336e32fa58635b1a4a
-export ETONYEK_VERSION_MICRO := 9
+export ETONYEK_SHA256SUM := b430435a6e8487888b761dc848b7981626eb814884963ffe25eb26a139301e9a
+export ETONYEK_VERSION_MICRO := 10
export ETONYEK_TARBALL := libetonyek-0.1.$(ETONYEK_VERSION_MICRO).tar.xz
export EXPAT_SHA256SUM := 2f9b6a580b94577b150a7d5617ad4643a4301a6616ff459307df3e225bcfbf40
export EXPAT_TARBALL := expat-2.4.1.tar.bz2
diff --git a/external/libetonyek/0001-add-missing-include-for-std-for_each.patch b/external/libetonyek/0001-add-missing-include-for-std-for_each.patch
deleted file mode 100644
index 09aaba58b7e3..000000000000
--- a/external/libetonyek/0001-add-missing-include-for-std-for_each.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 4b4d879a6db69ea05b89fdf99df8cb5d902d16b6 Mon Sep 17 00:00:00 2001
-From: Roland Illig <roland.illig at gmx.de>
-Date: Tue, 19 May 2020 08:43:39 +0200
-Subject: [PATCH] add missing include for std::for_each
-
-On NetBSD 8.0 x86_64, gcc complains:
- NUM3Parser.cpp: In member function 'virtual bool libetonyek::NUM3Parser::parseDocument()':
- NUM3Parser.cpp:46:3: error: 'for_each' is not a member of 'std'
- std::for_each(sheetListRefs.begin(), sheetListRefs.end(), std::bind(&NUM3Parser::parseSheet, this, std::placeholders::_1));
-
-Change-Id: I723ba1bcbd10ed9215ceea8c5b224fdc5242be65
-Reviewed-on: https://gerrit.libreoffice.org/c/libetonyek/+/94450
-Tested-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
-Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
----
- src/lib/NUM3Parser.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git src/lib/NUM3Parser.cpp src/lib/NUM3Parser.cpp
-index 66fb195..c19b611 100644
---- src/lib/NUM3Parser.cpp
-+++ src/lib/NUM3Parser.cpp
-@@ -7,6 +7,7 @@
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-+#include <algorithm>
- #include <functional>
-
- #include "NUM3Parser.h"
---
-2.28.0
-
diff --git a/external/libetonyek/0001-fix-build-with-MSVC.patch.1 b/external/libetonyek/0001-fix-build-with-MSVC.patch.1
new file mode 100644
index 000000000000..2a72844dc79a
--- /dev/null
+++ b/external/libetonyek/0001-fix-build-with-MSVC.patch.1
@@ -0,0 +1,28 @@
+From 1aa22c746b41a688296f4daf4fc35710d2045a33 Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon at redhat.com>
+Date: Wed, 19 May 2021 19:43:43 +0200
+Subject: [PATCH] fix build with MSVC
+
+error C2664: 'libetonyek::IWORKFormula::IWORKFormula(const boost::optional<unsigned int> &)': cannot convert argument 1 from 'int' to 'const boost::optional<unsigned int> &'
+
+Change-Id: Iaa3de2d0ef8f960495e5d5afebb75c5063955177
+---
+ src/lib/IWAParser.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/lib/IWAParser.cpp b/src/lib/IWAParser.cpp
+index 7fd95c3..a2bd292 100644
+--- a/src/lib/IWAParser.cpp
++++ b/src/lib/IWAParser.cpp
+@@ -3403,7 +3403,7 @@ bool IWAParser::parseFormula(const IWAMessage &msg, IWORKFormulaPtr_t &formula)
+ }
+ else
+ {
+- formula.reset(new IWORKFormula(0));
++ formula.reset(new IWORKFormula(boost::make_optional(0u)));
+ formula->parse(stack[0]);
+ }
+ return ok;
+--
+2.31.1
+
diff --git a/external/libetonyek/0002-fix-build-with-MSVC.patch.1 b/external/libetonyek/0002-fix-build-with-MSVC.patch.1
new file mode 100644
index 000000000000..0eadb0912f6a
--- /dev/null
+++ b/external/libetonyek/0002-fix-build-with-MSVC.patch.1
@@ -0,0 +1,55 @@
+From 7b69af66227309e9c258beca3bc3934be454a221 Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon at redhat.com>
+Date: Wed, 19 May 2021 21:11:40 +0200
+Subject: [PATCH] fix build with MSVC
+
+C:/PROGRA~2/MIB055~1/2019/COMMUN~1/VC/Tools/MSVC/1428~1.299/Include\xutility(138): error C2668: 'libetonyek::IWORKStyle::IWORKStyle': ambiguous call to overloaded function
+C:\cygwin\home\tdf\lode\jenkins\workspace\gerrit_windows\workdir\UnpackedTarball\libetonyek\src\lib\IWORKStyle.h(32): note: could be 'libetonyek::IWORKStyle::IWORKStyle(const libetonyek::IWORKPropertyMap &,const boost::optional<std::string> &,const libetonyek::IWORKStylePtr_t &)'
+C:\cygwin\home\tdf\lode\jenkins\workspace\gerrit_windows\workdir\UnpackedTarball\libetonyek\src\lib\IWORKStyle.h(31): note: or 'libetonyek::IWORKStyle::IWORKStyle(const libetonyek::IWORKPropertyMap &,const boost::optional<std::string> &,const boost::optional<std::string> &)'
+C:/PROGRA~2/MIB055~1/2019/COMMUN~1/VC/Tools/MSVC/1428~1.299/Include\xutility(137): note: while trying to match the argument list '(libetonyek::IWORKPropertyMap, const boost::none_t, _Ty)'
+ with
+ [
+ _Ty=nullptr
+ ]
+C:/PROGRA~2/MIB055~1/2019/COMMUN~1/VC/Tools/MSVC/1428~1.299/Include\memory(2186): note: see reference to function template instantiation 'void std::_Construct_in_place<_Ty,libetonyek::IWORKPropertyMap&,const boost::none_t&,nullptr>(_Ty &,libetonyek::IWORKPropertyMap &,const boost::none_t &,nullptr &&) noexcept(false)' being compiled
+ with
+ [
+ _Ty=libetonyek::IWORKStyle
+ ]
+C:/PROGRA~2/MIB055~1/2019/COMMUN~1/VC/Tools/MSVC/1428~1.299/Include\memory(2906): note: see reference to function template instantiation 'std::_Ref_count_obj2<_Ty>::_Ref_count_obj2<libetonyek::IWORKPropertyMap&,const boost::none_t&,nullptr>(libetonyek::IWORKPropertyMap &,const boost::none_t &,nullptr &&)' being compiled
+ with
+ [
+ _Ty=libetonyek::IWORKStyle
+ ]
+C:/PROGRA~2/MIB055~1/2019/COMMUN~1/VC/Tools/MSVC/1428~1.299/Include\memory(2907): note: see reference to function template instantiation 'std::_Ref_count_obj2<_Ty>::_Ref_count_obj2<libetonyek::IWORKPropertyMap&,const boost::none_t&,nullptr>(libetonyek::IWORKPropertyMap &,const boost::none_t &,nullptr &&)' being compiled
+ with
+ [
+ _Ty=libetonyek::IWORKStyle
+ ]
+C:/cygwin/home/tdf/lode/jenkins/workspace/gerrit_windows/workdir/UnpackedTarball/libetonyek/src/lib/IWAParser.cpp(2358): note: see reference to function template instantiation 'std::shared_ptr<libetonyek::IWORKStyle> std::make_shared<libetonyek::IWORKStyle,libetonyek::IWORKPropertyMap&,const boost::none_t&,nullptr>(libetonyek::IWORKPropertyMap &,const boost::none_t &,nullptr &&)' being compiled
+
+Change-Id: Idf871474b2a20f252073846388d018cccc15bc11
+---
+ src/lib/IWAParser.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/lib/IWAParser.cpp b/src/lib/IWAParser.cpp
+index a2bd292..1fdeae7 100644
+--- a/src/lib/IWAParser.cpp
++++ b/src/lib/IWAParser.cpp
+@@ -2355,10 +2355,10 @@ void IWAParser::parseAuthorInComment(unsigned id)
+ IWORKPropertyMap props;
+ // normally yellow, but blue may be better in LO
+ props.put<property::FontColor>(IWORKColor(0,0,1,1));
+- spans[0]=std::make_shared<IWORKStyle>(props, boost::none, nullptr);
++ spans[0]=std::make_shared<IWORKStyle>(props, boost::none, IWORKStylePtr_t());
+ // reset color to default, if not, comment will be blue colored
+ props.put<property::FontColor>(IWORKColor(0,0,0,1));
+- spans[unsigned(len)]=std::make_shared<IWORKStyle>(props, boost::none, nullptr);
++ spans[unsigned(len)]=std::make_shared<IWORKStyle>(props, boost::none, IWORKStylePtr_t());
+ text.setSpans(spans);
+ text.parse(*m_currentText);
+ }
+--
+2.31.1
+
diff --git a/external/libetonyek/Library_etonyek.mk b/external/libetonyek/Library_etonyek.mk
index cbbe08458410..87e21fc4b78a 100644
--- a/external/libetonyek/Library_etonyek.mk
+++ b/external/libetonyek/Library_etonyek.mk
@@ -118,6 +118,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,etonyek,\
UnpackedTarball/libetonyek/src/lib/contexts/IWORKBinaryElement \
UnpackedTarball/libetonyek/src/lib/contexts/IWORKBrContext \
UnpackedTarball/libetonyek/src/lib/contexts/IWORKCalcEngineContext \
+ UnpackedTarball/libetonyek/src/lib/contexts/IWORKCellCommentDrawableInfoElement \
UnpackedTarball/libetonyek/src/lib/contexts/IWORKChartInfoElement \
UnpackedTarball/libetonyek/src/lib/contexts/IWORKColorElement \
UnpackedTarball/libetonyek/src/lib/contexts/IWORKCoreImageFilterDescriptorElement \
diff --git a/external/libetonyek/UnpackedTarball_libetonyek.mk b/external/libetonyek/UnpackedTarball_libetonyek.mk
index d1550f47e02a..de8c0dcd1cc5 100644
--- a/external/libetonyek/UnpackedTarball_libetonyek.mk
+++ b/external/libetonyek/UnpackedTarball_libetonyek.mk
@@ -16,12 +16,12 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libetonyek,0))
$(eval $(call gb_UnpackedTarball_update_autoconf_configs,libetonyek))
$(eval $(call gb_UnpackedTarball_add_patches,libetonyek,\
- external/libetonyek/glm-force-dmat3-initialization-needed-from-v0.9.9.0.patch.1 \
external/libetonyek/win_build.patch.1 \
external/libetonyek/ubsan.patch \
external/libetonyek/rpath.patch \
external/libetonyek/warnings.patch \
- external/libetonyek/0001-add-missing-include-for-std-for_each.patch \
+ external/libetonyek/0001-fix-build-with-MSVC.patch.1 \
+ external/libetonyek/0002-fix-build-with-MSVC.patch.1 \
))
ifneq ($(OS),MACOSX)
diff --git a/external/libetonyek/glm-force-dmat3-initialization-needed-from-v0.9.9.0.patch.1 b/external/libetonyek/glm-force-dmat3-initialization-needed-from-v0.9.9.0.patch.1
deleted file mode 100644
index 1add51828ce2..000000000000
--- a/external/libetonyek/glm-force-dmat3-initialization-needed-from-v0.9.9.0.patch.1
+++ /dev/null
@@ -1,62 +0,0 @@
-From 548c2735c09570726f08d5ae9fee8efefb54d529 Mon Sep 17 00:00:00 2001
-From: osnola <alonso at loria.fr>
-Date: Sun, 31 Mar 2019 09:34:11 +0200
-Subject: [PATCH] glm: force dmat3 initialization (needed from v0.9.9.0)
-
-Change-Id: I2cb285f2d9bc1e9818ed946b38caaf8a5de9e61a
-Reviewed-on: https://gerrit.libreoffice.org/69993
-Reviewed-by: Laurent Alonso(fr) <alonso.laurent at gmail.com>
-Tested-by: Laurent Alonso(fr) <alonso.laurent at gmail.com>
----
- src/lib/IWORKCollector.cpp | 6 +++---
- src/lib/KEYCollector.cpp | 3 +--
- 2 files changed, 4 insertions(+), 5 deletions(-)
-
-diff --git a/src/lib/IWORKCollector.cpp b/src/lib/IWORKCollector.cpp
-index 41a9c79..794b462 100644
---- a/src/lib/IWORKCollector.cpp
-+++ b/src/lib/IWORKCollector.cpp
-@@ -183,8 +183,8 @@ private:
- IWORKCollector::Level::Level()
- : m_geometry()
- , m_graphicStyle()
-- , m_trafo()
-- , m_previousTrafo()
-+ , m_trafo(1)
-+ , m_previousTrafo(1)
- {
- }
-
-@@ -601,7 +601,7 @@ void IWORKCollector::startLevel()
- return;
- }
-
-- glm::dmat3 currentTrafo, prevTrafo;
-+ glm::dmat3 currentTrafo(1), prevTrafo(1);
- if (!m_levelStack.empty())
- {
- currentTrafo = m_levelStack.top().m_trafo;
-diff --git a/src/lib/KEYCollector.cpp b/src/lib/KEYCollector.cpp
-index a9d8cc3..08e7e69 100644
---- a/src/lib/KEYCollector.cpp
-+++ b/src/lib/KEYCollector.cpp
-@@ -167,7 +167,7 @@ void KEYCollector::insertTextPlaceholder(const KEYPlaceholderPtr_t &placeholder)
- {
- if (bool(placeholder))
- {
-- glm::dmat3 trafo;
-+ glm::dmat3 trafo(1);
- if (bool(placeholder->m_geometry))
- trafo = makeTransformation(*placeholder->m_geometry);
- trafo *= m_levelStack.top().m_trafo;
-@@ -417,7 +417,6 @@ void KEYCollector::drawTextBox(const IWORKTextPtr_t &text, const glm::dmat3 &tra
- double w = boundingBox->m_naturalSize.m_width;
- double h = boundingBox->m_naturalSize.m_height;
- vec = trafo * glm::dvec3(w, h, 0);
--
- if (vec[0]>0)
- props.insert("svg:width", pt2in(vec[0]));
- if (vec[1]>0)
---
-2.24.1
-
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 562895ebf940..d55a4ee06ed0 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -264,11 +264,11 @@
"dest-filename": "libe-book-0.1.3.tar.xz"
},
{
- "url": "https://dev-www.libreoffice.org/src/libetonyek-0.1.9.tar.xz",
- "sha256": "e61677e8799ce6e55b25afc11aa5339113f6a49cff031f336e32fa58635b1a4a",
+ "url": "https://dev-www.libreoffice.org/src/libetonyek-0.1.10.tar.xz",
+ "sha256": "b430435a6e8487888b761dc848b7981626eb814884963ffe25eb26a139301e9a",
"type": "file",
"dest": "external/tarballs",
- "dest-filename": "libetonyek-0.1.9.tar.xz"
+ "dest-filename": "libetonyek-0.1.10.tar.xz"
},
{
"url": "https://dev-www.libreoffice.org/src/libexttextcat-3.4.5.tar.xz",
More information about the Libreoffice-commits
mailing list