configure.ac | 2
download.lst | 4 -
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 | 2
external/libetonyek/libetonyek-bundled-soname.patch.0 | 3
solenv/flatpak-manifest.in | 7 +-
8 files changed, 95 insertions(+), 7 deletions(-)
New commits:
commit 6bdb8b76b2873785d003f175ac0e503cee8ed7bf
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Thu Feb 6 11:04:21 2020 +0000
Commit: Aron Budea <aron.bu...@collabora.com>
CommitDate: Sat Dec 11 21:03:21 2021 +0100
upload libetonyek 0.1.10
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115769
Tested-by: Jenkins
Reviewed-by: David Tardon <dtar...@redhat.com>
(cherry picked from commit 5471dc3238e8005fa146cfa0a81c5784ea018e95)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120734
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Aron Budea <aron.bu...@collabora.com>
Change-Id: Iad586802e89b19701a20bebff06b238b617af2a9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126687
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Aron Budea <aron.bu...@collabora.com>
diff --git a/configure.ac b/configure.ac
index 6bd1d832d1b3..c7e87d54d3e5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8551,7 +8551,7 @@ libo_CHECK_SYSTEM_MODULE([libmwaw],[MWAW],[libmwaw-0.3 >=
0.3.1])
libo_PKG_VERSION([MWAW], [libmwaw-0.3], [0.3.16])
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 5b67845bd0c6..eddf5d1d7958 100644
--- a/download.lst
+++ b/download.lst
@@ -39,8 +39,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-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 <dtar...@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 <dtar...@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 cd7a30e8adea..de8c0dcd1cc5 100644
--- a/external/libetonyek/UnpackedTarball_libetonyek.mk
+++ b/external/libetonyek/UnpackedTarball_libetonyek.mk
@@ -20,6 +20,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,libetonyek,\
external/libetonyek/ubsan.patch \
external/libetonyek/rpath.patch \
external/libetonyek/warnings.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/libetonyek-bundled-soname.patch.0
b/external/libetonyek/libetonyek-bundled-soname.patch.0
index 5aaf61464edd..15a58fa83635 100644
--- a/external/libetonyek/libetonyek-bundled-soname.patch.0
+++ b/external/libetonyek/libetonyek-bundled-soname.patch.0
@@ -1,6 +1,7 @@
--- src/lib/Makefile.in.orig 2016-01-12 19:21:24.000000000 +0100
+++ src/lib/Makefile.in 2016-03-02 18:19:52.214551270 +0100
-@@ -538,6 +538,6 @@
+@@ -538,7 +538,7 @@
+ $(XML_CFLAGS) $(ZLIB_CFLAGS) $(DEBUG_CXXFLAGS) $(am__append_1)
libetonyek_@ETONYEK_MAJOR_VERSION@_@ETONYEK_MINOR_VERSION@_la_LIBADD =
libetonyek_internal.la $(REVENGE_LIBS) $(LANGTAG_LIBS) $(XML_LIBS) $(ZLIB_LIBS)
@LIBETONYEK_WIN32_RESOURCE@
libetonyek_@ETONYEK_MAJOR_VERSION@_@ETONYEK_MINOR_VERSION@_la_DEPENDENCIES =
libetonyek_internal.la @LIBETONYEK_WIN32_RESOURCE@
-libetonyek_@ETONYEK_MAJOR_VERSION@_@ETONYEK_MINOR_VERSION@_la_LDFLAGS =
$(version_info) -export-dynamic -no-undefined
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index b264a32eeeaf..2c7cfdda3447 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -231,10 +231,11 @@
"dest-filename": "external/tarballs/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-filename":
"external/tarballs/libetonyek-0.1.9.tar.xz"
+ "dest": "external/tarballs",
+ "dest-filename": "libetonyek-0.1.10.tar.xz"
},
{
"url":
"https://dev-www.libreoffice.org/src/libexttextcat-3.4.5.tar.xz";,
