--- a/ChangeLog	Tue Apr 25 11:09:46 2006 +0000
+++ b/ChangeLog	Tue Apr 25 12:59:12 2006 +0000
@@ -1,3 +1,8 @@
+2006-04-25  Damien Carbery <[email protected]>
+
+	* gimp.spec: Add patch, 03-void-return, to fix build. Bugzilla: 339698.
+	* patchesgimp-03-void-return.diff: Fix build issues, Bugzilla: 339698.
+
 2006-04-25  Glynn Foster  <[email protected]>
 
 	* patches/gnome-panel-01-default-setup.diff: Always group when

--- a/gimp.spec	Tue Apr 25 11:09:46 2006 +0000
+++ b/gimp.spec	Tue Apr 25 12:59:12 2006 +0000
@@ -9,7 +9,7 @@
 %define subver 2.3
 %define subver_install 2.0
 %define microver 8
-%define help_version 8
+%define help_version 9
 
 Name:         gimp
 License:      GPL, LGPL
@@ -23,6 +23,7 @@
 Source1:      ftp://ftp.gimp.org/pub/%{name}/help/testing/gimp-help-2-0.%{help_version}.tar.gz
 Patch1:       gimp-01-menu-entry.diff
 Patch2:       gimp-02-Xext.diff
+Patch3:       gimp-03-void-return.diff
 URL:          http://www.gimp.org
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 Docdir:       %{_defaultdocdir}/doc
@@ -91,6 +92,7 @@
 %setup -q
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 gunzip -c %SOURCE1|tar xf -
 
@@ -232,8 +234,12 @@
 %{_mandir}/man1/gimptool-%{subver_install}.1*
 
 %changelog
+* Tue Apr 25 2006 - [email protected]
+- Add patch, 03-void-return, to fix build issues. Bugzilla: 339698.
+
 * Mon Apr 24 2006 - [email protected]
 - Bump to 2.3.8.
+- Bump help version to 2.0.9.
 
 * Tue Feb 21 2006 - [email protected]
 - Bump to 2.3.7.

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gimp-03-void-return.diff	Tue Apr 25 12:59:12 2006 +0000
@@ -0,0 +1,94 @@
+--- gimp-2.3.8/app/core/gimpparamspecs.c.orig	2006-04-25 12:49:37.706995000 +0100
++++ gimp-2.3.8/app/core/gimpparamspecs.c	2006-04-25 12:50:43.266988000 +0100
+@@ -2165,7 +2165,7 @@
+ {
+   g_return_if_fail (GIMP_VALUE_HOLDS_INT16_ARRAY (value));
+ 
+-  return gimp_value_set_array (value, (const guint8 *) data,
++  gimp_value_set_array (value, (const guint8 *) data,
+                                length * sizeof (gint16));
+ }
+ 
+@@ -2176,7 +2176,7 @@
+ {
+   g_return_if_fail (GIMP_VALUE_HOLDS_INT16_ARRAY (value));
+ 
+-  return gimp_value_set_static_array (value, (const guint8 *) data,
++  gimp_value_set_static_array (value, (const guint8 *) data,
+                                       length * sizeof (gint16));
+ }
+ 
+@@ -2187,7 +2187,7 @@
+ {
+   g_return_if_fail (GIMP_VALUE_HOLDS_INT16_ARRAY (value));
+ 
+-  return gimp_value_take_array (value, (guint8 *) data,
++  gimp_value_take_array (value, (guint8 *) data,
+                                 length * sizeof (gint16));
+ }
+ 
+@@ -2290,7 +2290,7 @@
+ {
+   g_return_if_fail (GIMP_VALUE_HOLDS_INT32_ARRAY (value));
+ 
+-  return gimp_value_set_array (value, (const guint8 *) data,
++  gimp_value_set_array (value, (const guint8 *) data,
+                                length * sizeof (gint32));
+ }
+ 
+@@ -2301,7 +2301,7 @@
+ {
+   g_return_if_fail (GIMP_VALUE_HOLDS_INT32_ARRAY (value));
+ 
+-  return gimp_value_set_static_array (value, (const guint8 *) data,
++  gimp_value_set_static_array (value, (const guint8 *) data,
+                                       length * sizeof (gint32));
+ }
+ 
+@@ -2312,7 +2312,7 @@
+ {
+   g_return_if_fail (GIMP_VALUE_HOLDS_INT32_ARRAY (value));
+ 
+-  return gimp_value_take_array (value, (guint8 *) data,
++  gimp_value_take_array (value, (guint8 *) data,
+                                 length * sizeof (gint32));
+ }
+ 
+@@ -2415,7 +2415,7 @@
+ {
+   g_return_if_fail (GIMP_VALUE_HOLDS_FLOAT_ARRAY (value));
+ 
+-  return gimp_value_set_array (value, (const guint8 *) data,
++  gimp_value_set_array (value, (const guint8 *) data,
+                                length * sizeof (gdouble));
+ }
+ 
+@@ -2426,7 +2426,7 @@
+ {
+   g_return_if_fail (GIMP_VALUE_HOLDS_FLOAT_ARRAY (value));
+ 
+-  return gimp_value_set_static_array (value, (const guint8 *) data,
++  gimp_value_set_static_array (value, (const guint8 *) data,
+                                       length * sizeof (gdouble));
+ }
+ 
+@@ -2437,7 +2437,7 @@
+ {
+   g_return_if_fail (GIMP_VALUE_HOLDS_FLOAT_ARRAY (value));
+ 
+-  return gimp_value_take_array (value, (guint8 *) data,
++  gimp_value_take_array (value, (guint8 *) data,
+                                 length * sizeof (gdouble));
+ }
+ 
+--- gimp-2.3.8/app/core/gimppickable.c.orig	2006-04-25 12:51:13.388608000 +0100
++++ gimp-2.3.8/app/core/gimppickable.c	2006-04-25 12:51:20.602598000 +0100
+@@ -66,7 +66,7 @@
+   pickable_iface = GIMP_PICKABLE_GET_INTERFACE (pickable);
+ 
+   if (pickable_iface->flush)
+-    return pickable_iface->flush (pickable);
++    pickable_iface->flush (pickable);
+ }
+ 
+ GimpImage *