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

Remove useless patch.

Browse Source
This commit is contained in:
ajacoutot 2011-06-15 06:36:44 +00:00
parent 5af9197894
commit dc76e471d0
3 changed files with 18 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
x11/gnome/gvfs/patches/patch-client_gdaemonfileinputstream_c
View File

@ -1,15 +1,17 @@
$OpenBSD: patch-client_gdaemonfileinputstream_c,v 1.1 2010/07/24 16:04:21 ajacoutot Exp $
$OpenBSD: patch-client_gdaemonfileinputstream_c,v 1.2 2011/06/15 06:36:44 ajacoutot Exp $
XXX Remove non-blocking flag from fd. This is needed because the
g_input_stream_*() functions are blocking but we compile with -pthread
which sets all fds to non-blocking. See pthreads(3).
https://bugzilla.gnome.org/show_bug.cgi?id=650883
--- client/gdaemonfileinputstream.c.orig Mon Oct 19 15:11:03 2009
+++ client/gdaemonfileinputstream.c Fri Jul 23 20:15:17 2010
@@ -376,6 +376,12 @@ g_daemon_file_input_stream_new (int fd,
--- client/gdaemonfileinputstream.c.orig Mon May 23 16:38:05 2011
+++ client/gdaemonfileinputstream.c Wed Jun 15 08:20:07 2011
@@ -376,6 +376,16 @@ g_daemon_file_input_stream_new (int fd,
{
GDaemonFileInputStream *stream;
+/*
+ * Prevent EINTR caused by OpenBSD userland threads setting all file
+ * descriptors to non-blocking mode
+ */
+#ifdef __OpenBSD__
+ int flags = fcntl(fd, F_GETFL);
+ if (fcntl(fd, F_SETFL, flags & ~O_NONBLOCK) < 0)

16
x11/gnome/gvfs/patches/patch-client_gdaemonfileoutputstream_c
View File

@ -1,15 +1,17 @@
$OpenBSD: patch-client_gdaemonfileoutputstream_c,v 1.1 2010/07/24 16:04:21 ajacoutot Exp $
$OpenBSD: patch-client_gdaemonfileoutputstream_c,v 1.2 2011/06/15 06:36:44 ajacoutot Exp $
XXX Remove non-blocking flag from fd. This is needed because the
g_input_stream_*() functions are blocking but we compile with -pthread
which sets all fds to non-blocking. See pthreads(3).
https://bugzilla.gnome.org/show_bug.cgi?id=650883
--- client/gdaemonfileoutputstream.c.orig Mon Oct 19 15:11:03 2009
+++ client/gdaemonfileoutputstream.c Fri Jul 23 20:15:29 2010
@@ -297,6 +297,12 @@ g_daemon_file_output_stream_new (int fd,
--- client/gdaemonfileoutputstream.c.orig Mon May 23 16:38:05 2011
+++ client/gdaemonfileoutputstream.c Wed Jun 15 08:20:17 2011
@@ -297,6 +297,16 @@ g_daemon_file_output_stream_new (int fd,
{
GDaemonFileOutputStream *stream;
+/*
+ * Prevent EINTR caused by OpenBSD userland threads setting all file
+ * descriptors to non-blocking mode
+ */
+#ifdef __OpenBSD__
+ int flags = fcntl(fd, F_GETFL);
+ if (fcntl(fd, F_SETFL, flags & ~O_NONBLOCK) < 0)

11
x11/gnome/gvfs/patches/patch-daemon_gvfswritechannel_c
View File

@ -1,11 +0,0 @@
$OpenBSD: patch-daemon_gvfswritechannel_c,v 1.1 2010/04/22 20:27:05 ajacoutot Exp $
--- daemon/gvfswritechannel.c.orig Tue Jul 14 13:07:59 2009
+++ daemon/gvfswritechannel.c Thu Apr 22 22:10:34 2010
@@ -29,6 +29,7 @@
#include <sys/socket.h>
#include <sys/un.h>
#include <fcntl.h>
+#include <string.h>
#include <glib.h>
#include <glib-object.h>