[Libreoffice-commits] core.git: configure.ac download.lst external/libetonyek
David Tardon
dtardon at redhat.com
Mon Oct 23 12:16:36 UTC 2017
configure.ac | 2
download.lst | 6 -
external/libetonyek/0001-add-missing-include-for-std-min.patch.1 | 25 +++++++
external/libetonyek/0001-fix-brain-fart.patch.1 | 35 ----------
external/libetonyek/UnpackedTarball_libetonyek.mk | 3
external/libetonyek/silence-libxml.patch | 24 ------
6 files changed, 30 insertions(+), 65 deletions(-)
New commits:
commit 688dddcd843b85eeadaea49b8ddb7c90c05c4a9f
Author: David Tardon <dtardon at redhat.com>
Date: Mon Oct 23 10:21:50 2017 +0200
upload libetonyek 0.1.7
Change-Id: Iabca84c1ba3a14716b7707541434efcc82581a78
Reviewed-on: https://gerrit.libreoffice.org/43709
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: David Tardon <dtardon at redhat.com>
diff --git a/configure.ac b/configure.ac
index 07df6eb7d9f0..a47fc48f10e8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7702,7 +7702,7 @@ libo_CHECK_SYSTEM_MODULE([libmwaw],[MWAW],[libmwaw-0.3 >= 0.3.1])
libo_PKG_VERSION([MWAW], [libmwaw-0.3], [0.3.11])
libo_CHECK_SYSTEM_MODULE([libetonyek],[ETONYEK],[libetonyek-0.1])
-libo_PKG_VERSION([ETONYEK], [libetonyek-0.1], [0.1.5])
+libo_PKG_VERSION([ETONYEK], [libetonyek-0.1], [0.1.7])
libo_CHECK_SYSTEM_MODULE([libfreehand],[FREEHAND],[libfreehand-0.1])
diff --git a/download.lst b/download.lst
index f254a7cb27fb..25f8060c392a 100644
--- a/download.lst
+++ b/download.lst
@@ -40,9 +40,9 @@ export EPM_SHA256SUM := b3fc4c5445de6c9a801504a3ea3efb2d4ea9d5a622c9427e716736e7
export EPM_TARBALL := 3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz
export EPUBGEN_SHA256SUM := eea910b042526ed52f7ab9292b7fa31fca32f9e042285818074ff33664db4fa2
export EPUBGEN_TARBALL := libepubgen-0.0.1.tar.bz2
-export ETONYEK_SHA256SUM := 032f53e8d7691e48a73ddbe74fa84c906ff6ff32a33e6ee2a935b6fdb6aecb78
-export ETONYEK_VERSION_MICRO := 6
-export ETONYEK_TARBALL := libetonyek-0.1.$(ETONYEK_VERSION_MICRO).tar.bz2
+export ETONYEK_SHA256SUM := 69dbe10d4426d52f09060d489f8eb90dfa1df592e82eb0698d9dbaf38cc734ac
+export ETONYEK_VERSION_MICRO := 7
+export ETONYEK_TARBALL := libetonyek-0.1.$(ETONYEK_VERSION_MICRO).tar.xz
export EXPAT_SHA256SUM := b31890fb02f85c002a67491923f89bda5028a880fd6c374f707193ad81aace5f
export EXPAT_TARBALL := expat-2.2.3.tar.bz2
export FIREBIRD_SHA256SUM := 6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860
diff --git a/external/libetonyek/0001-add-missing-include-for-std-min.patch.1 b/external/libetonyek/0001-add-missing-include-for-std-min.patch.1
new file mode 100644
index 000000000000..dc3e70988d56
--- /dev/null
+++ b/external/libetonyek/0001-add-missing-include-for-std-min.patch.1
@@ -0,0 +1,25 @@
+From cc71d75b4d9b88b5c920cd039bab3e707e71568b Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon at redhat.com>
+Date: Mon, 23 Oct 2017 12:55:43 +0200
+Subject: [PATCH] add missing include for std::min
+
+Change-Id: I2088057657f3ce23b91dbbc7b4f5840914dbcaa8
+---
+ src/lib/IWASnappyStream.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/lib/IWASnappyStream.cpp b/src/lib/IWASnappyStream.cpp
+index 7b28681..9cc84c3 100644
+--- a/src/lib/IWASnappyStream.cpp
++++ b/src/lib/IWASnappyStream.cpp
+@@ -9,6 +9,7 @@
+
+ #include "IWASnappyStream.h"
+
++#include <algorithm>
+ #include <cassert>
+ #include <limits>
+ #include <memory>
+--
+2.14.1
+
diff --git a/external/libetonyek/0001-fix-brain-fart.patch.1 b/external/libetonyek/0001-fix-brain-fart.patch.1
deleted file mode 100644
index 441e275c5f45..000000000000
--- a/external/libetonyek/0001-fix-brain-fart.patch.1
+++ /dev/null
@@ -1,35 +0,0 @@
-From 649f459c499ceab07446ed913ae661c31e13044a Mon Sep 17 00:00:00 2001
-From: David Tardon <dtardon at 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/UnpackedTarball_libetonyek.mk b/external/libetonyek/UnpackedTarball_libetonyek.mk
index 3d6cce2bab7b..f178b469e028 100644
--- a/external/libetonyek/UnpackedTarball_libetonyek.mk
+++ b/external/libetonyek/UnpackedTarball_libetonyek.mk
@@ -19,8 +19,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,libetonyek,\
external/libetonyek/win_build.patch.1 \
external/libetonyek/ubsan.patch \
external/libetonyek/rpath.patch \
- external/libetonyek/silence-libxml.patch \
- external/libetonyek/0001-fix-brain-fart.patch.1 \
+ external/libetonyek/0001-add-missing-include-for-std-min.patch.1 \
))
ifneq ($(OS),MACOSX)
diff --git a/external/libetonyek/silence-libxml.patch b/external/libetonyek/silence-libxml.patch
deleted file mode 100644
index f8730bf332b2..000000000000
--- a/external/libetonyek/silence-libxml.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- src/lib/EtonyekDocument.cpp
-+++ src/lib/EtonyekDocument.cpp
-@@ -103,12 +103,21 @@
- return false;
- }
-
-+namespace
-+{
-+ void handleError(void * /*arg*/, const char * /*msg*/, xmlParserSeverities /*severity*/, xmlTextReaderLocatorPtr /*locator*/)
-+ {
-+ }
-+}
-+
- bool probeXML(DetectionInfo &info)
- {
- const shared_ptr<xmlTextReader> reader(xmlReaderForIO(readFromStream, closeStream, info.m_input.get(), "", 0, 0), xmlFreeTextReader);
- if (!reader)
- return false;
-
-+ xmlTextReaderSetErrorHandler(reader.get(), handleError, NULL);
-+
- int ret = 0;
- do
- {
More information about the Libreoffice-commits
mailing list