Mon Dec 9 14:46:19 2013 UTC ()
Fix build on Solaris, based on patch by Uwe Klaus in PR 48435.


(wiz)
diff -r1.195 -r1.196 pkgsrc/devel/glib2/distinfo
diff -r0 -r1.3 pkgsrc/devel/glib2/patches/patch-gio_glocalfile.c
cvs diff -r1.195 -r1.196 pkgsrc/devel/glib2/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/glib2/distinfo 2013/12/08 13:08:59 1.195
+++ pkgsrc/devel/glib2/distinfo 2013/12/09 14:46:19 1.196
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.195 2013/12/08 13:08:59 prlw1 Exp $ 1$NetBSD: distinfo,v 1.196 2013/12/09 14:46:19 wiz Exp $
2 2
3SHA1 (glib-2.38.2.tar.xz) = 685c5a4215b776b83dd5330ab9084c5dcb0a51b8 3SHA1 (glib-2.38.2.tar.xz) = 685c5a4215b776b83dd5330ab9084c5dcb0a51b8
4RMD160 (glib-2.38.2.tar.xz) = 1dcc15ce6dac0faafaee448f393284bb038f2a76 4RMD160 (glib-2.38.2.tar.xz) = 1dcc15ce6dac0faafaee448f393284bb038f2a76
5Size (glib-2.38.2.tar.xz) = 6718296 bytes 5Size (glib-2.38.2.tar.xz) = 6718296 bytes
6SHA1 (patch-aa) = 737581b71133ecbfec0fe8b3e836a2a21b7af84b 6SHA1 (patch-aa) = 737581b71133ecbfec0fe8b3e836a2a21b7af84b
7SHA1 (patch-ab) = 04bde955a2a588011a8c77ada4923d5464a0d544 7SHA1 (patch-ab) = 04bde955a2a588011a8c77ada4923d5464a0d544
8SHA1 (patch-ac) = 96e153339675457356f71e35d20375bed669d337 8SHA1 (patch-ac) = 96e153339675457356f71e35d20375bed669d337
9SHA1 (patch-ae) = 09f16e8e14bdea3ee0e478d335f65cb66939e5f5 9SHA1 (patch-ae) = 09f16e8e14bdea3ee0e478d335f65cb66939e5f5
10SHA1 (patch-af) = 237b38ac1e273da51fd49e632c96901899494600 10SHA1 (patch-af) = 237b38ac1e273da51fd49e632c96901899494600
11SHA1 (patch-ah) = 2e23c228047d07769ef5b03b0ff636daa0435ee5 11SHA1 (patch-ah) = 2e23c228047d07769ef5b03b0ff636daa0435ee5
12SHA1 (patch-aha) = 3249929122a567eec3c421a1efa0ac510f1474b7 12SHA1 (patch-aha) = 3249929122a567eec3c421a1efa0ac510f1474b7
13SHA1 (patch-ai) = 3264cf22844f7202f1c9dc413c09c8f960de04f6 13SHA1 (patch-ai) = 3264cf22844f7202f1c9dc413c09c8f960de04f6
14SHA1 (patch-ak) = f5699914c2fe212316a27c64dd129ea7dde594f0 14SHA1 (patch-ak) = f5699914c2fe212316a27c64dd129ea7dde594f0
@@ -18,14 +18,15 @@ SHA1 (patch-an) = 6cfb371539dad1fb89b1c1 @@ -18,14 +18,15 @@ SHA1 (patch-an) = 6cfb371539dad1fb89b1c1
18SHA1 (patch-ap) = 5bc134ebe768c7171f25ce356b40edeae30c5b92 18SHA1 (patch-ap) = 5bc134ebe768c7171f25ce356b40edeae30c5b92
19SHA1 (patch-aq) = 217a8ea4ba7dbdcc315cb16575d55b9949997b64 19SHA1 (patch-aq) = 217a8ea4ba7dbdcc315cb16575d55b9949997b64
20SHA1 (patch-ba) = 2080a1240539be7d10777b79adfb3fcf4d2bd44e 20SHA1 (patch-ba) = 2080a1240539be7d10777b79adfb3fcf4d2bd44e
21SHA1 (patch-cb) = 56e2a9b2de04c8e528faf7ce778503fa55dcc3ac 21SHA1 (patch-cb) = 56e2a9b2de04c8e528faf7ce778503fa55dcc3ac
22SHA1 (patch-cc) = f3d37cbb483863aab602f9c1209650e3e4795871 22SHA1 (patch-cc) = f3d37cbb483863aab602f9c1209650e3e4795871
23SHA1 (patch-cd) = 0d574419257a604ca19e18a43aa42ec6e9a36c78 23SHA1 (patch-cd) = 0d574419257a604ca19e18a43aa42ec6e9a36c78
24SHA1 (patch-cj) = 1098ae4d3936a7fa4e9c39b0dc8734bef34f03b2 24SHA1 (patch-cj) = 1098ae4d3936a7fa4e9c39b0dc8734bef34f03b2
25SHA1 (patch-ck) = 324116cc6fb8dbce8ce8d20f5b237fc469a55cd2 25SHA1 (patch-ck) = 324116cc6fb8dbce8ce8d20f5b237fc469a55cd2
26SHA1 (patch-cl) = c95e9fbff6ac66d5daedf0358ef3df89986b99ff 26SHA1 (patch-cl) = c95e9fbff6ac66d5daedf0358ef3df89986b99ff
27SHA1 (patch-cm) = 534af37ae8f2bd667f630142058d4de5ea91be93 27SHA1 (patch-cm) = 534af37ae8f2bd667f630142058d4de5ea91be93
28SHA1 (patch-cn) = 0cb2fa14b2d3f0ff66f5d5f32e79a36c71a99b78 28SHA1 (patch-cn) = 0cb2fa14b2d3f0ff66f5d5f32e79a36c71a99b78
29SHA1 (patch-gio_gdbusauthmechanismsha1.c) = dfbd4a85ea842f11e4bb76d39c5509fb8b0d5baa 29SHA1 (patch-gio_gdbusauthmechanismsha1.c) = dfbd4a85ea842f11e4bb76d39c5509fb8b0d5baa
30SHA1 (patch-gio_gdbusmessage.c) = 63030dac620e2e098acf079e5288e356f1f44504 30SHA1 (patch-gio_gdbusmessage.c) = 63030dac620e2e098acf079e5288e356f1f44504
 31SHA1 (patch-gio_glocalfile.c) = b09c78199ef2696905ce8a49e0c3590d243a83c8
31SHA1 (patch-gio_gresource-tool.c) = 4eb7c9df25e9ac3e977edf3be8fb977a6fb39182 32SHA1 (patch-gio_gresource-tool.c) = 4eb7c9df25e9ac3e977edf3be8fb977a6fb39182
File Added: pkgsrc/devel/glib2/patches/Attic/patch-gio_glocalfile.c
$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