[pkgsrc/trunk]: pkgsrc/devel/glib2 Fix build with SunStudio C Compiler under ...

[tron <tron%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a139b61a80bd
branches:  trunk
changeset: 627961:a139b61a80bd
user:      tron <tron%pkgsrc.org@localhost>
date:      Wed Dec 25 11:04:28 2013 +0000

description:
Fix build with SunStudio C Compiler under Solaris 10.

diffstat:

 devel/glib2/distinfo                  |   3 ++-
 devel/glib2/patches/patch-gio_gfile.c |  19 +++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletions(-)

diffs (39 lines):

diff -r 71b5300e303c -r a139b61a80bd devel/glib2/distinfo
--- a/devel/glib2/distinfo      Wed Dec 25 02:26:48 2013 +0000
+++ b/devel/glib2/distinfo      Wed Dec 25 11:04:28 2013 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.196 2013/12/09 14:46:19 wiz Exp $
+$NetBSD: distinfo,v 1.197 2013/12/25 11:04:28 tron Exp $
 
 SHA1 (glib-2.38.2.tar.xz) = 685c5a4215b776b83dd5330ab9084c5dcb0a51b8
 RMD160 (glib-2.38.2.tar.xz) = 1dcc15ce6dac0faafaee448f393284bb038f2a76
@@ -28,5 +28,6 @@
 SHA1 (patch-cn) = 0cb2fa14b2d3f0ff66f5d5f32e79a36c71a99b78
 SHA1 (patch-gio_gdbusauthmechanismsha1.c) = dfbd4a85ea842f11e4bb76d39c5509fb8b0d5baa
 SHA1 (patch-gio_gdbusmessage.c) = 63030dac620e2e098acf079e5288e356f1f44504
+SHA1 (patch-gio_gfile.c) = 47a7f505170c8da16a8fef871a226009eecdc36b
 SHA1 (patch-gio_glocalfile.c) = b09c78199ef2696905ce8a49e0c3590d243a83c8
 SHA1 (patch-gio_gresource-tool.c) = 4eb7c9df25e9ac3e977edf3be8fb977a6fb39182
diff -r 71b5300e303c -r a139b61a80bd devel/glib2/patches/patch-gio_gfile.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/glib2/patches/patch-gio_gfile.c     Wed Dec 25 11:04:28 2013 +0000
@@ -0,0 +1,19 @@
+$NetBSD: patch-gio_gfile.c,v 1.1 2013/12/25 11:04:28 tron Exp $
+
+Fix build with SunStudio compiler: void function cannot return value
+
+--- gio/gfile.c.orig   2013-11-12 05:30:27.000000000 +0000
++++ gio/gfile.c        2013-12-25 09:58:51.000000000 +0000
+@@ -7627,9 +7627,9 @@
+   g_return_if_fail (G_IS_FILE (file));
+   g_return_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable));
+ 
+-  return G_FILE_GET_IFACE (file)->measure_disk_usage_async (file, flags, io_priority, cancellable,
+-                                                            progress_callback, progress_data,
+-                                                            callback, user_data);
++  G_FILE_GET_IFACE (file)->measure_disk_usage_async (file, flags, io_priority, cancellable,
++                                                     progress_callback, progress_data,
++                                                     callback, user_data);
+ }
+ 
+ /**