[80070] trunk/dports/gnome/gdl

[jeremyhu at macports.org]

Revision: 80070
          http://trac.macports.org/changeset/80070
Author:   jeremyhu at macports.org
Date:     2011-07-03 16:13:39 -0700 (Sun, 03 Jul 2011)
Log Message:
-----------
gdl: Fix empty return statements.  Found by clang

Modified Paths:
--------------
    trunk/dports/gnome/gdl/Portfile

Added Paths:
-----------
    trunk/dports/gnome/gdl/files/
    trunk/dports/gnome/gdl/files/returns.patch

Modified: trunk/dports/gnome/gdl/Portfile
===================================================================
--- trunk/dports/gnome/gdl/Portfile	2011-07-03 22:06:21 UTC (rev 80069)
+++ trunk/dports/gnome/gdl/Portfile	2011-07-03 23:13:39 UTC (rev 80070)
@@ -32,6 +32,8 @@
 depends_lib         port:gtk2 \
                     port:libxml2
 
+patchfiles          returns.patch
+
 livecheck.type      regex
 livecheck.url       http://ftp.gnome.org/pub/gnome/sources/${name}/${branch}/
 livecheck.regex     {LATEST-IS-(\d+(?:\.\d+)*)}

Added: trunk/dports/gnome/gdl/files/returns.patch
===================================================================
--- trunk/dports/gnome/gdl/files/returns.patch	                        (rev 0)
+++ trunk/dports/gnome/gdl/files/returns.patch	2011-07-03 23:13:39 UTC (rev 80070)
@@ -0,0 +1,22 @@
+--- gdl/gdl-dock-item-button-image.c.orig	2011-07-03 16:06:38.000000000 -0700
++++ gdl/gdl-dock-item-button-image.c	2011-07-03 16:07:23.000000000 -0700
+@@ -49,7 +49,7 @@ gdl_dock_item_button_image_expose (GtkWi
+     cairo_set_line_width(cr, 1.0);
+     
+     style = gtk_widget_get_style (widget);
+-    g_return_if_fail (style != NULL);
++    g_return_val_if_fail (style != NULL, 1);
+     color = &style->fg[GTK_STATE_NORMAL];
+     cairo_set_source_rgba(cr, color->red / 65535.0,
+         color->green / 65535.0, color->blue / 65535.0, 0.55);
+--- gdl/gdl-dock-item.c.orig	2010-08-08 08:12:25.000000000 -0700
++++ gdl/gdl-dock-item.c	2011-07-03 16:06:05.000000000 -0700
+@@ -1816,7 +1816,7 @@ gdl_dock_item_set_tablabel (GdlDockItem 
+ GtkWidget *
+ gdl_dock_item_get_grip(GdlDockItem *item)
+ {
+-    g_return_if_fail (item != NULL);
++    g_return_val_if_fail (item != NULL, NULL);
+     g_return_val_if_fail (GDL_IS_DOCK_ITEM (item), NULL);
+ 
+     return item->_priv->grip;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110703/364c44f0/attachment.html>