summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2018-12-29 09:34:05 +0100
committerMichael Stahl <michael.stahl@allotropia.de>2021-11-17 19:19:31 +0100
commit03309d88e1685f17f85b0609befec98a47c978ec (patch)
treefd2b1175b06334951e665aef66e040363b76d803
parent4bdb379380f1f64b657eaad72781a6d86e38cf85 (diff)
upload libetonyek 0.1.9
Reviewed-on: https://gerrit.libreoffice.org/65701 Tested-by: Jenkins Reviewed-by: David Tardon <dtardon@redhat.com> (cherry picked from commit c6e73f3e5bfd5b1cca94f985b5299857d0238ae3) Change-Id: Ib29e1a622e25731731512a695443ac2c530d30c2
-rw-r--r--download.lst4
-rw-r--r--external/libetonyek/Library_etonyek.mk1
-rw-r--r--external/libetonyek/UnpackedTarball_libetonyek.mk1
-rw-r--r--external/libetonyek/initial-creator.patch.126
-rw-r--r--external/libetonyek/libetonyek-bundled-soname.patch.03
-rw-r--r--solenv/flatpak-manifest.in6
6 files changed, 7 insertions, 34 deletions
diff --git a/download.lst b/download.lst
index 712ea9d0ba52..92e64f51f323 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 := 2f9b6a580b94577b150a7d5617ad4643a4301a6616ff459307df3e225bcfbf40
export EXPAT_TARBALL := expat-2.4.1.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 d90e44955687..d64d7e45212b 100644
--- a/external/libetonyek/UnpackedTarball_libetonyek.mk
+++ b/external/libetonyek/UnpackedTarball_libetonyek.mk
@@ -20,7 +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 \
))
ifneq ($(OS),MACOSX)
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 7db6021ece3c..6fccf7b3f5c7 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -261,10 +261,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",