Fix build with graphviz-2.22, bug 261674

(Portage version: 2.2_rc33/cvs/Linux x86_64)

3 files changed, 83 insertions, 3 deletions

diff --git a/dev-util/anjuta/ChangeLog b/dev-util/anjuta/ChangeLog
index fd8c85323814..a2e4bae99fa5 100644
--- a/dev-util/anjuta/ChangeLog
+++ b/dev-util/anjuta/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/anjuta
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/anjuta/ChangeLog,v 1.91 2009/05/04 20:04:20 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/anjuta/ChangeLog,v 1.92 2009/05/26 10:52:53 leio Exp $
+
+  26 May 2009; Mart Raudsepp <leio@gentoo.org>
+  +files/anjuta-2.24.2-fix-build-with-graphviz-2.22.patch,
+  anjuta-2.24.2.ebuild:
+  Fix build with graphviz-2.22, bug 261674
 
   04 May 2009; Gilles Dartiguelongue <eva@gentoo.org> metadata.xml:
   Add gnome as backing herd.
diff --git a/dev-util/anjuta/anjuta-2.24.2.ebuild b/dev-util/anjuta/anjuta-2.24.2.ebuild
index 794d287fd6a5..1cecdd66fb99 100644
--- a/dev-util/anjuta/anjuta-2.24.2.ebuild
+++ b/dev-util/anjuta/anjuta-2.24.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/anjuta/anjuta-2.24.2.ebuild,v 1.1 2008/11/29 19:18:45 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/anjuta/anjuta-2.24.2.ebuild,v 1.2 2009/05/26 10:52:53 leio Exp $
 
 inherit eutils gnome2
 
@@ -70,6 +70,13 @@ pkg_setup() {
 		$(use_enable inherit-graph plugin-class-inheritance)"
 }
 
+src_unpack() {
+	gnome2_src_unpack
+
+	# Fix build with graphviz-2.22+ (bug 261674)
+	epatch "${FILESDIR}/${P}-fix-build-with-graphviz-2.22.patch"
+}
+
 src_install() {
 	# Install user docs into /usr/share/doc/${PF}/
 	sed -i -e "s:doc/${PN}:doc/${PF}:g" Makefile
diff --git a/dev-util/anjuta/files/anjuta-2.24.2-fix-build-with-graphviz-2.22.patch b/dev-util/anjuta/files/anjuta-2.24.2-fix-build-with-graphviz-2.22.patch
new file mode 100644
index 000000000000..070c950114b9
--- /dev/null
+++ b/dev-util/anjuta/files/anjuta-2.24.2-fix-build-with-graphviz-2.22.patch
@@ -0,0 +1,68 @@
+From badf2dbc86ea694d64d593b31cb4e5d4ccb5bc2d Mon Sep 17 00:00:00 2001
+From: Massimo Cora <mcora@src.gnome...>
+Date: Sat, 21 Mar 2009 11:54:34 +0000
+Subject: fixed #576057 – doesn't build with graphviz 2.22.2 (backport from trunk)
+
+	* plugins/class-inheritance/class-inherit.c
+	(cls_inherit_draw_graph):
+	* plugins/profiler/gprof-function-call-chart-view.c
+	(async_draw_graph):
+	fixed #576057 – doesn't build with graphviz 2.22.2 (backport from trunk)
+
+svn path=/branches/gnome-2-26/; revision=4886
+
+Backported to 2.24 for node => graph_node renaming change in 2.26
+---
+diff --git a/plugins/class-inheritance/class-inherit.c b/plugins/class-inheritance/class-inherit.c
+index d7346f1..88a3004 100644
+--- a/plugins/class-inheritance/class-inherit.c
++++ b/plugins/class-inheritance/class-inherit.c
+@@ -815,9 +815,18 @@ cls_inherit_draw_graph (AnjutaClassInheritance *plugin)
+ 		gdouble node_width;
+ 		gdouble node_height;
+ 		point node_pos;
++#ifndef ND_coord_i
++		pointf node_posf;
++#endif
+ 		
+ 		/* get some infos from the node */
++#ifdef ND_coord_i
+ 		node_pos = ND_coord_i(node);
++#else
++		node_posf = ND_coord(node);
++		PF2P(node_posf,node_pos);
++#endif
++		
+ 		node_width = ND_width (node);
+ 		node_height = ND_height (node);
+ 
+diff --git a/plugins/profiler/gprof-function-call-chart-view.c b/plugins/profiler/gprof-function-call-chart-view.c
+index 315cee2..3070d46 100644
+--- a/plugins/profiler/gprof-function-call-chart-view.c
++++ b/plugins/profiler/gprof-function-call-chart-view.c
+@@ -530,6 +530,9 @@ async_draw_graph (gpointer user_data)
+ 	Agedge_t *current_edge;
+ 	Agraph_t *current_graph;
+ 	point node_pos;
++#ifndef ND_coord_i	
++	pointf node_posf;
++#endif	
+ 	gdouble node_width;
+ 	gdouble node_height;
+ 	
+@@ -541,7 +544,13 @@ async_draw_graph (gpointer user_data)
+ 		
+ 		if (self->priv->current_node)
+ 		{
++#ifdef ND_coord_i			
+ 			node_pos = ND_coord_i (self->priv->current_node);
++#else
++			node_posf = ND_coord (self->priv->current_node);
++			PF2P(node_posf,node_pos);
++#endif			
++			
+ 			node_pos.y += self->priv->y_offset;
+ 			node_width = ND_width (self->priv->current_node);
+ 			node_height = ND_height (self->priv->current_node);
+--
+cgit v0.8.2