Hello community,
here is the log from the commit of package tulip for openSUSE:Factory
checked in at Mon Mar 8 01:32:51 CET 2010.
--------
--- tulip/tulip.changes 2010-02-09 14:58:54.000000000 +0100
+++ /mounts/work_src_done/STABLE/tulip/tulip.changes 2010-03-06 19:05:12.000000000 +0100
@@ -1,0 +2,5 @@
+Sat Mar 6 18:04:27 UTC 2010 - dimstar@opensuse.org
+
+- Add tulip-gcc45.patch to fix build with gcc 4.5
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
tulip-gcc45.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ tulip.spec ++++++
--- /var/tmp/diff_new_pack.etaiKM/_old 2010-03-08 01:32:36.000000000 +0100
+++ /var/tmp/diff_new_pack.etaiKM/_new 2010-03-08 01:32:36.000000000 +0100
@@ -33,7 +33,7 @@
%endif
Summary: Visualization of huge graphs
Version: 3.3.0
-Release: 2
+Release: 3
# .so version
%define tulip_version 3.3
Url: http://www.tulip-software.org
@@ -42,6 +42,8 @@
Source2: tulip-%{version}-userManual.pdf
Source3: tulip-%{version}-devHandbook.pdf
Source4: tulip-rpmlintrc
+# PATCH-FIX-UPSTREAM tulip-gcc45.patch dimstar@opensuse.org -- Fix build with gcc 4.5 - patch cherry-picked from upstream svn.
+Patch0: tulip-gcc45.patch
License: GPLv2+
Group: Productivity/Graphics/Visualization/Graph
Requires: Mesa
@@ -241,6 +243,7 @@
%prep
%setup -q
+%patch0 -p1
%build
%{?suse_update_config:%{suse_update_config -f}}
++++++ tulip-gcc45.patch ++++++
Index: tulip-3.3.0/library/tulip/include/tulip/Bfs.h
===================================================================
--- tulip-3.3.0.orig/library/tulip/include/tulip/Bfs.h
+++ tulip-3.3.0/library/tulip/include/tulip/Bfs.h
@@ -39,8 +39,8 @@ class TLP_SCOPE Bfs {
BooleanProperty* s_proxy;
unsigned int nbNodes;
- MutableContainer<bool>::MutableContainer selectedNodes;
- MutableContainer<bool>::MutableContainer selectedEdges;
+ MutableContainer<bool> selectedNodes;
+ MutableContainer<bool> selectedEdges;
};
}
Index: tulip-3.3.0/library/tulip/include/tulip/Ordering.h
===================================================================
--- tulip-3.3.0.orig/library/tulip/include/tulip/Ordering.h
+++ tulip-3.3.0/library/tulip/include/tulip/Ordering.h
@@ -52,21 +52,21 @@ class TLP_SCOPE Ordering : public std::v
private :
- PlanarConMap::PlanarConMap * Gp;
- MutableContainer<int>::MutableContainer oute;
- MutableContainer<int>::MutableContainer outv;
- MutableContainer<bool>::MutableContainer visitedNodes;
- MutableContainer<bool>::MutableContainer visitedFaces;
- MutableContainer<bool>::MutableContainer markedFaces;
- MutableContainer<int>::MutableContainer seqP;
- MutableContainer<bool>::MutableContainer isOuterFace;
- MutableContainer<bool>::MutableContainer contour;
- MutableContainer<bool>::MutableContainer is_selectable;
- MutableContainer<bool>::MutableContainer is_selectable_visited;
- MutableContainer<bool>::MutableContainer is_selectable_face;
- MutableContainer<bool>::MutableContainer is_selectable_visited_face;
- MutableContainer<node>::MutableContainer left;
- MutableContainer<node>::MutableContainer right;
+ PlanarConMap * Gp;
+ MutableContainer<int> oute;
+ MutableContainer<int> outv;
+ MutableContainer<bool> visitedNodes;
+ MutableContainer<bool> visitedFaces;
+ MutableContainer<bool> markedFaces;
+ MutableContainer<int> seqP;
+ MutableContainer<bool> isOuterFace;
+ MutableContainer<bool> contour;
+ MutableContainer<bool> is_selectable;
+ MutableContainer<bool> is_selectable_visited;
+ MutableContainer<bool> is_selectable_face;
+ MutableContainer<bool> is_selectable_visited_face;
+ MutableContainer<node> left;
+ MutableContainer<node> right;
bool existMarkedF;
FaceAndPos minMarkedFace ;
Face ext;
Index: tulip-3.3.0/plugins/layout/MixedModel.cpp
===================================================================
--- tulip-3.3.0.orig/plugins/layout/MixedModel.cpp
+++ tulip-3.3.0/plugins/layout/MixedModel.cpp
@@ -177,7 +177,7 @@ bool MixedModel::run() {
if(!planar){
// cout << "Graph is not planar ...";
BooleanProperty * resultatAlgoSelection = currentGraph->getProperty<BooleanProperty>("viewSelection");
- Bfs::Bfs sp(currentGraph,resultatAlgoSelection);
+ Bfs sp(currentGraph,resultatAlgoSelection);
currentGraph->delSubGraph(sp.graph);
G = tlp::newSubGraph(currentGraph);
Iterator<edge> * ite = currentGraph->getEdges();
Index: tulip-3.3.0/plugins/layout/MixedModel.h
===================================================================
--- tulip-3.3.0.orig/plugins/layout/MixedModel.h
+++ tulip-3.3.0/plugins/layout/MixedModel.h
@@ -103,7 +103,7 @@ class MixedModel : public tlp::LayoutAlg
tlp::Graph * currentGraph;
std::vectortlp::edge dummy;
std::map