diff options
author | joerg <joerg@pkgsrc.org> | 2013-02-26 23:37:32 +0000 |
---|---|---|
committer | joerg <joerg@pkgsrc.org> | 2013-02-26 23:37:32 +0000 |
commit | 26179a9c571e4a794a002f41f9abbf2af8ddde48 (patch) | |
tree | d805016d0c43b48d2319e950d8c3d8338cc22f77 /misc/rocs/patches | |
parent | 6a800e646ecf8f2838fab5e24847f322b32c7986 (diff) | |
download | pkgsrc-26179a9c571e4a794a002f41f9abbf2af8ddde48.tar.gz |
Require C++11 when building with Clang. Fix fallout of Boost update due
to MOC's limited C preprocessor. Derive template arguments of make_pair
automatically.
Diffstat (limited to 'misc/rocs/patches')
4 files changed, 67 insertions, 0 deletions
diff --git a/misc/rocs/patches/patch-src_Plugins_AssignValues_assignvalueswidget.h b/misc/rocs/patches/patch-src_Plugins_AssignValues_assignvalueswidget.h new file mode 100644 index 00000000000..7d3532acd66 --- /dev/null +++ b/misc/rocs/patches/patch-src_Plugins_AssignValues_assignvalueswidget.h @@ -0,0 +1,15 @@ +$NetBSD: patch-src_Plugins_AssignValues_assignvalueswidget.h,v 1.1 2013/02/26 23:37:32 joerg Exp $ + +--- src/Plugins/AssignValues/assignvalueswidget.h.orig 2011-11-17 20:57:24.000000000 +0000 ++++ src/Plugins/AssignValues/assignvalueswidget.h +@@ -21,8 +21,10 @@ + + #include <QWidget> + ++#ifndef Q_MOC_RUN + #include <boost/graph/adjacency_list.hpp> + #include <boost/graph/topology.hpp> ++#endif + #include <KDialog> + #include "Rocs_Typedefs.h" + diff --git a/misc/rocs/patches/patch-src_Plugins_DataStructure_Graph_GraphStructure.cpp b/misc/rocs/patches/patch-src_Plugins_DataStructure_Graph_GraphStructure.cpp new file mode 100644 index 00000000000..2db4c368748 --- /dev/null +++ b/misc/rocs/patches/patch-src_Plugins_DataStructure_Graph_GraphStructure.cpp @@ -0,0 +1,22 @@ +$NetBSD: patch-src_Plugins_DataStructure_Graph_GraphStructure.cpp,v 1.1 2013/02/26 23:37:32 joerg Exp $ + +--- src/Plugins/DataStructure/Graph/GraphStructure.cpp.orig 2013-02-26 22:55:07.000000000 +0000 ++++ src/Plugins/DataStructure/Graph/GraphStructure.cpp +@@ -153,7 +153,7 @@ QScriptValue Rocs::GraphStructure::dijks + BOOST_FOREACH( PointerPtr p, this->pointers() ) + { + edges[counter] = Edge(node_mapping[p->from().get()], node_mapping[p->to().get()]); +- edge_mapping[std::make_pair<int,int>(node_mapping[p->from().get()], node_mapping[p->to().get()])] = p; ++ edge_mapping[std::make_pair(node_mapping[p->from().get()], node_mapping[p->to().get()])] = p; + if (!p->value().isEmpty()) { + weights[counter] = p->value().toDouble(); + } else { +@@ -163,7 +163,7 @@ QScriptValue Rocs::GraphStructure::dijks + // if graph is directed, also add back-edges + if(!this->directed()) { + edges[counter] = Edge(node_mapping[p->to().get()], node_mapping[p->from().get()]); +- edge_mapping[std::make_pair<int,int>(node_mapping[p->to().get()], node_mapping[p->from().get()])] = p; ++ edge_mapping[std::make_pair(node_mapping[p->to().get()], node_mapping[p->from().get()])] = p; + if (!p->value().isEmpty()) { + weights[counter] = p->value().toDouble(); + } else { diff --git a/misc/rocs/patches/patch-src_Plugins_GenerateGraph_generategraphwidget.h b/misc/rocs/patches/patch-src_Plugins_GenerateGraph_generategraphwidget.h new file mode 100644 index 00000000000..e249a5c77dc --- /dev/null +++ b/misc/rocs/patches/patch-src_Plugins_GenerateGraph_generategraphwidget.h @@ -0,0 +1,15 @@ +$NetBSD: patch-src_Plugins_GenerateGraph_generategraphwidget.h,v 1.1 2013/02/26 23:37:32 joerg Exp $ + +--- src/Plugins/GenerateGraph/generategraphwidget.h.orig 2012-01-02 19:52:41.000000000 +0000 ++++ src/Plugins/GenerateGraph/generategraphwidget.h +@@ -22,8 +22,10 @@ + #include <QWidget> + #include <KDialog> + ++#ifndef Q_MOC_RUN + #include <boost/graph/adjacency_list.hpp> + #include <boost/graph/topology.hpp> ++#endif + + class QGridLayout; + class Document; diff --git a/misc/rocs/patches/patch-src_Plugins_TransformEdges_transformedgeswidget.h b/misc/rocs/patches/patch-src_Plugins_TransformEdges_transformedgeswidget.h new file mode 100644 index 00000000000..f5ab054e359 --- /dev/null +++ b/misc/rocs/patches/patch-src_Plugins_TransformEdges_transformedgeswidget.h @@ -0,0 +1,15 @@ +$NetBSD: patch-src_Plugins_TransformEdges_transformedgeswidget.h,v 1.1 2013/02/26 23:37:32 joerg Exp $ + +--- src/Plugins/TransformEdges/transformedgeswidget.h.orig 2011-09-26 09:45:24.000000000 +0000 ++++ src/Plugins/TransformEdges/transformedgeswidget.h +@@ -22,8 +22,10 @@ + #include <QWidget> + #include <KDialog> + ++#ifndef Q_MOC_RUN + #include <boost/graph/adjacency_list.hpp> + #include <boost/graph/topology.hpp> ++#endif + + #include "Rocs_Typedefs.h" + |