<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[115812] trunk/dports/gnome/gnome-desktop/files/patch-libgnome-destktop-libgsystem.diff</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/115812">115812</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2014-01-11 17:25:07 -0800 (Sat, 11 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>gnome-desktop: build fix, O_CLOEXEC is not available on Snow Leopard.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgnomegnomedesktopfilespatchlibgnomedestktoplibgsystemdiff">trunk/dports/gnome/gnome-desktop/files/patch-libgnome-destktop-libgsystem.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgnomegnomedesktopfilespatchlibgnomedestktoplibgsystemdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/gnome/gnome-desktop/files/patch-libgnome-destktop-libgsystem.diff (115811 => 115812)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/gnome-desktop/files/patch-libgnome-destktop-libgsystem.diff 2014-01-11 22:29:52 UTC (rev 115811)
+++ trunk/dports/gnome/gnome-desktop/files/patch-libgnome-destktop-libgsystem.diff 2014-01-12 01:25:07 UTC (rev 115812)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> diff -urN libgnome-desktop/libgsystem.orig/Makefile-libgsystem.am libgnome-desktop/libgsystem/Makefile-libgsystem.am
</span><span class="cx"> --- libgnome-desktop/libgsystem.orig/Makefile-libgsystem.am 2013-10-04 15:18:43.000000000 -0700
</span><del>-+++ libgnome-desktop/libgsystem/Makefile-libgsystem.am 2013-12-12 16:16:36.000000000 -0800
</del><ins>++++ libgnome-desktop/libgsystem/Makefile-libgsystem.am 2014-01-11 15:28:58.000000000 -0800
</ins><span class="cx"> @@ -35,6 +35,8 @@
</span><span class="cx"> $(libgsystem_srcpath)/gsystem-subprocess.h \
</span><span class="cx"> $(libgsystem_srcpath)/gsystem-subprocess.c \
</span><span class="lines">@@ -12,7 +12,7 @@
</span><span class="cx"> libgsystem_la_CFLAGS = $(AM_CFLAGS) $(libgsystem_cflags)
</span><span class="cx"> diff -urN libgnome-desktop/libgsystem.orig/gsystem-file-utils.c libgnome-desktop/libgsystem/gsystem-file-utils.c
</span><span class="cx"> --- libgnome-desktop/libgsystem.orig/gsystem-file-utils.c 2013-10-04 15:18:43.000000000 -0700
</span><del>-+++ libgnome-desktop/libgsystem/gsystem-file-utils.c 2013-12-12 16:16:36.000000000 -0800
</del><ins>++++ libgnome-desktop/libgsystem/gsystem-file-utils.c 2014-01-11 16:08:49.000000000 -0800
</ins><span class="cx"> @@ -38,6 +38,10 @@
</span><span class="cx"> #include <limits.h>
</span><span class="cx"> #include <dirent.h>
</span><span class="lines">@@ -24,9 +24,38 @@
</span><span class="cx"> static int
</span><span class="cx"> close_nointr (int fd)
</span><span class="cx"> {
</span><ins>+@@ -444,12 +448,28 @@
+ GError **error)
+ {
+ /* Linux specific probably */
++#ifdef O_CLOEXEC
+ *out_fd = open (gs_file_get_path_cached (path), O_RDONLY | O_NONBLOCK | O_DIRECTORY | O_CLOEXEC);
+ if (*out_fd == -1)
+ {
+ _set_error_from_errno (error);
+ return FALSE;
+ }
++#else
++ *out_fd = open (gs_file_get_path_cached (path), O_RDONLY | O_NONBLOCK | O_DIRECTORY);
++ if (*out_fd == -1)
++ {
++ _set_error_from_errno (error);
++ return FALSE;
++ }
++ int fc_error = fcntl(*out_fd, F_SETFD, FD_CLOEXEC);
++ if (fc_error != 0)
++ {
++ g_set_error_literal (error, G_IO_ERROR, g_io_error_from_errno (fc_error),
++ g_strerror (fc_error));
++ return FALSE;
++ }
++#endif
+ return TRUE;
+ }
+
</ins><span class="cx"> diff -urN libgnome-desktop/libgsystem.orig/gsystem-osx-compat.c libgnome-desktop/libgsystem/gsystem-osx-compat.c
</span><span class="cx"> --- libgnome-desktop/libgsystem.orig/gsystem-osx-compat.c 1969-12-31 16:00:00.000000000 -0800
</span><del>-+++ libgnome-desktop/libgsystem/gsystem-osx-compat.c 2013-12-12 16:31:06.000000000 -0800
</del><ins>++++ libgnome-desktop/libgsystem/gsystem-osx-compat.c 2014-01-11 15:28:58.000000000 -0800
</ins><span class="cx"> @@ -0,0 +1,570 @@
</span><span class="cx"> +/*
</span><span class="cx"> + * Mac OS X compatibility functions
</span><span class="lines">@@ -600,7 +629,7 @@
</span><span class="cx"> +
</span><span class="cx"> diff -urN libgnome-desktop/libgsystem.orig/gsystem-osx-compat.h libgnome-desktop/libgsystem/gsystem-osx-compat.h
</span><span class="cx"> --- libgnome-desktop/libgsystem.orig/gsystem-osx-compat.h 1969-12-31 16:00:00.000000000 -0800
</span><del>-+++ libgnome-desktop/libgsystem/gsystem-osx-compat.h 2013-12-12 16:16:36.000000000 -0800
</del><ins>++++ libgnome-desktop/libgsystem/gsystem-osx-compat.h 2014-01-11 15:28:58.000000000 -0800
</ins><span class="cx"> @@ -0,0 +1,43 @@
</span><span class="cx"> +/*
</span><span class="cx"> + * Mac OS X Compatibility
</span><span class="lines">@@ -647,7 +676,7 @@
</span><span class="cx"> +DIR *fdopendir(int fd);
</span><span class="cx"> diff -urN libgnome-desktop/libgsystem.orig/gsystem-shutil.c libgnome-desktop/libgsystem/gsystem-shutil.c
</span><span class="cx"> --- libgnome-desktop/libgsystem.orig/gsystem-shutil.c 2013-10-04 15:18:43.000000000 -0700
</span><del>-+++ libgnome-desktop/libgsystem/gsystem-shutil.c 2013-12-12 16:16:36.000000000 -0800
</del><ins>++++ libgnome-desktop/libgsystem/gsystem-shutil.c 2014-01-11 16:50:40.000000000 -0800
</ins><span class="cx"> @@ -33,6 +33,11 @@
</span><span class="cx"> #include <dirent.h>
</span><span class="cx"> #include <fcntl.h>
</span><span class="lines">@@ -672,3 +701,96 @@
</span><span class="cx"> {
</span><span class="cx"> int errsv = errno;
</span><span class="cx"> if (errsv == ENOENT)
</span><ins>+@@ -271,6 +280,7 @@
+
+ if (dent->d_type == DT_DIR)
+ {
++#ifdef O_CLOEXEC
+ int child_dfd = openat (dfd, dent->d_name, O_RDONLY | O_NONBLOCK | O_DIRECTORY | O_CLOEXEC | O_NOFOLLOW);
+
+ if (child_dfd == -1)
+@@ -285,7 +295,31 @@
+ goto out;
+ }
+ }
++#else
++ int child_dfd = openat (dfd, dent->d_name, O_RDONLY | O_NONBLOCK | O_DIRECTORY | O_NOFOLLOW);
+
++ if (child_dfd == -1)
++ {
++ if (errno == ENOENT)
++ continue;
++ else
++ {
++ int errsv = errno;
++ g_set_error_literal (error, G_IO_ERROR, g_io_error_from_errno (errsv),
++ g_strerror (errsv));
++ goto out;
++ }
++ }
++
++ int fc_error = fcntl(child_dfd, F_SETFD, FD_CLOEXEC);
++
++ if (fc_error != 0)
++ {
++ g_set_error_literal (error, G_IO_ERROR, g_io_error_from_errno (fc_error),
++ g_strerror (fc_error));
++ goto out;
++ }
++#endif
+ child_dir = fdopendir (child_dfd);
+ if (!child_dir)
+ {
+@@ -352,9 +386,9 @@
+ DIR *d = NULL;
+
+ /* With O_NOFOLLOW first */
++#ifdef O_CLOEXEC
+ dfd = openat (AT_FDCWD, gs_file_get_path_cached (path),
+ O_RDONLY | O_NONBLOCK | O_DIRECTORY | O_CLOEXEC | O_NOFOLLOW);
+-
+ if (dfd == -1)
+ {
+ int errsv = errno;
+@@ -374,7 +408,40 @@
+ goto out;
+ }
+ }
+- else
++#else
++ dfd = openat (AT_FDCWD, gs_file_get_path_cached (path),
++ O_RDONLY | O_NONBLOCK | O_DIRECTORY | O_NOFOLLOW);
++ if (dfd == -1)
++ {
++ int errsv = errno;
++ if (errsv == ENOENT)
++ {
++ ;
++ }
++ else if (errsv == ENOTDIR || errsv == ELOOP)
++ {
++ if (!gs_file_unlink (path, cancellable, error))
++ goto out;
++ }
++ else
++ {
++ g_set_error_literal (error, G_IO_ERROR, g_io_error_from_errno (errsv),
++ g_strerror (errsv));
++ goto out;
++ }
++ }
++
++ int fc_error = fcntl(dfd, F_SETFD, FD_CLOEXEC);
++
++ if (fc_error != 0)
++ {
++ g_set_error_literal (error, G_IO_ERROR, g_io_error_from_errno (fc_error),
++ g_strerror (fc_error));
++ goto out;
++ }
++
++#endif
++ if (dfd > 0)
+ {
+ d = fdopendir (dfd);
+ if (!d)
</ins></span></pre>
</div>
</div>
</body>
</html>