Gentoo Archives: gentoo-commits

From: "Alexis Ballier (aballier)" <aballier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-libs/flowcanvas/files: gv234.patch
Date: Wed, 27 Nov 2013 21:06:44
Message-Id: 20131127210640.460762004E@flycatcher.gentoo.org
1 aballier 13/11/27 21:06:40
2
3 Added: gv234.patch
4 Log:
5 fix build with graphviz 2.34
6
7 (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
8
9 Revision Changes Path
10 1.1 x11-libs/flowcanvas/files/gv234.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/flowcanvas/files/gv234.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/flowcanvas/files/gv234.patch?rev=1.1&content-type=text/plain
14
15 Index: gv234.patch
16 ===================================================================
17 Index: flowcanvas-0.7.1/src/Canvas.cpp
18 ===================================================================
19 --- flowcanvas-0.7.1.orig/src/Canvas.cpp
20 +++ flowcanvas-0.7.1/src/Canvas.cpp
21 @@ -1253,21 +1253,21 @@ Canvas::layout_dot(bool use_length_hints
22 */
23
24 GVC_t* gvc = gvContext();
25 - Agraph_t* G = agopen((char*)"g", AGDIGRAPH);
26 + Agraph_t* G = agopen((char*)"g", Agdirected, 0);
27
28 nodes.gvc = gvc;
29 nodes.G = G;
30
31 if (_direction == HORIZONTAL)
32 - agraphattr(G, (char*)"rankdir", (char*)"LR");
33 + agattr(G, AGRAPH, (char*)"rankdir", (char*)"LR");
34 else
35 - agraphattr(G, (char*)"rankdir", (char*)"TD");
36 + agattr(G, AGRAPH, (char*)"rankdir", (char*)"TD");
37
38 unsigned id = 0;
39 for (ItemList::const_iterator i = _items.begin(); i != _items.end(); ++i) {
40 std::ostringstream ss;
41 ss << "n" << id++;
42 - Agnode_t* node = agnode(G, strdup(ss.str().c_str()));
43 + Agnode_t* node = agnode(G, strdup(ss.str().c_str()), 1);
44 if (boost::dynamic_pointer_cast<Module>(*i)) {
45 ss.str("");
46 ss << (*i)->width() / 96.0;
47 @@ -1310,7 +1310,7 @@ Canvas::layout_dot(bool use_length_hints
48
49 assert(src_node && dst_node);
50
51 - Agedge_t* edge = agedge(G, src_node, dst_node);
52 + Agedge_t* edge = agedge(G, src_node, dst_node, NULL, 1);
53
54 if (use_length_hints && c->length_hint() != 0) {
55 std::ostringstream len_ss;
56 @@ -1325,7 +1325,7 @@ Canvas::layout_dot(bool use_length_hints
57 if (partner) {
58 GVNodes::iterator p = nodes.find(partner);
59 if (p != nodes.end())
60 - agedge(G, i->second, p->second);
61 + agedge(G, i->second, p->second, NULL, 1);
62 }
63 }