diff options
| author | tron <tron> | 2013-12-25 11:04:28 +0000 |
|---|---|---|
| committer | tron <tron> | 2013-12-25 11:04:28 +0000 |
| commit | 09b1d5faebf6773dcc5afbc298aa571c20abf934 (patch) | |
| tree | 550dde5cef913c3370792fc79d4a422928fc3aae /devel/glib2 | |
| parent | 9eed5f9a14238f7a255d2364129dd34dc6dcdf6b (diff) | |
| download | pkgsrc-09b1d5faebf6773dcc5afbc298aa571c20abf934.tar.gz | |
Fix build with SunStudio C Compiler under Solaris 10.
Diffstat (limited to 'devel/glib2')
| -rw-r--r-- | devel/glib2/distinfo | 3 | ||||
| -rw-r--r-- | devel/glib2/patches/patch-gio_gfile.c | 19 |
2 files changed, 21 insertions, 1 deletions
diff --git a/devel/glib2/distinfo b/devel/glib2/distinfo index 6bdfab173d9..70380eb263e 100644 --- a/devel/glib2/distinfo +++ b/devel/glib2/distinfo @@ -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-cm) = 534af37ae8f2bd667f630142058d4de5ea91be93 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 --git a/devel/glib2/patches/patch-gio_gfile.c b/devel/glib2/patches/patch-gio_gfile.c new file mode 100644 index 00000000000..d9252733b72 --- /dev/null +++ b/devel/glib2/patches/patch-gio_gfile.c @@ -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); + } + + /** |