mirror of
https://github.com/Stichting-MINIX-Research-Foundation/pkgsrc-ng.git
synced 2025-08-03 09:48:00 -04:00
devel/glib2
This commit is contained in:
parent
f6b06b2349
commit
c2ff648ac8
@ -26,3 +26,7 @@ SHA1 (patch-gio_gunixmounts.c) = 40edf6a79d37bf8eca38d0f84521a7538443c00c
|
||||
SHA1 (patch-glib_gmain.c) = d09ff66e475ee52d37ac0dcb463110f690ce6511
|
||||
SHA1 (patch-glib_gthread-posix.c) = ca93c8dc358453eb79b518c884464c90d7628888
|
||||
SHA1 (patch-glib_gtimezone.c) = d9686da52f171a073d80cfd9f80aa490088a00a3
|
||||
SHA1 (patch-zz-minix-a) = 7113d6c9d374f661201e2cb0b6697d85debc9507
|
||||
SHA1 (patch-zz-minix-b) = af0e70d4809be0f87a4a64bd6be9f899bf9c7b3e
|
||||
SHA1 (patch-zz-minix-c) = be265f0810343c4dca6bea12f9558aa97f95952d
|
||||
SHA1 (patch-zz-minix-d) = ab073e72fa53f5da94e002443624844128c4124e
|
||||
|
24
devel/glib2/patches/patch-zz-minix-a
Normal file
24
devel/glib2/patches/patch-zz-minix-a
Normal file
@ -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
|
||||
}
|
||||
|
||||
|
13
devel/glib2/patches/patch-zz-minix-b
Normal file
13
devel/glib2/patches/patch-zz-minix-b
Normal file
@ -0,0 +1,13 @@
|
||||
--- ./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);
|
||||
|
16
devel/glib2/patches/patch-zz-minix-c
Normal file
16
devel/glib2/patches/patch-zz-minix-c
Normal file
@ -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
|
108
devel/glib2/patches/patch-zz-minix-d
Normal file
108
devel/glib2/patches/patch-zz-minix-d
Normal file
@ -0,0 +1,108 @@
|
||||
--- gio/gsocket.c.orig Tue Nov 12 05:30:22 2013
|
||||
+++ gio/gsocket.c Wed May 7 16:45:47 2014
|
||||
@@ -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);
|
||||
|
Loading…
x
Reference in New Issue
Block a user