download.lst | 4 - external/libetonyek/0001-allow-0-size-message.patch.1 | 30 --------- external/libetonyek/0001-fix-build-with-MSVC.patch.1 | 28 --------- external/libetonyek/0002-fix-build-with-MSVC.patch.1 | 55 ------------------ external/libetonyek/UnpackedTarball_libetonyek.mk | 5 - external/libetonyek/include.patch | 10 --- external/libetonyek/warnings.patch | 11 --- 7 files changed, 2 insertions(+), 141 deletions(-)
New commits: commit 0a1025adeb3608b06df751225a97d84e5be87d48 Author: Xisco Fauli <[email protected]> AuthorDate: Mon Nov 4 23:02:22 2024 +0100 Commit: Xisco Fauli <[email protected]> CommitDate: Tue Nov 26 14:42:25 2024 +0100 libetonyek: upgrade to 0.1.12 Generated with: ./autogen.sh ./configure make dist-xz Change-Id: I74ac661c5f8db9abf7644212d98b29c3ec5b422f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176036 Tested-by: Jenkins Reviewed-by: Xisco Fauli <[email protected]> diff --git a/download.lst b/download.lst index 04de1629ef0e..7957fba48298 100644 --- a/download.lst +++ b/download.lst @@ -105,8 +105,8 @@ EPUBGEN_TARBALL := libepubgen-0.1.1.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts -ETONYEK_SHA256SUM := b430435a6e8487888b761dc848b7981626eb814884963ffe25eb26a139301e9a -ETONYEK_VERSION_MICRO := 10 +ETONYEK_SHA256SUM := b9fa82fbeb8cb7a701101060e4f3e1e4ef7c38f574b2859d3ecbe43604c21f83 +ETONYEK_VERSION_MICRO := 12 ETONYEK_TARBALL := libetonyek-0.1.$(ETONYEK_VERSION_MICRO).tar.xz # three static lines # so that git cherry-pick diff --git a/external/libetonyek/0001-allow-0-size-message.patch.1 b/external/libetonyek/0001-allow-0-size-message.patch.1 deleted file mode 100644 index 62e584b815a0..000000000000 --- a/external/libetonyek/0001-allow-0-size-message.patch.1 +++ /dev/null @@ -1,30 +0,0 @@ -From 54762245feee35ce6885f7443da8f8443fccd5b5 Mon Sep 17 00:00:00 2001 -From: David Tardon <[email protected]> -Date: Wed, 26 May 2021 20:39:41 +0200 -Subject: [PATCH] allow 0-size message - -It likely means the input is broken, but there is no need to reject it. -Let's just produce a dummy, empty message. - -Change-Id: I03a1e9827f21f6a0ce69d7e16dfcf2e9a0f2d44f ---- - src/lib/IWAMessage.cpp | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/lib/IWAMessage.cpp b/src/lib/IWAMessage.cpp -index c01b1b6..9456444 100644 ---- a/src/lib/IWAMessage.cpp -+++ b/src/lib/IWAMessage.cpp -@@ -42,7 +42,8 @@ IWAMessage::IWAMessage(const RVNGInputStreamPtr_t &input, unsigned long length) - : m_input(input) - , m_fields() - { -- assert(length > 0); -+ if (length == 0) -+ return; - - parse(length); - } --- -2.31.1 - diff --git a/external/libetonyek/0001-fix-build-with-MSVC.patch.1 b/external/libetonyek/0001-fix-build-with-MSVC.patch.1 deleted file mode 100644 index 2a72844dc79a..000000000000 --- a/external/libetonyek/0001-fix-build-with-MSVC.patch.1 +++ /dev/null @@ -1,28 +0,0 @@ -From 1aa22c746b41a688296f4daf4fc35710d2045a33 Mon Sep 17 00:00:00 2001 -From: David Tardon <[email protected]> -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 deleted file mode 100644 index 0eadb0912f6a..000000000000 --- a/external/libetonyek/0002-fix-build-with-MSVC.patch.1 +++ /dev/null @@ -1,55 +0,0 @@ -From 7b69af66227309e9c258beca3bc3934be454a221 Mon Sep 17 00:00:00 2001 -From: David Tardon <[email protected]> -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:-C:-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/UnpackedTarball_libetonyek.mk b/external/libetonyek/UnpackedTarball_libetonyek.mk index 788cf7607710..e13737cbe6a8 100644 --- a/external/libetonyek/UnpackedTarball_libetonyek.mk +++ b/external/libetonyek/UnpackedTarball_libetonyek.mk @@ -19,12 +19,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,libetonyek,\ external/libetonyek/win_build.patch.1 \ 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 \ - external/libetonyek/0001-allow-0-size-message.patch.1 \ external/libetonyek/enumarith.patch \ - external/libetonyek/include.patch \ )) ifneq ($(OS),MACOSX) diff --git a/external/libetonyek/include.patch b/external/libetonyek/include.patch deleted file mode 100644 index 4052d8093e0f..000000000000 --- a/external/libetonyek/include.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- src/lib/IWORKShape.cpp -+++ src/lib/IWORKShape.cpp -@@ -12,6 +12,7 @@ - #include <algorithm> - #include <cmath> - #include <deque> -+#include <iterator> - - #include <glm/glm.hpp> - #include <memory> diff --git a/external/libetonyek/warnings.patch b/external/libetonyek/warnings.patch deleted file mode 100644 index 841d70cb68e8..000000000000 --- a/external/libetonyek/warnings.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/lib/IWORKXMLContext.cpp -+++ src/lib/IWORKXMLContext.cpp -@@ -18,7 +18,7 @@ - { - } - --void IWORKXMLContext::CDATA(const char */*value*/) -+void IWORKXMLContext::CDATA(const char * /*value*/) - { - ETONYEK_DEBUG_MSG(("IWORKXMLContext::cData: find unexpected CDATA block ")); - }
