summaryrefslogtreecommitdiff
path: root/devel/glib2
diff options
context:
space:
mode:
authorwiz <wiz>2013-12-09 14:46:19 +0000
committerwiz <wiz>2013-12-09 14:46:19 +0000
commit91474848a11abf845b19c84db620040f072a272e (patch)
tree56c3fd155928a8f4c1766496125ed6be9d7d8f72 /devel/glib2
parent992ec337135afe88ad2d1fc811a33d632523ccbd (diff)
downloadpkgsrc-91474848a11abf845b19c84db620040f072a272e.tar.gz
Fix build on Solaris, based on patch by Uwe Klaus in PR 48435.
Diffstat (limited to 'devel/glib2')
-rw-r--r--devel/glib2/distinfo3
-rw-r--r--devel/glib2/patches/patch-gio_glocalfile.c19
2 files changed, 21 insertions, 1 deletions
diff --git a/devel/glib2/distinfo b/devel/glib2/distinfo
index 201c7dcdc9a..6bdfab173d9 100644
--- a/devel/glib2/distinfo
+++ b/devel/glib2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.195 2013/12/08 13:08:59 prlw1 Exp $
+$NetBSD: distinfo,v 1.196 2013/12/09 14:46:19 wiz Exp $
SHA1 (glib-2.38.2.tar.xz) = 685c5a4215b776b83dd5330ab9084c5dcb0a51b8
RMD160 (glib-2.38.2.tar.xz) = 1dcc15ce6dac0faafaee448f393284bb038f2a76
@@ -28,4 +28,5 @@ SHA1 (patch-cm) = 534af37ae8f2bd667f630142058d4de5ea91be93
SHA1 (patch-cn) = 0cb2fa14b2d3f0ff66f5d5f32e79a36c71a99b78
SHA1 (patch-gio_gdbusauthmechanismsha1.c) = dfbd4a85ea842f11e4bb76d39c5509fb8b0d5baa
SHA1 (patch-gio_gdbusmessage.c) = 63030dac620e2e098acf079e5288e356f1f44504
+SHA1 (patch-gio_glocalfile.c) = b09c78199ef2696905ce8a49e0c3590d243a83c8
SHA1 (patch-gio_gresource-tool.c) = 4eb7c9df25e9ac3e977edf3be8fb977a6fb39182
diff --git a/devel/glib2/patches/patch-gio_glocalfile.c b/devel/glib2/patches/patch-gio_glocalfile.c
new file mode 100644
index 00000000000..e51c3355e08
--- /dev/null
+++ b/devel/glib2/patches/patch-gio_glocalfile.c
@@ -0,0 +1,19 @@
+$NetBSD: patch-gio_glocalfile.c,v 1.3 2013/12/09 14:46:19 wiz Exp $
+
+Fix compilation on Solaris where O_DIRECTORY does not exist.
+PR pkg/48435.
+
+--- gio/glocalfile.c.orig 2013-11-12 05:30:22.000000000 +0000
++++ gio/glocalfile.c
+@@ -2699,7 +2699,11 @@ g_local_file_measure_size_of_file (gint
+ return FALSE;
+
+ #ifdef AT_FDCWD
++#ifdef O_DIRECTORY
+ dir_fd = openat (parent_fd, name->data, O_RDONLY | O_DIRECTORY);
++#else
++ dir_fd = openat (parent_fd, name->data, O_RDONLY);
++#endif
+ if (dir_fd < 0)
+ return g_local_file_measure_size_error (state->flags, errno, name, error);
+ #endif