summaryrefslogtreecommitdiffstats
path: root/external
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2016-01-13 14:33:51 +0100
committerFridrich Strba <fridrich@documentfoundation.org>2016-01-25 15:30:09 +0000
commitcb989a58ec456a340a8a1f26683847f9b2a87caa (patch)
tree6d6093c650bc8dae45d45af99e617f70d8134941 /external
parentallow ext. projects to depend on liblangtag (diff)
downloadcore-cb989a58ec456a340a8a1f26683847f9b2a87caa.tar.gz
core-cb989a58ec456a340a8a1f26683847f9b2a87caa.zip
upload libetonyek 0.1.6
Change-Id: Ia1cbb24f8c579d1b3b7fe0e916318c8f6fa9430f (cherry picked from commit 058314d2389d9bb9511d5014f33568b4a6250b2f) Reviewed-on: https://gerrit.libreoffice.org/21545 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
Diffstat (limited to 'external')
-rw-r--r--external/libetonyek/0001-fix-brain-fart.patch.135
-rw-r--r--external/libetonyek/ExternalProject_libetonyek.mk3
-rw-r--r--external/libetonyek/Library_etonyek.mk19
-rw-r--r--external/libetonyek/UnpackedTarball_libetonyek.mk1
-rw-r--r--external/libetonyek/libetonyek-bundled-soname.patch.04
5 files changed, 59 insertions, 3 deletions
diff --git a/external/libetonyek/0001-fix-brain-fart.patch.1 b/external/libetonyek/0001-fix-brain-fart.patch.1
new file mode 100644
index 000000000000..441e275c5f45
--- /dev/null
+++ b/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
+
diff --git a/external/libetonyek/ExternalProject_libetonyek.mk b/external/libetonyek/ExternalProject_libetonyek.mk
index d296a1e817f1..25cff342dba4 100644
--- a/external/libetonyek/ExternalProject_libetonyek.mk
+++ b/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)) \
diff --git a/external/libetonyek/Library_etonyek.mk b/external/libetonyek/Library_etonyek.mk
index aa69c476ce6d..b79d3603bffe 100644
--- a/external/libetonyek/Library_etonyek.mk
+++ b/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 \
diff --git a/external/libetonyek/UnpackedTarball_libetonyek.mk b/external/libetonyek/UnpackedTarball_libetonyek.mk
index b736757138fa..eba2f6a8b574 100644
--- a/external/libetonyek/UnpackedTarball_libetonyek.mk
+++ b/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)
diff --git a/external/libetonyek/libetonyek-bundled-soname.patch.0 b/external/libetonyek/libetonyek-bundled-soname.patch.0
index 301aa38c26c0..753e384a9802 100644
--- a/external/libetonyek/libetonyek-bundled-soname.patch.0
+++ b/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
generated by cgit (git 2.34.1) at 2024-06-01 02:32:28 +0000