[Libreoffice-commits] core.git: external/libetonyek

[David Tardon]

 external/libetonyek/UnpackedTarball_libetonyek.mk |    6 ++++++
 external/libetonyek/assert.patch                  |   20 ++++++++++++++++++++
 2 files changed, 26 insertions(+)

New commits:
commit 7a7f73cebcd84a03a5db85d3b423b65c897651f4
Author: David Tardon <dtardon at redhat.com>
Date:   Tue May 19 17:47:52 2015 +0200

    restore windows build fix
    
    Change-Id: I1269be7ab26a4f7ba30a70eb8aef3023384a7de2

diff --git a/external/libetonyek/UnpackedTarball_libetonyek.mk b/external/libetonyek/UnpackedTarball_libetonyek.mk
index 52e6a95..4853907 100644
--- a/external/libetonyek/UnpackedTarball_libetonyek.mk
+++ b/external/libetonyek/UnpackedTarball_libetonyek.mk
@@ -11,4 +11,10 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libetonyek))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,libetonyek,$(ETONYEK_TARBALL)))
 
+$(eval $(call gb_UnpackedTarball_set_patchlevel,libetonyek,0))
+
+$(eval $(call gb_UnpackedTarball_add_patches,libetonyek,\
+	external/libetonyek/assert.patch \
+))
+
 # vim: set noet sw=4 ts=4:
diff --git a/external/libetonyek/assert.patch b/external/libetonyek/assert.patch
new file mode 100644
index 0000000..fe5e282
--- /dev/null
+++ b/external/libetonyek/assert.patch
@@ -0,0 +1,20 @@
+--- src/lib/EtonyekDocument.cpp
++++ src/lib/EtonyekDocument.cpp
+@@ -7,6 +7,8 @@
+ 
+ #include <libetonyek/libetonyek.h>
+ 
++#include <cassert>
++
+ #include <boost/scoped_ptr.hpp>
+ #include <boost/shared_ptr.hpp>
+ #include <boost/logic/tribool.hpp>
+@@ -179,7 +181,7 @@
+     info.input->seek(0, RVNG_SEEK_SET);
+   }
+ 
+-  assert(!isGzipped);
++  assert(bool(!isGzipped));
+ 
+   return probeXMLImpl(info.input, probe, type, info);
+ }