Bugfix update to glib2-2.30.2.

This commit is contained in:
ajacoutot 2011-11-12 13:14:21 +00:00
parent 58c964ecc7
commit 0f092bc18f
3 changed files with 26 additions and 13 deletions

View File

@ -1,17 +1,15 @@
# $OpenBSD: Makefile,v 1.143 2011/10/19 15:04:45 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.144 2011/11/12 13:14:21 ajacoutot Exp $
COMMENT-main= general-purpose utility library
COMMENT-docs= glib2 documentation
VERSION= 2.30.1
VERSION= 2.30.2
DISTNAME= glib-${VERSION}
EXTRACT_SUFX= .tar.xz
PKGNAME-main= glib2-${VERSION}
PKGNAME-docs= glib2-docs-${VERSION}
REVISION-main= 1
CATEGORIES= devel
HOMEPAGE= http://www.gtk.org/

View File

@ -1,5 +1,5 @@
MD5 (glib-2.30.1.tar.xz) = GVTcppmU+49gKANB2j/irg==
RMD160 (glib-2.30.1.tar.xz) = K/0QbrVtGtSvS+VW8jmJkeU+GCU=
SHA1 (glib-2.30.1.tar.xz) = FdSXEGzMOJomKXcl+Nxt438sA3E=
SHA256 (glib-2.30.1.tar.xz) = gv3iIuozoPqsiOm1D1sff8/CNchhqTcej+R+wSweJ/k=
SIZE (glib-2.30.1.tar.xz) = 5809220
MD5 (glib-2.30.2.tar.xz) = t90mqoPeC1nIZ6C565+UYg==
RMD160 (glib-2.30.2.tar.xz) = 2Px8h2vRXqOpJV1NCmfXReN5BIg=
SHA1 (glib-2.30.2.tar.xz) = vHvoVyEimX5NX8ZpH1FgLyjNTjo=
SHA256 (glib-2.30.2.tar.xz) = 8OkeYzMyHdtI+hK1xm9Ww9XwUyV0jGbdLpAWwnj/joI=
SIZE (glib-2.30.2.tar.xz) = 5818860

View File

@ -1,12 +1,27 @@
$OpenBSD: patch-glib_gmain_c,v 1.6 2011/10/19 15:04:45 ajacoutot Exp $
$OpenBSD: patch-glib_gmain_c,v 1.7 2011/11/12 13:14:21 ajacoutot Exp $
Rewrote upstream, but provides similar functionnality.
(test with GDM that the following does not happen:
Failed to read from child watch wake up pipe: Interrupted system call)
--- glib/gmain.c.orig Wed Oct 19 16:38:09 2011
+++ glib/gmain.c Wed Oct 19 14:09:17 2011
@@ -4549,6 +4549,13 @@ unix_signal_helper_thread (gpointer data)
--- glib/gmain.c.orig Sat Nov 12 14:01:13 2011
+++ glib/gmain.c Sat Nov 12 14:01:24 2011
@@ -2054,10 +2054,14 @@ g_get_monotonic_time (void)
{
clockid_t best_clockid;
+#ifndef __OpenBSD__
if (sysconf (_SC_MONOTONIC_CLOCK) >= 0)
best_clockid = CLOCK_MONOTONIC;
else
best_clockid = CLOCK_REALTIME;
+#else
+ best_clockid = CLOCK_MONOTONIC;
+#endif
g_once_init_leave (&clockid, (gsize)best_clockid);
}
#endif
@@ -4565,6 +4569,13 @@ unix_signal_helper_thread (gpointer data)
gboolean sighup_received = FALSE;
bytes_read = read (unix_signal_wake_up_pipe[0], b, sizeof (b));