[Pkg-mono-svn-commits] rev 2531 - in gtk-sharp2/trunk/debian: . patches

Sebastian Dröge slomo-guest at costa.debian.org
Wed May 3 17:12:21 UTC 2006 

Author: slomo-guest
Date: 2006-05-03 17:12:20 +0000 (Wed, 03 May 2006)
New Revision: 2531

Added:
   gtk-sharp2/trunk/debian/patches/05_gdk-drawable.dpatch
   gtk-sharp2/trunk/debian/patches/06_fix-custom-cellrenderes.dpatch
Modified:
   gtk-sharp2/trunk/debian/changelog
   gtk-sharp2/trunk/debian/patches/00list
Log:
* added two new patches to gtk#2


Modified: gtk-sharp2/trunk/debian/changelog
===================================================================
--- gtk-sharp2/trunk/debian/changelog	2006-05-02 10:25:03 UTC (rev 2530)
+++ gtk-sharp2/trunk/debian/changelog	2006-05-03 17:12:20 UTC (rev 2531)
@@ -9,6 +9,14 @@
     + debian/patches/04_list-to-array-marshalling.dpatch: (SVN rev 58609)
       - Fix the ListToArray marshalling to respect the owners of the Opaque
         elements.
+    + debian/patches/05_gdk-drawable.dpatch:
+      - Fix signature of Gdk.Drawable.DrawPoints(). The old version was
+        completely wrong and would segfault everything using it.
+        http://bugzilla.ximian.com/show_bug.cgi?id=77942
+    + debian/patches/06_fix-custom-cellrenderes.dpatch:
+      - Fix subclasses of Gtk.CellRenderer to not return null but something
+        useful for GetSize(), Render(), and StartEditing().
+        http://bugzilla.ximian.com/show_bug.cgi?id=77949
 
  -- Debian Mono Group <pkg-mono-group at lists.alioth.debian.org>  Fri, 14 Apr 2006 12:48:02 +0200
 

Modified: gtk-sharp2/trunk/debian/patches/00list
===================================================================
--- gtk-sharp2/trunk/debian/patches/00list	2006-05-02 10:25:03 UTC (rev 2530)
+++ gtk-sharp2/trunk/debian/patches/00list	2006-05-03 17:12:20 UTC (rev 2531)
@@ -2,3 +2,5 @@
 02_workaround-340904.dpatch
 03_gnomevfs-mimetype-pinvokes.dpatch
 04_list-to-array-marshalling.dpatch
+05_gdk-drawable.dpatch
+06_fix-custom-cellrenderes.dpatch

Added: gtk-sharp2/trunk/debian/patches/05_gdk-drawable.dpatch
===================================================================
--- gtk-sharp2/trunk/debian/patches/05_gdk-drawable.dpatch	2006-05-02 10:25:03 UTC (rev 2530)
+++ gtk-sharp2/trunk/debian/patches/05_gdk-drawable.dpatch	2006-05-03 17:12:20 UTC (rev 2531)
@@ -0,0 +1,44 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+
+ at DPATCH@
+
+--- gtk-sharp/doc/en/Gdk/Drawable.xml	2005/12/09 23:12:49	54175
++++ gtk-sharp/doc/en/Gdk/Drawable.xml	2006/05/02 22:36:43	60196
+@@ -19,22 +19,19 @@
+   </Interfaces>
+   <Members>
+     <Member MemberName="DrawPoints">
+-      <MemberSignature Language="C#" Value="public void DrawPoints (Gdk.GC gc, Gdk.Point points, int npoints);" />
++      <MemberSignature Language="C#" Value="public void DrawPoints (Gdk.GC gc, Gdk.Point[] points);" />
+       <MemberType>Method</MemberType>
+       <ReturnValue>
+         <ReturnType>System.Void</ReturnType>
+       </ReturnValue>
+       <Parameters>
+         <Parameter Name="gc" Type="Gdk.GC" />
+-        <Parameter Name="points" Type="Gdk.Point" />
+-        <Parameter Name="npoints" Type="System.Int32" />
++        <Parameter Name="points" Type="Gdk.Point[]" />
+       </Parameters>
+       <Docs>
+         <summary>Draws a number of points using the given graphics context.</summary>
+         <param name="gc">A <see cref="T:Gdk.GC" /></param>
+         <param name="points">An array of  <see cref="T:Gdk.Point" /> objects.</param>
+-        <param name="npoints">A <see cref="T:System.Int32" /></param>
+-        <remarks>NOTE: Drawable.custom needs to be fixed to implement this properly.</remarks>
+       </Docs>
+     </Member>
+     <Member MemberName="DrawLayoutWithColors">
+
+--- gtk-sharp/gdk/Gdk.metadata	2005/12/13 17:11:31	54308
++++ gtk-sharp/gdk/Gdk.metadata	2006/05/03 15:00:25	60222
+@@ -76,6 +76,8 @@
+   <attr path="/api/namespace/object[@cname='GdkDrawable']/method[@name='DrawRgb32Image']/*/*[@name='buf']" name="array">1</attr>
+   <attr path="/api/namespace/object[@cname='GdkDrawable']/method[@name='DrawRgb32ImageDithalign']/*/*[@name='buf']" name="array">1</attr>
+   <attr path="/api/namespace/object[@cname='GdkDrawable']/method[@name='DrawLines']" name="hidden">1</attr>
++  <attr path="/api/namespace/object[@cname='GdkDrawable']/method[@name='DrawPoints']/*/*[@name='points']" name="array">1</attr>
++  <attr path="/api/namespace/object[@cname='GdkDrawable']/method[@name='DrawPoints']/*/*[@name='npoints']" name="name">n_points</attr>
+   <attr path="/api/namespace/object[@cname='GdkDrawable']/method[@name='DrawPolygon']" name="hidden">1</attr>
+   <attr path="/api/namespace/object[@cname='GdkDrawable']/method[@name='GetSize']/*/*[@type='gint*']" name="pass_as">out</attr>
+   <attr path="/api/namespace/object[@cname='GdkDrawable']/method[@name='SetData']/*/*[@name='destroy_func']" name="type">gpointer</attr>
+


Property changes on: gtk-sharp2/trunk/debian/patches/05_gdk-drawable.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: gtk-sharp2/trunk/debian/patches/06_fix-custom-cellrenderes.dpatch
===================================================================
--- gtk-sharp2/trunk/debian/patches/06_fix-custom-cellrenderes.dpatch	2006-05-02 10:25:03 UTC (rev 2530)
+++ gtk-sharp2/trunk/debian/patches/06_fix-custom-cellrenderes.dpatch	2006-05-03 17:12:20 UTC (rev 2531)
@@ -0,0 +1,43 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+
+ at DPATCH@
+
+--- gtk-sharp/gtk/glue/cellrenderer.c	2004/06/25 18:42:19	30401
++++ gtk-sharp/gtk/glue/cellrenderer.c	2006/04/20 07:55:08	59683
+@@ -26,9 +26,8 @@
+ void
+ gtksharp_cellrenderer_base_get_size (GtkCellRenderer *cell, GtkWidget *widget, GdkRectangle *cell_area, gint *x_offset, gint *y_offset, gint *width, gint *height)
+ {
+-	GtkCellRendererClass *parent = g_type_class_peek_parent (G_OBJECT_GET_CLASS (cell));
+-	if (parent->get_size)
+-		(*parent->get_size) (cell, widget, cell_area, x_offset, y_offset, width, height);
++	if (GTK_CELL_RENDERER_GET_CLASS (cell)->get_size)
++		GTK_CELL_RENDERER_GET_CLASS (cell)->get_size (cell, widget, cell_area, x_offset, y_offset, width, height);
+ }
+ 
+ void gtksharp_cellrenderer_override_get_size (GType gtype, gpointer cb);
+@@ -47,9 +46,8 @@
+ void
+ gtksharp_cellrenderer_base_render (GtkCellRenderer *cell, GdkDrawable *window, GtkWidget *widget, GdkRectangle *background_area, GdkRectangle *cell_area, GdkRectangle *expose_area, GtkCellRendererState flags)
+ {
+-	GtkCellRendererClass *parent = g_type_class_peek_parent (G_OBJECT_GET_CLASS (cell));
+-	if (parent->render)
+-		(*parent->render) (cell, window, widget, background_area, cell_area, expose_area, flags);
++	if (GTK_CELL_RENDERER_GET_CLASS (cell)->render)
++		GTK_CELL_RENDERER_GET_CLASS (cell)->render (cell, window, widget, background_area, cell_area, expose_area, flags);
+ }
+ 
+ void gtksharp_cellrenderer_override_render (GType gtype, gpointer cb);
+@@ -68,9 +66,8 @@
+ GtkCellEditable *
+ gtksharp_cellrenderer_base_start_editing (GtkCellRenderer *cell, GdkEvent *event, GtkWidget *widget, const gchar *path, GdkRectangle *background_area, GdkRectangle *cell_area, GtkCellRendererState flags)
+ {
+-        GtkCellRendererClass *parent = g_type_class_peek_parent (G_OBJECT_GET_CLASS (cell));
+-        if (parent->start_editing)
+-		return (*parent->start_editing) (cell, event, widget, path, background_area, cell_area, flags);
++	if (GTK_CELL_RENDERER_GET_CLASS (cell)->start_editing)
++		return GTK_CELL_RENDERER_GET_CLASS (cell)->start_editing (cell, event, widget, path, background_area, cell_area, flags);
+ 	return NULL;	
+ }
+ 
+


Property changes on: gtk-sharp2/trunk/debian/patches/06_fix-custom-cellrenderes.dpatch
___________________________________________________________________
Name: svn:executable
   + *

More information about the Pkg-mono-svn-commits mailing list