diff --git a/devel/glib2/distinfo b/devel/glib2/distinfo index cdcf8d0a5..18dfab44b 100644 --- a/devel/glib2/distinfo +++ b/devel/glib2/distinfo @@ -16,7 +16,7 @@ SHA1 (patch-al) = 4eb4e241488dabe254973f5ada92898af57cd0f5 SHA1 (patch-am) = 99f54927d76580dfeda2a6b1909e1bea5dbdc293 SHA1 (patch-an) = 6cfb371539dad1fb89b1c1cce03de34556f6e40b SHA1 (patch-ap) = 5bc134ebe768c7171f25ce356b40edeae30c5b92 -SHA1 (patch-aq) = 217a8ea4ba7dbdcc315cb16575d55b9949997b64 +SHA1 (patch-aq) = 07ea881e621927f6856e401c76dfa65fbcb0135b SHA1 (patch-ba) = 2080a1240539be7d10777b79adfb3fcf4d2bd44e SHA1 (patch-cb) = 56e2a9b2de04c8e528faf7ce778503fa55dcc3ac SHA1 (patch-cc) = f3d37cbb483863aab602f9c1209650e3e4795871 @@ -29,5 +29,7 @@ SHA1 (patch-cn) = 0cb2fa14b2d3f0ff66f5d5f32e79a36c71a99b78 SHA1 (patch-gio_gdbusauthmechanismsha1.c) = dfbd4a85ea842f11e4bb76d39c5509fb8b0d5baa SHA1 (patch-gio_gdbusmessage.c) = 63030dac620e2e098acf079e5288e356f1f44504 SHA1 (patch-gio_gfile.c) = 6ad65bb17e6afe7bb9bca552ae1b1a7d8b7b2ee0 -SHA1 (patch-gio_glocalfile.c) = b09c78199ef2696905ce8a49e0c3590d243a83c8 +SHA1 (patch-gio_glocalfile.c) = 5ed2a285cc61a2737a248b52f3451b46dcfe6f92 SHA1 (patch-gio_gresource-tool.c) = 4eb7c9df25e9ac3e977edf3be8fb977a6fb39182 +SHA1 (patch-glib_gthread-posix.c) = be265f0810343c4dca6bea12f9558aa97f95952d +SHA1 (patch-za) = 7113d6c9d374f661201e2cb0b6697d85debc9507 diff --git a/devel/glib2/patches/patch-aq b/devel/glib2/patches/patch-aq index dff928bc6..9459b5267 100644 --- a/devel/glib2/patches/patch-aq +++ b/devel/glib2/patches/patch-aq @@ -1,7 +1,5 @@ -$NetBSD: patch-aq,v 1.6 2013/04/19 22:21:41 prlw1 Exp $ - ---- gio/gsocket.c.orig 2013-03-13 13:39:09.000000000 +0000 -+++ gio/gsocket.c +--- gio/gsocket.c.orig Tue Nov 12 05:30:22 2013 ++++ gio/gsocket.c Wed May 7 16:45:47 2014 @@ -37,6 +37,9 @@ #include #include @@ -12,7 +10,113 @@ $NetBSD: patch-aq,v 1.6 2013/04/19 22:21:41 prlw1 Exp $ #ifndef G_OS_WIN32 # include -@@ -4349,7 +4352,7 @@ g_socket_get_credentials (GSocket *soc +@@ -1323,11 +1326,13 @@ g_socket_get_ttl (GSocket *socket) + g_socket_get_option (socket, IPPROTO_IP, IP_TTL, + &value, &error); + } ++#ifndef __minix + else if (socket->priv->family == G_SOCKET_FAMILY_IPV6) + { + g_socket_get_option (socket, IPPROTO_IPV6, IPV6_UNICAST_HOPS, + &value, &error); + } ++#endif + else + g_return_val_if_reached (0); + +@@ -1364,6 +1369,7 @@ g_socket_set_ttl (GSocket *socket, + g_socket_set_option (socket, IPPROTO_IP, IP_TTL, + ttl, &error); + } ++#ifndef __minix + else if (socket->priv->family == G_SOCKET_FAMILY_IPV6) + { + g_socket_set_option (socket, IPPROTO_IP, IP_TTL, +@@ -1371,6 +1377,7 @@ g_socket_set_ttl (GSocket *socket, + g_socket_set_option (socket, IPPROTO_IPV6, IPV6_UNICAST_HOPS, + ttl, &error); + } ++#endif + else + g_return_if_reached (); + +@@ -1472,11 +1479,13 @@ g_socket_get_multicast_loopback (GSocket *socket) + g_socket_get_option (socket, IPPROTO_IP, IP_MULTICAST_LOOP, + &value, &error); + } ++#ifndef __minix + else if (socket->priv->family == G_SOCKET_FAMILY_IPV6) + { + g_socket_get_option (socket, IPPROTO_IPV6, IPV6_MULTICAST_LOOP, + &value, &error); + } ++#endif + else + g_return_val_if_reached (FALSE); + +@@ -1517,6 +1526,7 @@ g_socket_set_multicast_loopback (GSocket *socket, + g_socket_set_option (socket, IPPROTO_IP, IP_MULTICAST_LOOP, + loopback, &error); + } ++#ifndef __minix + else if (socket->priv->family == G_SOCKET_FAMILY_IPV6) + { + g_socket_set_option (socket, IPPROTO_IP, IP_MULTICAST_LOOP, +@@ -1524,6 +1534,7 @@ g_socket_set_multicast_loopback (GSocket *socket, + g_socket_set_option (socket, IPPROTO_IPV6, IPV6_MULTICAST_LOOP, + loopback, &error); + } ++#endif + else + g_return_if_reached (); + +@@ -1561,11 +1572,13 @@ g_socket_get_multicast_ttl (GSocket *socket) + g_socket_get_option (socket, IPPROTO_IP, IP_MULTICAST_TTL, + &value, &error); + } ++#ifndef __minix + else if (socket->priv->family == G_SOCKET_FAMILY_IPV6) + { + g_socket_get_option (socket, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, + &value, &error); + } ++#endif + else + g_return_val_if_reached (FALSE); + +@@ -1603,6 +1616,7 @@ g_socket_set_multicast_ttl (GSocket *socket, + g_socket_set_option (socket, IPPROTO_IP, IP_MULTICAST_TTL, + ttl, &error); + } ++#ifndef __minix + else if (socket->priv->family == G_SOCKET_FAMILY_IPV6) + { + g_socket_set_option (socket, IPPROTO_IP, IP_MULTICAST_TTL, +@@ -1610,6 +1624,7 @@ g_socket_set_multicast_ttl (GSocket *socket, + g_socket_set_option (socket, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, + ttl, &error); + } ++#endif + else + g_return_if_reached (); + +@@ -2053,6 +2068,7 @@ g_socket_multicast_group_operation (GSocket *soc + result = setsockopt (socket->priv->fd, IPPROTO_IP, optname, + &mc_req, sizeof (mc_req)); + } ++#ifndef __minix + else if (g_inet_address_get_family (group) == G_SOCKET_FAMILY_IPV6) + { + struct ipv6_mreq mc_req_ipv6; +@@ -2070,6 +2086,7 @@ g_socket_multicast_group_operation (GSocket *soc + result = setsockopt (socket->priv->fd, IPPROTO_IPV6, optname, + &mc_req_ipv6, sizeof (mc_req_ipv6)); + } ++#endif + else + g_return_val_if_reached (FALSE); + +@@ -4447,7 +4464,7 @@ g_socket_get_credentials (GSocket *socket, ret = NULL; @@ -21,10 +125,12 @@ $NetBSD: patch-aq,v 1.6 2013/04/19 22:21:41 prlw1 Exp $ { socklen_t optlen; #if defined(__linux__) -@@ -4384,6 +4387,35 @@ g_socket_get_credentials (GSocket *soc +@@ -4480,6 +4497,35 @@ g_socket_get_credentials (GSocket *socket, + G_CREDENTIALS_TYPE_OPENBSD_SOCKPEERCRED, + #endif &native_creds); - } - } ++ } ++ } +#elif defined(__NetBSD__) && defined(LOCAL_PEEREID) + { + struct unpcbid cred; @@ -52,8 +158,6 @@ $NetBSD: patch-aq,v 1.6 2013/04/19 22:21:41 prlw1 Exp $ + g_credentials_set_native (ret, + G_CREDENTIALS_TYPE_LINUX_UCRED, + &native_creds); -+ } -+ } + } + } #else - g_set_error_literal (error, - G_IO_ERROR, diff --git a/devel/glib2/patches/patch-gio_glocalfile.c b/devel/glib2/patches/patch-gio_glocalfile.c index e51c3355e..d8b5bd685 100644 --- a/devel/glib2/patches/patch-gio_glocalfile.c +++ b/devel/glib2/patches/patch-gio_glocalfile.c @@ -1,11 +1,17 @@ -$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 +--- ./gio/glocalfile.c.orig Tue Nov 12 05:30:22 2013 ++++ ./gio/glocalfile.c Fri May 9 12:26:13 2014 +@@ -89,6 +89,10 @@ + #endif + #endif + ++#ifdef __minix ++/* LSC: Not very proud of that one, but... */ ++#undef AT_FDCWD ++#endif + + static void g_local_file_file_iface_init (GFileIface *iface); + +@@ -2699,7 +2703,11 @@ g_local_file_measure_size_of_file (gint pare return FALSE; #ifdef AT_FDCWD diff --git a/devel/glib2/patches/patch-glib_gthread-posix.c b/devel/glib2/patches/patch-glib_gthread-posix.c new file mode 100644 index 000000000..ceed22446 --- /dev/null +++ b/devel/glib2/patches/patch-glib_gthread-posix.c @@ -0,0 +1,16 @@ +$NetBSD$ + +--- glib/gthread-posix.c.orig Sun Jun 9 22:03:18 2013 ++++ glib/gthread-posix.c +@@ -1147,7 +1147,11 @@ g_system_thread_new (GThreadFunc thread_func, + void + g_thread_yield (void) + { ++#ifdef __minix ++ return; ++#else + sched_yield (); ++#endif + } + + void diff --git a/devel/glib2/patches/patch-za b/devel/glib2/patches/patch-za new file mode 100644 index 000000000..f58a17762 --- /dev/null +++ b/devel/glib2/patches/patch-za @@ -0,0 +1,24 @@ +--- gio/ginetaddress.c.orig Wed May 7 16:55:07 2014 ++++ gio/ginetaddress.c Wed May 7 16:56:06 2014 +@@ -482,8 +482,10 @@ g_inet_address_new_loopback (GSocketFamily family) + + return g_inet_address_new_from_bytes (addr, family); + } ++#ifndef __minix + else + return g_inet_address_new_from_bytes (in6addr_loopback.s6_addr, family); ++#endif + } + + /** +@@ -509,8 +511,10 @@ g_inet_address_new_any (GSocketFamily family) + + return g_inet_address_new_from_bytes (addr, family); + } ++#ifndef __minix + else + return g_inet_address_new_from_bytes (in6addr_any.s6_addr, family); ++#endif + } + +