[libgda] add missing patches from previous commit
Haïkel Guémar
hguemar at fedoraproject.org
Sun Mar 10 10:54:22 UTC 2013
commit 9b2187394ff65c5d5164af56a6630fa693c06d4b
Author: Haïkel Guémar <hguemar at fedoraproject.org>
Date: Sun Mar 10 11:49:09 2013 +0100
add missing patches from previous commit
0001-workaround-RHBZ-904790.patch | 25 +++++++++
...ix-calls-to-deprecated-graphviz-graph-API.patch | 55 ++++++++++++++++++++
2 files changed, 80 insertions(+), 0 deletions(-)
---
diff --git a/0001-workaround-RHBZ-904790.patch b/0001-workaround-RHBZ-904790.patch
new file mode 100644
index 0000000..0f8ddfe
--- /dev/null
+++ b/0001-workaround-RHBZ-904790.patch
@@ -0,0 +1,25 @@
+From a58b6023ea81999c0ae4157bb1521859a6f03f99 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ha=C3=AFkel=20Gu=C3=A9mar?= <hguemar at fedoraproject.org>
+Date: Sun, 10 Mar 2013 10:15:01 +0100
+Subject: [PATCH 1/2] workaround RHBZ #904790
+
+---
+ configure | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure b/configure
+index 31fe05a..cc8d06f 100755
+--- a/configure
++++ b/configure
+@@ -19315,7 +19315,7 @@ if test -n "$GRAPHVIZ_LIBS"; then
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+- pkg_cv_GRAPHVIZ_LIBS=`$PKG_CONFIG --libs ""libgvc"" 2>/dev/null`
++ pkg_cv_GRAPHVIZ_LIBS="-lcdt -lcgraph -lgvc"
+ else
+ pkg_failed=yes
+ fi
+--
+1.8.1.4
+
diff --git a/0002-fix-calls-to-deprecated-graphviz-graph-API.patch b/0002-fix-calls-to-deprecated-graphviz-graph-API.patch
new file mode 100644
index 0000000..3140f23
--- /dev/null
+++ b/0002-fix-calls-to-deprecated-graphviz-graph-API.patch
@@ -0,0 +1,55 @@
+From f3c0fe314744b079b745afab4c24e5f7c63de784 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ha=C3=AFkel=20Gu=C3=A9mar?= <hguemar at fedoraproject.org>
+Date: Sun, 10 Mar 2013 10:15:36 +0100
+Subject: [PATCH 2/2] fix calls to deprecated graphviz graph API
+
+---
+ tools/browser/canvas/browser-canvas.c | 18 +++++++++---------
+ 1 file changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/tools/browser/canvas/browser-canvas.c b/tools/browser/canvas/browser-canvas.c
+index a67f2f0..b228fd3 100644
+--- a/tools/browser/canvas/browser-canvas.c
++++ b/tools/browser/canvas/browser-canvas.c
+@@ -851,13 +851,13 @@ browser_canvas_perform_auto_layout (BrowserCanvas *canvas, gboolean animate, Bro
+ if (!gvc)
+ gvc = gvContext ();
+
+- graph = agopen ("BrowserCanvasLayout", AGRAPH);
+- agnodeattr (graph, "shape", "box");
+- agnodeattr (graph, "height", ".1");
+- agnodeattr (graph, "width", ".1");
+- agnodeattr (graph, "fixedsize", "true");
+- agnodeattr (graph, "pack", "true");
+- agnodeattr (graph, "packmode", "node");
++ graph = agopen ("BrowserCanvasLayout", Agdirected, NULL);
++ agnode (graph, "shape", "box");
++ agset (graph, "height", ".1");
++ agset (graph, "width", ".1");
++ agset (graph, "fixedsize", "true");
++ agset (graph, "pack", "true");
++ agset (graph, "packmode", "node");
+
+
+ if (class->get_layout_items)
+@@ -885,7 +885,7 @@ browser_canvas_perform_auto_layout (BrowserCanvas *canvas, gboolean animate, Bro
+ nodes_list = g_slist_prepend (nodes_list, nl);
+
+ tmp = g_strdup_printf ("%p", item);
+- node = agnode (graph, tmp);
++ node = agnode (graph, tmp, 0);
+ nl->node = node;
+ g_hash_table_insert (nodes_hash, item, node);
+
+@@ -929,7 +929,7 @@ browser_canvas_perform_auto_layout (BrowserCanvas *canvas, gboolean animate, Bro
+ from_node = (Agnode_t*) g_hash_table_lookup (nodes_hash, from);
+ to_node = (Agnode_t*) g_hash_table_lookup (nodes_hash, to);
+ if (from_node && to_node)
+- agedge (graph, from_node, to_node);
++ agedge (graph, from_node, to_node, "", 0);
+ }
+ }
+
+--
+1.8.1.4
+
More information about the scm-commits
mailing list