upload libetonyek 0.1.6

Change-Id: Ia1cbb24f8c579d1b3b7fe0e916318c8f6fa9430f

download.lst

@@ -27,8 +27,8 @@ export DBGHELP_DLL := 13fbc2e8b37ddf28181dd6d8081c2b8e-dbghelp.dll
 export EBOOK_MD5SUM := 6b48eda57914e6343efebc9381027b78
 export EBOOK_TARBALL := libe-book-0.1.2.tar.bz2
 export EPM_TARBALL := 3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz
-export ETONYEK_MD5SUM := ed825557476c00ec989b452b4aef13a7
-export ETONYEK_VERSION_MICRO := 5
+export ETONYEK_MD5SUM := 77ff46936dcc83670557274e7dd2aa33
+export ETONYEK_VERSION_MICRO := 6
 export ETONYEK_TARBALL := libetonyek-0.1.$(ETONYEK_VERSION_MICRO).tar.bz2
 export EXPAT_TARBALL := dd7dab7a5fea97d2a6a43f511449b7cd-expat-2.1.0.tar.gz
 export FIREBIRD_MD5SUM := 7a17ec9889424b98baa29e001a054434

external/libetonyek/0001-fix-brain-fart.patch.1

@@ -0,0 +1,35 @@
+From 649f459c499ceab07446ed913ae661c31e13044a Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon@redhat.com>
+Date: Thu, 14 Jan 2016 09:16:16 +0100
+Subject: [PATCH] fix brain fart
+
+Change-Id: If7c5e3c6cebe2f97f1c9f5793cf25cea135a7735
+---
+ src/lib/IWORKText.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/lib/IWORKText.cpp b/src/lib/IWORKText.cpp
+index 20d7c5b..ef34b4b 100644
+--- a/src/lib/IWORKText.cpp
++++ b/src/lib/IWORKText.cpp
+@@ -763,7 +763,7 @@ void IWORKText::insertBlockContent(const IWORKOutputElements &elements)
+ {
+   if (m_inPara)
+     closePara();
+-  if (!m_inSection and needsSection())
++  if (!m_inSection && needsSection())
+     openSection();
+   m_elements.append(elements);
+   m_ignoreEmptyPara = true;
+@@ -817,7 +817,7 @@ void IWORKText::openPara()
+ {
+   assert(!m_inPara);
+ 
+-  if (!m_inSection and needsSection())
++  if (!m_inSection && needsSection())
+     openSection();
+   handleListLevelChange(m_listLevel);
+ 
+-- 
+2.5.0
+

external/libetonyek/ExternalProject_libetonyek.mk

@@ -18,6 +18,7 @@ $(eval $(call gb_ExternalProject_register_targets,libetonyek,\
 $(eval $(call gb_ExternalProject_use_externals,libetonyek,\
 	boost_headers \
 	glm_headers \
+	liblangtag \
 	libxml2 \
 	mdds_headers \
 	revenge \
@@ -48,6 +49,8 @@ $(call gb_ExternalProject_get_state_target,libetonyek,build) :
 					-Wl$(COMMA)-rpath$(COMMA)\$$$$ORIGIN') \
 			CPPFLAGS="$(CPPFLAGS) $(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost))" \
 			CXXFLAGS="$(CXXFLAGS) $(CXXFLAGS_CXX11)" \
+			LANGTAG_CFLAGS="$(LIBLANGTAG_CFLAGS)" \
+			LANGTAG_LIBS="$(LIBLANGTAG_LIBS)" \
 			XML_CFLAGS="$(LIBXML_CFLAGS)" \
 			XML_LIBS="$(LIBXML_LIBS)" \
 			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \

external/libetonyek/Library_etonyek.mk

@@ -14,6 +14,7 @@ $(eval $(call gb_Library_use_unpacked,etonyek,libetonyek))
 $(eval $(call gb_Library_use_externals,etonyek,\
     boost_headers \
     glm_headers \
+    liblangtag \
 	libxml2 \
 	mdds_headers \
 	revenge \
@@ -45,6 +46,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,etonyek,\
 	UnpackedTarball/libetonyek/src/lib/IWAParser \
 	UnpackedTarball/libetonyek/src/lib/IWAReader \
 	UnpackedTarball/libetonyek/src/lib/IWASnappyStream \
+	UnpackedTarball/libetonyek/src/lib/IWAText \
 	UnpackedTarball/libetonyek/src/lib/IWORKChainedTokenizer \
 	UnpackedTarball/libetonyek/src/lib/IWORKChart \
 	UnpackedTarball/libetonyek/src/lib/IWORKCollector \
@@ -52,6 +54,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,etonyek,\
 	UnpackedTarball/libetonyek/src/lib/IWORKDiscardContext \
 	UnpackedTarball/libetonyek/src/lib/IWORKDocumentInterface \
 	UnpackedTarball/libetonyek/src/lib/IWORKFormula \
+	UnpackedTarball/libetonyek/src/lib/IWORKLanguageManager \
 	UnpackedTarball/libetonyek/src/lib/IWORKMemoryStream \
 	UnpackedTarball/libetonyek/src/lib/IWORKOutputElements \
 	UnpackedTarball/libetonyek/src/lib/IWORKOutputManager \
@@ -59,14 +62,18 @@ $(eval $(call gb_Library_add_generated_exception_objects,etonyek,\
 	UnpackedTarball/libetonyek/src/lib/IWORKPath \
 	UnpackedTarball/libetonyek/src/lib/IWORKPresentationRedirector \
 	UnpackedTarball/libetonyek/src/lib/IWORKProperties \
+	UnpackedTarball/libetonyek/src/lib/IWORKPropertyHandler \
 	UnpackedTarball/libetonyek/src/lib/IWORKPropertyMap \
+	UnpackedTarball/libetonyek/src/lib/IWORKRecorder \
 	UnpackedTarball/libetonyek/src/lib/IWORKShape \
 	UnpackedTarball/libetonyek/src/lib/IWORKSpreadsheetRedirector \
 	UnpackedTarball/libetonyek/src/lib/IWORKStyle \
 	UnpackedTarball/libetonyek/src/lib/IWORKStyleStack \
 	UnpackedTarball/libetonyek/src/lib/IWORKStylesheet \
 	UnpackedTarball/libetonyek/src/lib/IWORKTable \
+	UnpackedTarball/libetonyek/src/lib/IWORKTableRecorder \
 	UnpackedTarball/libetonyek/src/lib/IWORKText \
+	UnpackedTarball/libetonyek/src/lib/IWORKTextRecorder \
 	UnpackedTarball/libetonyek/src/lib/IWORKTextRedirector \
 	UnpackedTarball/libetonyek/src/lib/IWORKToken \
 	UnpackedTarball/libetonyek/src/lib/IWORKTokenizer \
@@ -79,6 +86,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,etonyek,\
 	UnpackedTarball/libetonyek/src/lib/IWORKZlibStream \
 	UnpackedTarball/libetonyek/src/lib/KEY1Parser \
 	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 \
@@ -90,15 +98,18 @@ $(eval $(call gb_Library_add_generated_exception_objects,etonyek,\
 	UnpackedTarball/libetonyek/src/lib/NUM1Parser \
 	UnpackedTarball/libetonyek/src/lib/NUM1ParserState \
 	UnpackedTarball/libetonyek/src/lib/NUM1Token \
+	UnpackedTarball/libetonyek/src/lib/NUM3Parser \
 	UnpackedTarball/libetonyek/src/lib/NUMCollector \
 	UnpackedTarball/libetonyek/src/lib/PAG1Dictionary \
 	UnpackedTarball/libetonyek/src/lib/PAG1Parser \
 	UnpackedTarball/libetonyek/src/lib/PAG1ParserState \
 	UnpackedTarball/libetonyek/src/lib/PAG1Token \
+	UnpackedTarball/libetonyek/src/lib/PAG5Parser \
 	UnpackedTarball/libetonyek/src/lib/PAGCollector \
 	UnpackedTarball/libetonyek/src/lib/PAGProperties \
 	UnpackedTarball/libetonyek/src/lib/PAGTypes \
 	UnpackedTarball/libetonyek/src/lib/contexts/IWORKBezierElement \
+	UnpackedTarball/libetonyek/src/lib/contexts/IWORKBinaryElement \
 	UnpackedTarball/libetonyek/src/lib/contexts/IWORKBrContext \
 	UnpackedTarball/libetonyek/src/lib/contexts/IWORKChartInfoElement \
 	UnpackedTarball/libetonyek/src/lib/contexts/IWORKColorElement \
@@ -114,6 +125,13 @@ $(eval $(call gb_Library_add_generated_exception_objects,etonyek,\
 	UnpackedTarball/libetonyek/src/lib/contexts/IWORKLayoutElement \
 	UnpackedTarball/libetonyek/src/lib/contexts/IWORKLineElement \
 	UnpackedTarball/libetonyek/src/lib/contexts/IWORKLinkElement \
+	UnpackedTarball/libetonyek/src/lib/contexts/IWORKListLabelGeometriesProperty \
+	UnpackedTarball/libetonyek/src/lib/contexts/IWORKListLabelGeometryElement \
+	UnpackedTarball/libetonyek/src/lib/contexts/IWORKListLabelIndentsProperty \
+	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 \
@@ -136,6 +154,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,etonyek,\
 	UnpackedTarball/libetonyek/src/lib/contexts/IWORKTabularInfoElement \
 	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/KEY2StyleContext \

external/libetonyek/UnpackedTarball_libetonyek.mk

@@ -17,6 +17,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-fix-brain-fart.patch.1 \
 ))
 
 ifneq ($(OS),MACOSX)

external/libetonyek/libetonyek-bundled-soname.patch.0

@@ -1,8 +1,6 @@
 --- src/lib/Makefile.in.orig	2015-08-07 10:51:32.494810336 +0200
 +++ src/lib/Makefile.in	2015-08-07 10:51:55.493809942 +0200
-@@ -463,7 +463,7 @@
-
- libetonyek_@ETONYEK_MAJOR_VERSION@_@ETONYEK_MINOR_VERSION@_la_LIBADD = libetonyek_internal.la $(REVENGE_LIBS) $(XML_LIBS) $(ZLIB_LIBS) @LIBETONYEK_WIN32_RESOURCE@
+@@ -463,5 +463,5 @@
  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
 +libetonyek_@ETONYEK_MAJOR_VERSION@_@ETONYEK_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic -no-undefined -release lo