diff options
Diffstat (limited to 'media-gfx/graphviz/files/graphviz-1.16-build.patch')
| -rw-r--r-- | media-gfx/graphviz/files/graphviz-1.16-build.patch | 171 |
1 files changed, 171 insertions, 0 deletions
diff --git a/media-gfx/graphviz/files/graphviz-1.16-build.patch b/media-gfx/graphviz/files/graphviz-1.16-build.patch new file mode 100644 index 000000000000..774ecdd6d354 --- /dev/null +++ b/media-gfx/graphviz/files/graphviz-1.16-build.patch @@ -0,0 +1,171 @@ +diff -Naur graphviz-1.16.orig/dynagraph/common/emitGraph.h graphviz-1.16/dynagraph/common/emitGraph.h +--- graphviz-1.16.orig/dynagraph/common/emitGraph.h 2004-12-15 10:33:13.782250240 +0100 ++++ graphviz-1.16/dynagraph/common/emitGraph.h 2004-12-15 10:37:57.826069016 +0100 +@@ -18,7 +18,7 @@ + template<typename G> + void emitGraph(std::ostream &os,G *g) { + os << "digraph " << mquote(gd<Name>(g)); +- os << " {" << endl << "\tgraph "; ++ os << " {" << std::endl << "\tgraph "; + emitAttrs(os,gd<StrAttrs>(g)); + for(typename G::node_iter ni = g->nodes().begin(); ni!=g->nodes().end(); ++ni) { + os << '\t' << mquote(gd<Name>(*ni)) << ' '; +@@ -44,7 +44,7 @@ + Name &gname = (ati!=gd<StrAttrs>(g).end())?ati->second:gd<Name>(g); + + os << "digraph " << mquote(gname); +- os << " {" << endl << "\tgraph "; ++ os << " {" << std::endl << "\tgraph "; + emitAttrs(os,gd<StrAttrs>(g)); + for(typename G::node_iter ni = g->nodes().begin(); ni!=g->nodes().end(); ++ni) { + StrAttrs::iterator ati = gd<StrAttrs>(*ni).find("label"); +diff -Naur graphviz-1.16.orig/dynagraph/common/LGraph-cdt.h graphviz-1.16/dynagraph/common/LGraph-cdt.h +--- graphviz-1.16.orig/dynagraph/common/LGraph-cdt.h 2004-12-15 10:33:13.704262096 +0100 ++++ graphviz-1.16/dynagraph/common/LGraph-cdt.h 2004-12-15 10:37:37.368179088 +0100 +@@ -232,10 +232,10 @@ + return !(*this==other); + } + inedge_iter inIter() { +- return head()->inIter(this); ++ return this->head()->inIter(this); + } + outedge_iter outIter() { +- return tail()->outIter(this); ++ return this->tail()->outIter(this); + } + }; + // workaround for circular typing problems w/ friend decl: do not call! +diff -Naur graphviz-1.16.orig/dynagraph/common/traversal.h graphviz-1.16/dynagraph/common/traversal.h +--- graphviz-1.16.orig/dynagraph/common/traversal.h 2004-12-15 10:33:13.783250088 +0100 ++++ graphviz-1.16/dynagraph/common/traversal.h 2004-12-15 10:38:10.825092864 +0100 +@@ -78,10 +78,10 @@ + } + DFS &operator++() { + if(m_curr.e) +- gd<Hit>(m_curr.e)[m_hitpos] = true; ++ gd<Hit>(m_curr.e)[this->m_hitpos] = true; + else { + assert(m_curr.n); +- gd<Hit>(m_curr.n)[m_hitpos] = true; ++ gd<Hit>(m_curr.n)[this->m_hitpos] = true; + } + // try edges + if(m_curr.n && follow()) +@@ -143,10 +143,10 @@ + } + bool outs(typename G::outedge_iter start) { + for(typename G::outedge_iter ei = start; ei!=m_curr.n->outs().end(); ++ei) +- if(!gd<Hit>(*ei)[m_hitpos]) { ++ if(!gd<Hit>(*ei)[this->m_hitpos]) { + m_stack.push(m_curr); + m_curr.e = *ei; +- if(!gd<Hit>(m_curr.e->head)[m_hitpos]) ++ if(!gd<Hit>(m_curr.e->head)[this->m_hitpos]) + m_curr.n = m_curr.e->head; + else + m_curr.n = 0; +@@ -156,10 +156,10 @@ + } + bool ins(typename G::inedge_iter start) { + for(typename G::inedge_iter ei = start; ei!=m_curr.n->ins().end(); ++ei) +- if(!gd<Hit>(*ei)[m_hitpos]) { ++ if(!gd<Hit>(*ei)[this->m_hitpos]) { + m_stack.push(m_curr); + m_curr.e = *ei; +- if(!gd<Hit>(m_curr.e->tail)[m_hitpos]) ++ if(!gd<Hit>(m_curr.e->tail)[this->m_hitpos]) + m_curr.n = m_curr.e->tail; + else + m_curr.n = 0; +@@ -180,8 +180,8 @@ + return true; + } + bool next() { +- for(;m_nodeiter!=m_g->parent->nodes().end();++m_nodeiter) +- if(!gd<Hit>(*m_nodeiter)[m_hitpos]) { ++ for(;m_nodeiter!=this->m_g->parent->nodes().end();++m_nodeiter) ++ if(!gd<Hit>(*m_nodeiter)[this->m_hitpos]) { + m_curr.e = 0; + m_curr.n = *m_nodeiter; + m_nodeiter++; +@@ -205,31 +205,31 @@ + if(last.n) { + if(m_inwards) + for(typename G::inedge_iter ei = last.n->ins().begin(); ei!=last.n->ins().end(); ++ei) +- if(!gd<Hit>(*ei)[m_hitpos]) { ++ if(!gd<Hit>(*ei)[this->m_hitpos]) { + Node *t = (*ei)->tail; +- if(gd<Hit>(t)[m_hitpos]) ++ if(gd<Hit>(t)[this->m_hitpos]) + t = 0; + else +- gd<Hit>(t)[m_hitpos] = true; ++ gd<Hit>(t)[this->m_hitpos] = true; + m_queue.push(V(*ei,t)); +- gd<Hit>(*ei)[m_hitpos] = true; ++ gd<Hit>(*ei)[this->m_hitpos] = true; + } + if(m_outwards) + for(typename G::outedge_iter ei = last.n->outs().begin(); ei!=last.n->outs().end(); ++ei) +- if(!gd<Hit>(*ei)[m_hitpos]) { ++ if(!gd<Hit>(*ei)[this->m_hitpos]) { + Node *h = (*ei)->head; +- if(gd<Hit>(h)[m_hitpos]) ++ if(gd<Hit>(h)[this->m_hitpos]) + h = 0; + else +- gd<Hit>(h)[m_hitpos] = true; ++ gd<Hit>(h)[this->m_hitpos] = true; + m_queue.push(V(*ei,h)); +- gd<Hit>(*ei)[m_hitpos] = true; ++ gd<Hit>(*ei)[this->m_hitpos] = true; + } + } + if(m_queue.empty()) +- for(;m_nodeiter!=m_g->nodes().end(); ++m_nodeiter) +- if(!gd<Hit>(*m_nodeiter)[m_hitpos]) { +- gd<Hit>(*m_nodeiter)[m_hitpos] = true; ++ for(;m_nodeiter!=this->m_g->nodes().end(); ++m_nodeiter) ++ if(!gd<Hit>(*m_nodeiter)[this->m_hitpos]) { ++ gd<Hit>(*m_nodeiter)[this->m_hitpos] = true; + m_queue.push(V(0,*m_nodeiter++)); + break; + } +@@ -241,7 +241,7 @@ + BFS(G *g,typename G::Node *start = 0,bool inwards=true,bool outwards=true) : Traversal<G>(g),m_inwards(inwards),m_outwards(outwards) { + m_nodeiter = start?g->iter(start):g->nodes().begin(); + if(m_nodeiter!=g->nodes().end()) { +- gd<Hit>(*m_nodeiter)[m_hitpos] = true; ++ gd<Hit>(*m_nodeiter)[this->m_hitpos] = true; + m_queue.push(V(0,*m_nodeiter++)); + } + } +diff -Naur graphviz-1.16.orig/dynagraph/dynadag/DynaDAG.h graphviz-1.16/dynagraph/dynadag/DynaDAG.h +--- graphviz-1.16.orig/dynagraph/dynadag/DynaDAG.h 2004-12-15 10:33:13.784249936 +0100 ++++ graphviz-1.16/dynagraph/dynadag/DynaDAG.h 2004-12-15 10:36:44.968145104 +0100 +@@ -209,10 +209,10 @@ + typename Chain<N,E>::edge_iter ei; + }; + node_iter nBegin() { +- return node_iter(eBegin(),false); ++ return node_iter(this->eBegin(),false); + } + node_iter nEnd() { +- return node_iter(eEnd(),true); ++ return node_iter(this->eEnd(),true); + } + Position pos() { + if(!top() || !DDd(top()).cur.valid) +@@ -220,10 +220,10 @@ + return Position(DDd(top()).cur.x,(DDd(top()).cur.y+DDd(bottom()).cur.y)/2.0); + } + N *top() { +- return node?node:first->tail; ++ return node?node:this->first->tail; + } + N *bottom() { +- return node?node:last->head; ++ return node?node:this->last->head; + } + int len() { + int n=0; |