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

[David Tardon]

 external/libmwaw/0001-std-isfinite-is-C-11.patch |   64 +++++++++++++++++++++++
 external/libmwaw/UnpackedTarball_libmwaw.mk      |    6 ++
 2 files changed, 70 insertions(+)

New commits:
commit 3f5a48bf8aae758f5eb2cae5fafae68e2adaec6c
Author: David Tardon <dtardon at redhat.com>
Date:   Sun Nov 3 12:30:36 2013 +0100

    fix windows build
    
    Change-Id: I6ee6738fe869fbcd15ec045523c250fd1811e343

diff --git a/external/libmwaw/0001-std-isfinite-is-C-11.patch b/external/libmwaw/0001-std-isfinite-is-C-11.patch
new file mode 100644
index 0000000..3943879
--- /dev/null
+++ b/external/libmwaw/0001-std-isfinite-is-C-11.patch
@@ -0,0 +1,64 @@
+From 5da59d9aa9298136d447e4014aef207f00cdc82b Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon at redhat.com>
+Date: Sun, 3 Nov 2013 12:26:26 +0100
+Subject: [PATCH] std::isfinite is C++11
+
+---
+ configure.ac               | 10 ++++++++++
+ src/lib/CWDbaseContent.cxx |  5 +++--
+ 2 files changed, 13 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index b350b91..286939d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -357,6 +357,16 @@ AC_SUBST(ZLIB_CFLAGS)
+ AC_SUBST(ZLIB_LIBS)
+ AM_CONDITIONAL([WITH_LIBMWAW_ZIP], [test "x$with_zip" != "xno"])
+ 
++# ==================
++# Find boost headers
++# ==================
++AC_CHECK_HEADERS(
++        boost/math/special_functions/fpclassify.hpp,
++    [],
++    [AC_MSG_ERROR([Required boost headers not found.])],
++    []
++)
++
+ # =============
+ # Documentation
+ # =============
+diff --git a/src/lib/CWDbaseContent.cxx b/src/lib/CWDbaseContent.cxx
+index f27148d..7198103 100644
+--- a/src/lib/CWDbaseContent.cxx
++++ b/src/lib/CWDbaseContent.cxx
+@@ -33,7 +33,6 @@
+ 
+ #include <time.h>
+ 
+-#include <cmath>
+ #include <cstring>
+ #include <ctime>
+ #include <iomanip>
+@@ -41,6 +40,8 @@
+ #include <set>
+ #include <sstream>
+ 
++#include <boost/math/special_functions/fpclassify.hpp>
++
+ #include <libwpd/libwpd.h>
+ 
+ #include "MWAWContentListener.hxx"
+@@ -969,7 +970,7 @@ void CWDbaseContent::send(double val, CWStyleManager::CellFormat const &format)
+     if (type>=10&&type<=11) type += 4;
+     else if (type>=14) type=16;
+   }
+-  if (type <= 0 || type >=16 || type==10 || type==11 || !std::isfinite(val)) {
++  if (type <= 0 || type >=16 || type==10 || type==11 || !boost::math::isfinite(val)) {
+     s << val;
+     listener->insertUnicodeString(s.str().c_str());
+     return;
+-- 
+1.8.3.1
+
diff --git a/external/libmwaw/UnpackedTarball_libmwaw.mk b/external/libmwaw/UnpackedTarball_libmwaw.mk
index 96fe9df..eea0a94 100644
--- a/external/libmwaw/UnpackedTarball_libmwaw.mk
+++ b/external/libmwaw/UnpackedTarball_libmwaw.mk
@@ -11,4 +11,10 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libmwaw))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,libmwaw,$(MWAW_TARBALL)))
 
+$(eval $(call gb_UnpackedTarball_set_patchlevel,libmwaw,1))
+
+$(eval $(call gb_UnpackedTarball_add_patches,libmwaw,\
+	external/libmwaw/0001-std-isfinite-is-C-11.patch \
+))
+
 # vim: set noet sw=4 ts=4: