<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/3552421d2d0a77a200dd36bb604fc105c812a28e">https://github.com/macports/macports-ports/commit/3552421d2d0a77a200dd36bb604fc105c812a28e</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 3552421 glib2-devel: Fix build on Mac OS X 10.6 and earlier
</span>3552421 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 3552421d2d0a77a200dd36bb604fc105c812a28e
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Wed Sep 5 09:53:36 2018 -0500
<span style='display:block; white-space:pre;color:#404040;'> glib2-devel: Fix build on Mac OS X 10.6 and earlier
</span>---
devel/glib2-devel/Portfile | 2 ++
devel/glib2-devel/files/GKqueueFileMonitor.patch | 25 ++++++++++++++++++++++++
devel/glib2-devel/files/O_CLOEXEC.patch | 23 ++++++++++++++++++++++
3 files changed, 50 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2-devel/Portfile b/devel/glib2-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 63b3eed..9828562 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,6 +41,8 @@ patchfiles libintl.patch \
</span> patch-gmodule-gmodule-dl.c.diff \
patch-configure-switch-for-gappinfo-impl.diff \
universal.patch \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ GKqueueFileMonitor.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ O_CLOEXEC.patch \
</span> which.patch
depends_build port:autoconf \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2-devel/files/GKqueueFileMonitor.patch b/devel/glib2-devel/files/GKqueueFileMonitor.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..a655f1a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2-devel/files/GKqueueFileMonitor.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,25 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix build failure with gcc 4.2.1:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+gkqueuefilemonitor.c:88: error: redefinition of typedef 'GKqueueFileMonitor'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+kqueue-helper.h:31: error: previous declaration of 'GKqueueFileMonitor' was here
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://gitlab.gnome.org/GNOME/glib/issues/1506
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://gitlab.gnome.org/GNOME/glib/merge_requests/291
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gio/kqueue/gkqueuefilemonitor.c.orig 2018-08-30 12:12:08.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gio/kqueue/gkqueuefilemonitor.c 2018-08-31 09:42:20.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -75,7 +75,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * To distinguish between a directory monitor and a regular file monitor, check
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * whether sub_file is NULL. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-typedef struct _GKqueueFileMonitor
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++struct _GKqueueFileMonitor
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GLocalFileMonitor parent_instance;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -85,7 +85,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GFileMonitor *fallback;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GFile *fbfile;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-} GKqueueFileMonitor;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef __clang__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #pragma clang diagnostic pop
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2-devel/files/O_CLOEXEC.patch b/devel/glib2-devel/files/O_CLOEXEC.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..615e38b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2-devel/files/O_CLOEXEC.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,23 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix build on systems without O_CLOEXEC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://gitlab.gnome.org/GNOME/glib/issues/1488
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://gitlab.gnome.org/GNOME/glib/merge_requests/286
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- glib/gspawn.c.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ glib/gspawn.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1485,7 +1485,7 @@ do_posix_spawn (gchar **argv,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ parent_close_fds[num_parent_close_fds++] = write_null;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef HAVE_O_CLOEXEC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fcntl (read_null, F_SETFD, FD_CLOEXEC);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fcntl (write_null, F_SETFD, FD_CLOEXEC);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ r = posix_spawn_file_actions_adddup2 (&file_actions, write_null, 1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1509,7 +1509,7 @@ do_posix_spawn (gchar **argv,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ parent_close_fds[num_parent_close_fds++] = write_null;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef HAVE_O_CLOEXEC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fcntl (read_null, F_SETFD, FD_CLOEXEC);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fcntl (write_null, F_SETFD, FD_CLOEXEC);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ r = posix_spawn_file_actions_adddup2 (&file_actions, write_null, 2);
</span></pre><pre style='margin:0'>
</pre>