summaryrefslogtreecommitdiff
path: root/textproc/libmwaw/files
diff options
context:
space:
mode:
Diffstat (limited to 'textproc/libmwaw/files')
-rw-r--r--textproc/libmwaw/files/0001-std-isfinite-is-C-11.patch43
-rw-r--r--textproc/libmwaw/files/0001-use-correct-type.patch52
2 files changed, 95 insertions, 0 deletions
diff --git a/textproc/libmwaw/files/0001-std-isfinite-is-C-11.patch b/textproc/libmwaw/files/0001-std-isfinite-is-C-11.patch
new file mode 100644
index 000000000000..73fde5ae0387
--- /dev/null
+++ b/textproc/libmwaw/files/0001-std-isfinite-is-C-11.patch
@@ -0,0 +1,43 @@
+From 5da59d9aa9298136d447e4014aef207f00cdc82b Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon@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/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/textproc/libmwaw/files/0001-use-correct-type.patch b/textproc/libmwaw/files/0001-use-correct-type.patch
new file mode 100644
index 000000000000..7a6ef2dc4689
--- /dev/null
+++ b/textproc/libmwaw/files/0001-use-correct-type.patch
@@ -0,0 +1,52 @@
+From cde8d7c47cdea327f8153ab72cde650f1b36f7f8 Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon@redhat.com>
+Date: Sun, 3 Nov 2013 12:59:29 +0100
+Subject: [PATCH] use correct type
+
+---
+ src/lib/HMWJGraph.cxx | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/lib/HMWJGraph.cxx b/src/lib/HMWJGraph.cxx
+index fca366c..dd83ace 100644
+--- a/src/lib/HMWJGraph.cxx
++++ b/src/lib/HMWJGraph.cxx
+@@ -2668,7 +2668,7 @@ bool HMWJGraph::sendGroup(HMWJGraphInternal::Group const &group, MWAWPosition po
+ return true;
+ }
+
+- std::multimap<long, int>::const_iterator fIt;
++ std::map<long, int>::const_iterator fIt;
+ int numFrames = int(m_state->m_framesList.size());
+ for (size_t c=0; c<group.m_childsList.size(); ++c) {
+ long fId=group.m_childsList[c];
+@@ -2690,7 +2690,7 @@ bool HMWJGraph::sendGroup(HMWJGraphInternal::Group const &group, MWAWPosition po
+
+ bool HMWJGraph::canCreateGraphic(HMWJGraphInternal::Group const &group)
+ {
+- std::multimap<long, int>::const_iterator fIt;
++ std::map<long, int>::const_iterator fIt;
+ int page = group.m_page;
+ int numFrames = int(m_state->m_framesList.size());
+ for (size_t c=0; c<group.m_childsList.size(); ++c) {
+@@ -2726,7 +2726,7 @@ void HMWJGraph::sendGroup(HMWJGraphInternal::Group const &group, MWAWGraphicList
+ if (!listener) return;
+ group.m_parsed=true;
+ MWAWInputStreamPtr &input= m_parserState->m_input;
+- std::multimap<long, int>::const_iterator fIt;
++ std::map<long, int>::const_iterator fIt;
+ int numFrames = int(m_state->m_framesList.size());
+ for (size_t c=0; c<group.m_childsList.size(); ++c) {
+ long fId=group.m_childsList[c];
+@@ -2784,7 +2784,7 @@ void HMWJGraph::sendGroupChild(HMWJGraphInternal::Group const &group, MWAWPositi
+ Box2f partialBdBox;
+ MWAWPosition partialPos(pos);
+ MWAWInputStreamPtr &input= m_parserState->m_input;
+- std::multimap<long, int>::const_iterator fIt;
++ std::map<long, int>::const_iterator fIt;
+ int numFrames = int(m_state->m_framesList.size());
+ for (size_t c=0; c<numChilds; ++c) {
+ long fId=group.m_childsList[c];
+--
+1.8.3.1
+