upload libetonyek 0.1.9

Change-Id: Ib29e1a622e25731731512a695443ac2c530d30c2
Reviewed-on: https://gerrit.libreoffice.org/65701
Tested-by: Jenkins
Reviewed-by: David Tardon <dtardon@redhat.com>

7 files changed, 7 insertions, 79 deletions

diff --git a/download.lst b/download.lst
index f457721e74c8..947d1869cfd2 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 := 9dc92347aee0cc9ed57b175a3e21f9d96ebe55d30fecb10e841d1050794ed82d
-export ETONYEK_VERSION_MICRO := 8
+export ETONYEK_SHA256SUM := e61677e8799ce6e55b25afc11aa5339113f6a49cff031f336e32fa58635b1a4a
+export ETONYEK_VERSION_MICRO := 9
 export ETONYEK_TARBALL := libetonyek-0.1.$(ETONYEK_VERSION_MICRO).tar.xz
 export EXPAT_SHA256SUM := d9dc32efba7e74f788fcc4f212a43216fc37cf5f23f4c2339664d473353aedf6
 export EXPAT_TARBALL := expat-2.2.5.tar.bz2
diff --git a/external/libetonyek/Library_etonyek.mk b/external/libetonyek/Library_etonyek.mk
index 414b2d02b707..f4d2a0d3bfee 100644
--- a/external/libetonyek/Library_etonyek.mk
+++ b/external/libetonyek/Library_etonyek.mk
@@ -71,6 +71,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,etonyek,\
 	UnpackedTarball/libetonyek/src/lib/IWORKStyle \
 	UnpackedTarball/libetonyek/src/lib/IWORKStyleStack \
 	UnpackedTarball/libetonyek/src/lib/IWORKStylesheet \
+	UnpackedTarball/libetonyek/src/lib/IWORKSubDirStream \
 	UnpackedTarball/libetonyek/src/lib/IWORKTable \
 	UnpackedTarball/libetonyek/src/lib/IWORKTableRecorder \
 	UnpackedTarball/libetonyek/src/lib/IWORKText \
diff --git a/external/libetonyek/UnpackedTarball_libetonyek.mk b/external/libetonyek/UnpackedTarball_libetonyek.mk
index eb38615ffe31..d64d7e45212b 100644
--- a/external/libetonyek/UnpackedTarball_libetonyek.mk
+++ b/external/libetonyek/UnpackedTarball_libetonyek.mk
@@ -20,8 +20,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,libetonyek,\
 	external/libetonyek/ubsan.patch \
 	external/libetonyek/rpath.patch \
 	external/libetonyek/warnings.patch \
-	external/libetonyek/initial-creator.patch.1 \
-	external/libetonyek/forcepoint.parsepath.null.deref.patch \
 ))
 
 ifneq ($(OS),MACOSX)
diff --git a/external/libetonyek/forcepoint.parsepath.null.deref.patch b/external/libetonyek/forcepoint.parsepath.null.deref.patch
deleted file mode 100644
index 2cdf6a5a34c2..000000000000
--- a/external/libetonyek/forcepoint.parsepath.null.deref.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -ru src/lib/IWAParser.cpp libetonyek/src/lib/IWAParser.cpp
---- src/lib/IWAParser.cpp	2018-12-18 21:02:45.772942197 +0000
-+++ src/lib/IWAParser.cpp	2018-12-18 21:05:04.758548097 +0000
-@@ -998,7 +998,14 @@
-       if (get(type) == 1)
-         path->appendMoveTo(get(coords).m_x, get(coords).m_y);
-       else
-+      {
-+        if (path->empty())
-+        {
-+          ETONYEK_DEBUG_MSG(("IWAParser::parsePath: missing prior MoveTo subsequent LineTo\n", get(type) == 1 ? 'M' : 'L'));
-+          return false;
-+        }
-         path->appendLineTo(get(coords).m_x, get(coords).m_y);
-+      }
-       break;
-     }
-     case 4 :
-diff -ru src/lib/IWORKPath.cpp libetonyek/src/lib/IWORKPath.cpp
---- src/lib/IWORKPath.cpp	2018-12-18 21:02:45.775942059 +0000
-+++ src/lib/IWORKPath.cpp	2018-12-18 21:03:39.289480143 +0000
-@@ -594,6 +594,11 @@
-   m_impl->m_closed = false;
- }
- 
-+bool IWORKPath::empty() const
-+{
-+  return m_impl->m_path.empty();
-+}
-+
- void IWORKPath::appendMoveTo(const double x, const double y)
- {
-   if (!m_impl->m_path.empty() && m_impl->m_path.back().size()<=1)
-diff -ru src/lib/IWORKPath.h libetonyek/src/lib/IWORKPath.h
---- src/lib/IWORKPath.h	2018-12-18 21:02:45.772942197 +0000
-+++ src/lib/IWORKPath.h	2018-12-18 21:05:48.323543888 +0000
-@@ -42,6 +42,7 @@
-   void swap(IWORKPath &other);
- 
-   void clear();
-+  bool empty() const;
- 
-   void appendMoveTo(double x, double y);
-   void appendLineTo(double x, double y);
diff --git a/external/libetonyek/initial-creator.patch.1 b/external/libetonyek/initial-creator.patch.1
deleted file mode 100644
index 44b7b19ea1b3..000000000000
--- a/external/libetonyek/initial-creator.patch.1
+++ /dev/null
@@ -1,26 +0,0 @@
-From 1a91c62e829a2eda2f5870aae984125ef48ce672 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
-Date: Mon, 23 Apr 2018 17:20:16 +0100
-Subject: [PATCH] intial-creator->initial-creator
-
-Change-Id: I6fe5d0732edb97ac7ff6d527f48543cab1bb3f7b
----
- src/lib/IWORKCollector.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/lib/IWORKCollector.cpp b/src/lib/IWORKCollector.cpp
-index 0e0c775..4252a49 100644
---- a/src/lib/IWORKCollector.cpp
-+++ b/src/lib/IWORKCollector.cpp
-@@ -771,7 +771,7 @@ void IWORKCollector::fillMetadata(librevenge::RVNGPropertyList &props)
-   if (!m_metadata.m_title.empty())
-     props.insert("dc:subject", m_metadata.m_title.c_str());
-   if (!m_metadata.m_author.empty())
--    props.insert("meta:intial-creator", m_metadata.m_author.c_str());
-+    props.insert("meta:initial-creator", m_metadata.m_author.c_str());
-   if (!m_metadata.m_keywords.empty())
-     props.insert("meta:keyword", m_metadata.m_keywords.c_str());
-   if (!m_metadata.m_comment.empty())
--- 
-2.14.3
-
diff --git a/external/libetonyek/libetonyek-bundled-soname.patch.0 b/external/libetonyek/libetonyek-bundled-soname.patch.0
index 122763d9fc17..5aaf61464edd 100644
--- a/external/libetonyek/libetonyek-bundled-soname.patch.0
+++ b/external/libetonyek/libetonyek-bundled-soname.patch.0
@@ -1,7 +1,6 @@
 --- 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,7 +538,7 @@
- 
+@@ -538,6 +538,6 @@
  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 1f1021367715..3cb422ab70cd 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -223,10 +223,10 @@
                     "dest-filename": "external/tarballs/libe-book-0.1.3.tar.xz"
                 },
                 {
-                    "url": "https://dev-www.libreoffice.org/src/libetonyek-0.1.8.tar.xz",
-                    "sha256": "9dc92347aee0cc9ed57b175a3e21f9d96ebe55d30fecb10e841d1050794ed82d",
+                    "url": "https://dev-www.libreoffice.org/src/libetonyek-0.1.9.tar.xz",
+                    "sha256": "e61677e8799ce6e55b25afc11aa5339113f6a49cff031f336e32fa58635b1a4a",
                     "type": "file",
-                    "dest-filename": "external/tarballs/libetonyek-0.1.8.tar.xz"
+                    "dest-filename": "external/tarballs/libetonyek-0.1.9.tar.xz"
                 },
                 {
                     "url": "https://dev-www.libreoffice.org/src/libexttextcat-3.4.5.tar.xz",