[prev in list] [next in list] [prev in thread] [next in thread] 

List:       graphviz-devel
Subject:    anjuta patch [was Re: [graphviz-devel] graphviz-2.22 release
From:       John Ellson <ellson () research ! att ! com>
Date:       2009-02-28 19:26:18
Message-ID: 49A98FDA.9000003 () research ! att ! com
[Download RAW message or body]

Cyril Brulebois wrote:
> John Ellson <ellson@research.att.com> (28/02/2009):
>   
>> Just a caution.  Since the libgvc api has changed, the new release
>> will  break packages that link to it.
>>
>> I'm aware of "anjuta" and "libgnomedb" and will have patches available
>> for them when we make the stable release.
>>     
>
> Could those patches be posted to this mailing list, so that they can be
> easily found and forwarded to both upstreams & downstreams? That would
> be very nice.
>   
Sure.   Here are the anjuta changes, based on Fedora's 
anjuta-2.25.902-5.fc11.src.rpm


John

["anjuta-2.25.902-graphviz-2.22.patch" (text/plain)]

--- anjuta-2.25.902/plugins/class-inheritance/class-inherit.c.orig	2009-02-28 \
                14:02:15.000000000 -0500
+++ anjuta-2.25.902/plugins/class-inheritance/class-inherit.c	2009-02-28 \
14:06:04.000000000 -0500 @@ -487,7 +487,7 @@
  */
 static void
 cls_inherit_draw_expanded_node (AnjutaClassInheritance *plugin, Agnode_t \
                *graph_node, 
-					point* node_pos, gdouble node_width, gdouble node_height) 
+					pointf* node_pos, gdouble node_width, gdouble node_height) 
 {
 	GnomeCanvasItem *item;
 	NodeExpansionStatus *node_status;
@@ -700,7 +700,7 @@
 
 static void
 cls_inherit_draw_single_node (AnjutaClassInheritance *plugin, Agnode_t *graph_node, 
-					point *node_pos, gdouble node_width, gdouble node_height) 
+					pointf *node_pos, gdouble node_width, gdouble node_height) 
 {
 	NodeData *node_data;
 	GnomeCanvasItem *item;
@@ -814,10 +814,10 @@
 	{
 		gdouble node_width;
 		gdouble node_height;
-		point node_pos;
+		pointf node_pos;
 		
 		/* get some infos from the node */
-		node_pos = ND_coord_i(graph_node);
+		node_pos = ND_coord(graph_node);
 		node_width = ND_width (graph_node);
 		node_height = ND_height (graph_node);
 
--- anjuta-2.25.902/plugins/profiler/gprof-function-call-chart-view.c.orig	2009-02-28 \
                14:02:38.000000000 -0500
+++ anjuta-2.25.902/plugins/profiler/gprof-function-call-chart-view.c	2009-02-28 \
14:04:34.000000000 -0500 @@ -250,7 +250,7 @@
 
 static void
 gprof_function_call_chart_view_draw_node (GProfFunctionCallChartView *self,
-										  Agnode_t *node, point *node_pos,
+										  Agnode_t *node, pointf *node_pos,
 										  gdouble node_width, 
 										  gdouble node_height)
 {
@@ -333,7 +333,7 @@
 
 static void
 gprof_function_call_chart_view_draw_edge (GProfFunctionCallChartView *self,
-										  Agedge_t *edge, point *node_pos,
+										  Agedge_t *edge, pointf *node_pos,
 										  gdouble node_height)
 {
 	GnomeCanvasItem *item;
@@ -529,7 +529,7 @@
 	GProfFunctionCallChartView *self;
 	Agedge_t *current_edge;
 	Agraph_t *current_graph;
-	point node_pos;
+	pointf node_pos;
 	gdouble node_width;
 	gdouble node_height;
 	
@@ -541,7 +541,7 @@
 		
 		if (self->priv->current_node)
 		{
-			node_pos = ND_coord_i (self->priv->current_node);
+			node_pos = ND_coord (self->priv->current_node);
 			node_pos.y += self->priv->y_offset;
 			node_width = ND_width (self->priv->current_node);
 			node_height = ND_height (self->priv->current_node);


["anjuta.spec.patch" (text/plain)]

--- anjuta.spec.orig	2009-02-26 16:24:37.000000000 -0500
+++ anjuta.spec	2009-02-28 14:20:32.000000000 -0500
@@ -2,11 +2,12 @@
 Name:		anjuta
 Epoch:		1
 Version:	2.25.902
-Release:	5%{?dist}
+Release:	5.1%{?dist}
 License:	GPLv2+
 Group:		Development/Tools
 URL:		http://www.anjuta.org/
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/anjuta/2.25/%{name}-%{version}.tar.gz
+Patch0:		anjuta-2.25.902-graphviz-2.22.patch
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -91,6 +92,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 # Filter unwanted Provides.
 cat << \EOF > %{name}-prov
@@ -309,6 +311,9 @@
 %{_datadir}/omf/%{name}-manual/%{name}-manual-*.omf
 
 %changelog
+* Sat Feb 28 2009 John Ellson <ellson@graphviz.org> - 1:2.25.902-5.1
+- Fixes for libgvc api change in graphviz-2.22
+
 * Wed Feb 27 2009 Debarshi Ray <rishi@fedoraproject.org> - 1:2.25.902-5
 - Added 'Provides: perl(GBF::Make)'. Imported from gnome-build. (Red Hat
   Bugzilla #486530)


_______________________________________________
graphviz-devel mailing list
graphviz-devel@research.att.com
https://mailman.research.att.com/mailman/listinfo/graphviz-devel


[prev in list] [next in list] [prev in thread] [next in thread]