cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix obvious mistake in a patch.

Browse Source
This commit is contained in:
ajacoutot 2011-11-16 15:34:54 +00:00
parent add6356fe4
commit 60dbfbb427
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devel/glib2/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.145 2011/11/13 15:16:17 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.146 2011/11/16 15:34:54 ajacoutot Exp $
COMMENT-main= general-purpose utility library
COMMENT-docs= glib2 documentation
@ -10,7 +10,7 @@ EXTRACT_SUFX= .tar.xz
PKGNAME-main= glib2-${VERSION}
PKGNAME-docs= glib2-docs-${VERSION}
REVISION-main= 0
REVISION-main= 1
CATEGORIES= devel

12
devel/glib2/patches/patch-glib_gmain_c
View File

@ -1,11 +1,11 @@
$OpenBSD: patch-glib_gmain_c,v 1.7 2011/11/12 13:14:21 ajacoutot Exp $
$OpenBSD: patch-glib_gmain_c,v 1.8 2011/11/16 15:34:54 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 Sat Nov 12 14:01:13 2011
+++ glib/gmain.c Sat Nov 12 14:01:24 2011
--- glib/gmain.c.orig Fri Nov 11 18:56:52 2011
+++ glib/gmain.c Wed Nov 16 15:46:52 2011
@@ -2054,10 +2054,14 @@ g_get_monotonic_time (void)
{
clockid_t best_clockid;
@ -21,11 +21,11 @@ Failed to read from child watch wake up pipe: Interrupted system call)
g_once_init_leave (&clockid, (gsize)best_clockid);
}
#endif
@@ -4565,6 +4569,13 @@ unix_signal_helper_thread (gpointer data)
@@ -4564,7 +4568,12 @@ unix_signal_helper_thread (gpointer data)
gboolean sigint_received = FALSE;
gboolean sighup_received = FALSE;
bytes_read = read (unix_signal_wake_up_pipe[0], b, sizeof (b));
+
- bytes_read = read (unix_signal_wake_up_pipe[0], b, sizeof (b));
+ do
+ {
+ bytes_read = read (unix_signal_wake_up_pipe[0], b, sizeof (b));