external/libepubgen/UnpackedTarball_libepubgen.mk | 1
external/libepubgen/tdf-120491.patch | 33 ++++++++++++++++++++++
2 files changed, 34 insertions(+)
New commits:
commit 548e60a8c47e270aba79a5f4e5911cbb35462814
Author: Miklos Vajna <vmik...@collabora.co.uk>
AuthorDate: Wed Oct 24 09:25:35 2018 +0200
Commit: Miklos Vajna <vmik...@collabora.co.uk>
CommitDate: Wed Oct 24 12:43:25 2018 +0200
tdf#120491 EPUB export: fix IngramSpark validator error
Change-Id: I7b6d2217525dbf2e8c9c78a14ea7601c4170857a
Reviewed-on: https://gerrit.libreoffice.org/62267
Reviewed-by: Miklos Vajna <vmik...@collabora.co.uk>
Tested-by: Jenkins
diff --git a/external/libepubgen/UnpackedTarball_libepubgen.mk
b/external/libepubgen/UnpackedTarball_libepubgen.mk
index 14efadb337c0..7553e825284f 100644
--- a/external/libepubgen/UnpackedTarball_libepubgen.mk
+++ b/external/libepubgen/UnpackedTarball_libepubgen.mk
@@ -8,6 +8,7 @@
#
epubgen_patches :=
+epubgen_patches += tdf-120491.patch
ifeq ($(COM_IS_CLANG),TRUE)
ifneq ($(filter -fsanitize=%,$(CC)),)
diff --git a/external/libepubgen/tdf-120491.patch
b/external/libepubgen/tdf-120491.patch
new file mode 100644
index 000000000000..2a02a66e4808
--- /dev/null
+++ b/external/libepubgen/tdf-120491.patch
@@ -0,0 +1,33 @@
+From 92760e4b0b8da126029c5ff858ebec27df4acfa8 Mon Sep 17 00:00:00 2001
+Subject: [PATCH] tdf#120491 EPUBHTMLGenerator: remove not needed <meta
+ content="text/html...">
+
+IngramSpark flags this as an error, and not writing it still passes
+epubcheck.
+---
+ src/lib/EPUBHTMLGenerator.cpp | 7 +------
+ 1 file changed, 1 insertion(+), 6 deletions(-)
+
+diff --git a/src/lib/EPUBHTMLGenerator.cpp b/src/lib/EPUBHTMLGenerator.cpp
+index a950ea5..f6c2527 100644
+--- src/lib/EPUBHTMLGenerator.cpp
++++ src/lib/EPUBHTMLGenerator.cpp
+@@ -579,14 +579,9 @@ void EPUBHTMLGenerator::endDocument()
+ m_impl->m_document.openElement("title", RVNGPropertyList());
+ m_impl->m_document.closeElement("title");
+ }
+- RVNGPropertyList metaAttrs;
+- metaAttrs.insert("http-equiv", "content-type");
+- metaAttrs.insert("content", "text/html; charset=UTF-8");
+- m_impl->m_document.openElement("meta", metaAttrs);
+- m_impl->m_document.closeElement("meta");
+ if (m_impl->m_version >= 30 && m_impl->m_layoutMethod ==
EPUB_LAYOUT_METHOD_FIXED)
+ {
+- metaAttrs.clear();
++ RVNGPropertyList metaAttrs;
+ metaAttrs.insert("name", "viewport");
+ std::stringstream content;
+ if (const librevenge::RVNGProperty *pageWidth =
m_impl->m_actualPageProperties["fo:page-width"])
+--
+2.16.4
+
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
