[79945] trunk/dports/gnome/gnome-utils

[jeremyhu at macports.org]

Revision: 79945
          http://trac.macports.org/changeset/79945
Author:   jeremyhu at macports.org
Date:     2011-06-29 22:03:42 -0700 (Wed, 29 Jun 2011)
Log Message:
-----------
gnome-utils: Fix invalid return statements caught by clang

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

Added Paths:
-----------
    trunk/dports/gnome/gnome-utils/files/bad-return.patch

Modified: trunk/dports/gnome/gnome-utils/Portfile
===================================================================
--- trunk/dports/gnome/gnome-utils/Portfile	2011-06-30 02:39:29 UTC (rev 79944)
+++ trunk/dports/gnome/gnome-utils/Portfile	2011-06-30 05:03:42 UTC (rev 79945)
@@ -5,7 +5,7 @@
 
 name		gnome-utils
 version		2.30.0
-revision        2
+revision        3
 set branch      [join [lrange [split ${version} .] 0 1] .]
 description	GNOME utilities
 long_description Utilities for the GNOME 2.0 desktop.
@@ -31,7 +31,8 @@
 use_bzip2 	yes
 
 patchfiles      patch-gnome-dictionary-libgdict-Makefile.am.diff \
-                patch-gsearchtool-libgnomeui-deprecated-Makefile.am.diff
+                patch-gsearchtool-libgnomeui-deprecated-Makefile.am.diff \
+                bad-return.patch
 
 use_autoreconf  yes
 

Added: trunk/dports/gnome/gnome-utils/files/bad-return.patch
===================================================================
--- trunk/dports/gnome/gnome-utils/files/bad-return.patch	                        (rev 0)
+++ trunk/dports/gnome/gnome-utils/files/bad-return.patch	2011-06-30 05:03:42 UTC (rev 79945)
@@ -0,0 +1,20 @@
+--- baobab/src/baobab-chart.c.orig	2011-06-29 17:57:18.000000000 -0700
++++ baobab/src/baobab-chart.c	2011-06-29 17:59:33.000000000 -0700
+@@ -1823,7 +1823,7 @@ baobab_chart_can_zoom_in (GtkWidget *cha
+   BaobabChartPrivate *priv;
+   BaobabChartClass *class;
+ 
+-  g_return_if_fail (BAOBAB_IS_CHART (chart));
++  g_return_val_if_fail (BAOBAB_IS_CHART (chart), 0);
+ 
+   priv = BAOBAB_CHART (chart)->priv;
+   class = BAOBAB_CHART_GET_CLASS (chart);
+@@ -1849,7 +1849,7 @@ baobab_chart_can_zoom_out (GtkWidget *ch
+   BaobabChartPrivate *priv;
+   BaobabChartClass *class;
+ 
+-  g_return_if_fail (BAOBAB_IS_CHART (chart));
++  g_return_val_if_fail (BAOBAB_IS_CHART (chart), 0);
+ 
+   priv = BAOBAB_CHART (chart)->priv;
+   class = BAOBAB_CHART_GET_CLASS (chart);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110629/d0bcba07/attachment.html>