external/libetonyek/UnpackedTarball_libetonyek.mk |    1 
 external/libetonyek/silence-libxml.patch          |   24 ++++++++++++++++++++++
 2 files changed, 25 insertions(+)

New commits:
commit a9e3dc3c2acf95248cb0f64634ca5b203802d46e
Author: Caolán McNamara <caol...@redhat.com>
Date:   Tue May 30 13:21:45 2017 +0100

    stop spewing libxml2 warnings during filter detection
    
    Change-Id: Ifef3e75065e55aefba0f9498cf517efaf78ba6c1

diff --git a/external/libetonyek/UnpackedTarball_libetonyek.mk 
b/external/libetonyek/UnpackedTarball_libetonyek.mk
index eba2f6a8b574..82c1709a69b5 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/silence-libxml.patch \
        external/libetonyek/0001-fix-brain-fart.patch.1 \
 ))
 
diff --git a/external/libetonyek/silence-libxml.patch 
b/external/libetonyek/silence-libxml.patch
new file mode 100644
index 000000000000..f8730bf332b2
--- /dev/null
+++ b/external/libetonyek/silence-libxml.patch
@@ -0,0 +1,24 @@
+--- 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
+   {
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to