grab an early libetonyek-0.1.8 snapshot

Change-Id: Ib31a8cb75f4cebcaa974b95097270362b3b26aef
Reviewed-on: https://gerrit.libreoffice.org/52689
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

6 files changed, 40 insertions, 45 deletions

diff --git a/external/libetonyek/0001-add-missing-include-for-std-min.patch.1 b/external/libetonyek/0001-add-missing-include-for-std-min.patch.1
deleted file mode 100644
index dc3e70988d56..000000000000
--- a/external/libetonyek/0001-add-missing-include-for-std-min.patch.1
+++ /dev/null
@@ -1,25 +0,0 @@
-From cc71d75b4d9b88b5c920cd039bab3e707e71568b Mon Sep 17 00:00:00 2001
-From: David Tardon <dtardon@redhat.com>
-Date: Mon, 23 Oct 2017 12:55:43 +0200
-Subject: [PATCH] add missing include for std::min
-
-Change-Id: I2088057657f3ce23b91dbbc7b4f5840914dbcaa8
----
- src/lib/IWASnappyStream.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/lib/IWASnappyStream.cpp b/src/lib/IWASnappyStream.cpp
-index 7b28681..9cc84c3 100644
---- a/src/lib/IWASnappyStream.cpp
-+++ b/src/lib/IWASnappyStream.cpp
-@@ -9,6 +9,7 @@
- 
- #include "IWASnappyStream.h"
- 
-+#include <algorithm>
- #include <cassert>
- #include <limits>
- #include <memory>
--- 
-2.14.1
-
diff --git a/external/libetonyek/Library_etonyek.mk b/external/libetonyek/Library_etonyek.mk
index b79d3603bffe..414b2d02b707 100644
--- a/external/libetonyek/Library_etonyek.mk
+++ b/external/libetonyek/Library_etonyek.mk
@@ -43,6 +43,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,etonyek,\
 	UnpackedTarball/libetonyek/src/lib/EtonyekDocument \
 	UnpackedTarball/libetonyek/src/lib/IWAField \
 	UnpackedTarball/libetonyek/src/lib/IWAMessage \
+	UnpackedTarball/libetonyek/src/lib/IWAObjectIndex \
 	UnpackedTarball/libetonyek/src/lib/IWAParser \
 	UnpackedTarball/libetonyek/src/lib/IWAReader \
 	UnpackedTarball/libetonyek/src/lib/IWASnappyStream \
@@ -84,15 +85,17 @@ $(eval $(call gb_Library_add_generated_exception_objects,etonyek,\
 	UnpackedTarball/libetonyek/src/lib/IWORKXMLContextBase \
 	UnpackedTarball/libetonyek/src/lib/IWORKXMLParserState \
 	UnpackedTarball/libetonyek/src/lib/IWORKZlibStream \
+	UnpackedTarball/libetonyek/src/lib/KEY1Dictionary \
 	UnpackedTarball/libetonyek/src/lib/KEY1Parser \
+	UnpackedTarball/libetonyek/src/lib/KEY1ParserState \
 	UnpackedTarball/libetonyek/src/lib/KEY1Token \
-	UnpackedTarball/libetonyek/src/lib/KEY2Collector \
 	UnpackedTarball/libetonyek/src/lib/KEY2Dictionary \
 	UnpackedTarball/libetonyek/src/lib/KEY2Parser \
 	UnpackedTarball/libetonyek/src/lib/KEY2ParserState \
 	UnpackedTarball/libetonyek/src/lib/KEY2Token \
 	UnpackedTarball/libetonyek/src/lib/KEY6Parser \
 	UnpackedTarball/libetonyek/src/lib/KEYCollector \
+	UnpackedTarball/libetonyek/src/lib/KEYProperties \
 	UnpackedTarball/libetonyek/src/lib/KEYTypes \
 	UnpackedTarball/libetonyek/src/lib/NUM1Dictionary \
 	UnpackedTarball/libetonyek/src/lib/NUM1Parser \
@@ -111,12 +114,16 @@ $(eval $(call gb_Library_add_generated_exception_objects,etonyek,\
 	UnpackedTarball/libetonyek/src/lib/contexts/IWORKBezierElement \
 	UnpackedTarball/libetonyek/src/lib/contexts/IWORKBinaryElement \
 	UnpackedTarball/libetonyek/src/lib/contexts/IWORKBrContext \
+	UnpackedTarball/libetonyek/src/lib/contexts/IWORKCalcEngineContext \
 	UnpackedTarball/libetonyek/src/lib/contexts/IWORKChartInfoElement \
 	UnpackedTarball/libetonyek/src/lib/contexts/IWORKColorElement \
 	UnpackedTarball/libetonyek/src/lib/contexts/IWORKCoreImageFilterDescriptorElement \
 	UnpackedTarball/libetonyek/src/lib/contexts/IWORKDataElement \
+	UnpackedTarball/libetonyek/src/lib/contexts/IWORKFieldElement \
+	UnpackedTarball/libetonyek/src/lib/contexts/IWORKFillElement \
 	UnpackedTarball/libetonyek/src/lib/contexts/IWORKFilteredImageElement \
-	UnpackedTarball/libetonyek/src/lib/contexts/IWORKFoElement \
+	UnpackedTarball/libetonyek/src/lib/contexts/IWORKFormatElement \
+	UnpackedTarball/libetonyek/src/lib/contexts/IWORKFormulaElement \
 	UnpackedTarball/libetonyek/src/lib/contexts/IWORKGeometryElement \
 	UnpackedTarball/libetonyek/src/lib/contexts/IWORKGroupElement \
 	UnpackedTarball/libetonyek/src/lib/contexts/IWORKHeaderFooterContext \
@@ -124,6 +131,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,etonyek,\
 	UnpackedTarball/libetonyek/src/lib/contexts/IWORKImageElement \
 	UnpackedTarball/libetonyek/src/lib/contexts/IWORKLayoutElement \
 	UnpackedTarball/libetonyek/src/lib/contexts/IWORKLineElement \
+	UnpackedTarball/libetonyek/src/lib/contexts/IWORKLineEndElement \
 	UnpackedTarball/libetonyek/src/lib/contexts/IWORKLinkElement \
 	UnpackedTarball/libetonyek/src/lib/contexts/IWORKListLabelGeometriesProperty \
 	UnpackedTarball/libetonyek/src/lib/contexts/IWORKListLabelGeometryElement \
@@ -131,7 +139,6 @@ $(eval $(call gb_Library_add_generated_exception_objects,etonyek,\
 	UnpackedTarball/libetonyek/src/lib/contexts/IWORKListLabelTypeinfoElement \
 	UnpackedTarball/libetonyek/src/lib/contexts/IWORKListLabelTypesProperty \
 	UnpackedTarball/libetonyek/src/lib/contexts/IWORKListTextIndentsProperty \
-	UnpackedTarball/libetonyek/src/lib/contexts/IWORKListstyleElement \
 	UnpackedTarball/libetonyek/src/lib/contexts/IWORKMediaElement \
 	UnpackedTarball/libetonyek/src/lib/contexts/IWORKMetadataElement \
 	UnpackedTarball/libetonyek/src/lib/contexts/IWORKNumberConverter \
@@ -145,20 +152,34 @@ $(eval $(call gb_Library_add_generated_exception_objects,etonyek,\
 	UnpackedTarball/libetonyek/src/lib/contexts/IWORKSizeElement \
 	UnpackedTarball/libetonyek/src/lib/contexts/IWORKSpanElement \
 	UnpackedTarball/libetonyek/src/lib/contexts/IWORKStringElement \
+	UnpackedTarball/libetonyek/src/lib/contexts/IWORKStrokeContext \
 	UnpackedTarball/libetonyek/src/lib/contexts/IWORKStyleContext \
 	UnpackedTarball/libetonyek/src/lib/contexts/IWORKStyleRefContext \
 	UnpackedTarball/libetonyek/src/lib/contexts/IWORKStylesContext \
 	UnpackedTarball/libetonyek/src/lib/contexts/IWORKStylesheetBase \
 	UnpackedTarball/libetonyek/src/lib/contexts/IWORKTabElement \
+	UnpackedTarball/libetonyek/src/lib/contexts/IWORKTableInfoElement \
 	UnpackedTarball/libetonyek/src/lib/contexts/IWORKTabsElement \
 	UnpackedTarball/libetonyek/src/lib/contexts/IWORKTabularInfoElement \
+	UnpackedTarball/libetonyek/src/lib/contexts/IWORKTabularModelElement \
 	UnpackedTarball/libetonyek/src/lib/contexts/IWORKTextBodyElement \
 	UnpackedTarball/libetonyek/src/lib/contexts/IWORKTextElement \
 	UnpackedTarball/libetonyek/src/lib/contexts/IWORKTextLabelElement \
 	UnpackedTarball/libetonyek/src/lib/contexts/IWORKTextStorageElement \
 	UnpackedTarball/libetonyek/src/lib/contexts/IWORKUnfilteredElement \
+	UnpackedTarball/libetonyek/src/lib/contexts/IWORKWrapElement \
+	UnpackedTarball/libetonyek/src/lib/contexts/KEY1ContentElement \
+	UnpackedTarball/libetonyek/src/lib/contexts/KEY1DivElement \
+	UnpackedTarball/libetonyek/src/lib/contexts/KEY1FillElement \
+	UnpackedTarball/libetonyek/src/lib/contexts/KEY1SpanElement \
+	UnpackedTarball/libetonyek/src/lib/contexts/KEY1StringConverter \
+	UnpackedTarball/libetonyek/src/lib/contexts/KEY1StylesContext \
+	UnpackedTarball/libetonyek/src/lib/contexts/KEY1TableElement \
 	UnpackedTarball/libetonyek/src/lib/contexts/KEY2StyleContext \
+	UnpackedTarball/libetonyek/src/lib/contexts/PAG1AnnotationContext \
+	UnpackedTarball/libetonyek/src/lib/contexts/PAG1AnnotationElement \
 	UnpackedTarball/libetonyek/src/lib/contexts/PAG1FootnotesElement \
+	UnpackedTarball/libetonyek/src/lib/contexts/PAG1ShapeContext \
 	UnpackedTarball/libetonyek/src/lib/contexts/PAG1StyleContext \
 	UnpackedTarball/libetonyek/src/lib/contexts/PAG1TextStorageElement \
 	UnpackedTarball/libetonyek/src/lib/libetonyek_utils \
diff --git a/external/libetonyek/UnpackedTarball_libetonyek.mk b/external/libetonyek/UnpackedTarball_libetonyek.mk
index 1b59b77cab97..d64d7e45212b 100644
--- a/external/libetonyek/UnpackedTarball_libetonyek.mk
+++ b/external/libetonyek/UnpackedTarball_libetonyek.mk
@@ -19,8 +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/0001-add-missing-include-for-std-min.patch.1 \
-	external/libetonyek/c++17.patch \
+	external/libetonyek/warnings.patch \
 ))
 
 ifneq ($(OS),MACOSX)
diff --git a/external/libetonyek/c++17.patch b/external/libetonyek/c++17.patch
deleted file mode 100644
index bc4e9b96a46a..000000000000
--- a/external/libetonyek/c++17.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/lib/KEY1Token.inc
-+++ src/lib/KEY1Token.inc
-@@ -524,7 +524,7 @@
- 
-   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-     {
--      register int key = hash (str, len);
-+      int key = hash (str, len);
- 
-       if (key <= MAX_HASH_VALUE && key >= 0)
-         {
diff --git a/external/libetonyek/ubsan.patch b/external/libetonyek/ubsan.patch
index b7da70904b62..260e9f33df58 100644
--- a/external/libetonyek/ubsan.patch
+++ b/external/libetonyek/ubsan.patch
@@ -1,11 +1,11 @@
 --- src/lib/libetonyek_xml.cpp
 +++ src/lib/libetonyek_xml.cpp
-@@ -33,7 +33,7 @@
+@@ -35,7 +35,7 @@
      unsigned long bytesRead = 0;
-     const unsigned char *const bytes = input->read(len, bytesRead);
+     const unsigned char *const bytes = input->read((unsigned long)len, bytesRead);
  
--    std::memcpy(buffer, bytes, static_cast<int>(bytesRead));
-+    if (bytesRead != 0) std::memcpy(buffer, bytes, static_cast<int>(bytesRead));
+-    std::memcpy(buffer, bytes, static_cast<size_t>(bytesRead));
++    if (bytesRead != 0) std::memcpy(buffer, bytes, static_cast<size_t>(bytesRead));
      return static_cast<int>(bytesRead);
    }
    catch (...)
diff --git a/external/libetonyek/warnings.patch b/external/libetonyek/warnings.patch
new file mode 100644
index 000000000000..841d70cb68e8
--- /dev/null
+++ b/external/libetonyek/warnings.patch
@@ -0,0 +1,11 @@
+--- 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\n"));
+ }