<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/51b3dd4d403b8cee91160fcb1aee022b38763817">https://github.com/macports/macports-ports/commit/51b3dd4d403b8cee91160fcb1aee022b38763817</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 51b3dd4 glib2-devel: Update to 2.58.1
</span>51b3dd4 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 51b3dd4d403b8cee91160fcb1aee022b38763817
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Fri Sep 21 21:02:51 2018 -0500
<span style='display:block; white-space:pre;color:#404040;'> glib2-devel: Update to 2.58.1
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/57148
</span>---
devel/glib2-devel/Portfile | 13 +++++-------
devel/glib2-devel/files/GKqueueFileMonitor.patch | 25 ------------------------
devel/glib2-devel/files/O_CLOEXEC.patch | 23 ----------------------
devel/glib2-devel/files/which.patch | 25 ------------------------
4 files changed, 5 insertions(+), 81 deletions(-)
<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 9828562..189e35f 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;'>@@ -8,10 +8,10 @@ PortGroup compiler_blacklist_versions 1.0
</span> name glib2-devel
conflicts glib2
set my_name glib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.58.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 4ec86209c3e927edb641d4f0a4b7631c947d0cd0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 c0f4ce0730b4f95c47b711613b5406a887c2ee13ea6d25930d72a4fa7fdb77f6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 4900456
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.58.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 7951a41129225b9d38d7df72069f73560a9e86a0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 97d6a9d926b6aa3dfaadad3077cfb43eec74432ab455dff14250c769d526d7d6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 4906444
</span>
set branch [join [lrange [split ${version} .] 0 1] .]
categories devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,10 +40,7 @@ patchfiles libintl.patch \
</span> patch-get-launchd-dbus-session-address.diff \
patch-gmodule-gmodule-dl.c.diff \
patch-configure-switch-for-gappinfo-impl.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- universal.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GKqueueFileMonitor.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- O_CLOEXEC.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- which.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ universal.patch
</span>
depends_build port:autoconf \
port:automake \
<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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index a655f1a..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2-devel/files/GKqueueFileMonitor.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,25 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fix build failure with gcc 4.2.1:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-gkqueuefilemonitor.c:88: error: redefinition of typedef 'GKqueueFileMonitor'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-kqueue-helper.h:31: error: previous declaration of 'GKqueueFileMonitor' was here
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://gitlab.gnome.org/GNOME/glib/issues/1506
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://gitlab.gnome.org/GNOME/glib/merge_requests/291
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gio/kqueue/gkqueuefilemonitor.c.orig 2018-08-30 12:12:08.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gio/kqueue/gkqueuefilemonitor.c 2018-08-31 09:42:20.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -75,7 +75,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * To distinguish between a directory monitor and a regular file monitor, check
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * whether sub_file is NULL. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--typedef struct _GKqueueFileMonitor
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+struct _GKqueueFileMonitor
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GLocalFileMonitor parent_instance;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -85,7 +85,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GFileMonitor *fallback;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GFile *fbfile;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--} GKqueueFileMonitor;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef __clang__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 615e38b..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2-devel/files/O_CLOEXEC.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,23 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fix build on systems without O_CLOEXEC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://gitlab.gnome.org/GNOME/glib/issues/1488
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://gitlab.gnome.org/GNOME/glib/merge_requests/286
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- glib/gspawn.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ glib/gspawn.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1485,7 +1485,7 @@ do_posix_spawn (gchar **argv,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- parent_close_fds[num_parent_close_fds++] = write_null;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifndef HAVE_O_CLOEXEC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fcntl (read_null, F_SETFD, FD_CLOEXEC);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fcntl (write_null, F_SETFD, FD_CLOEXEC);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- r = posix_spawn_file_actions_adddup2 (&file_actions, write_null, 1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1509,7 +1509,7 @@ do_posix_spawn (gchar **argv,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- parent_close_fds[num_parent_close_fds++] = write_null;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifndef HAVE_O_CLOEXEC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fcntl (read_null, F_SETFD, FD_CLOEXEC);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fcntl (write_null, F_SETFD, FD_CLOEXEC);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- r = posix_spawn_file_actions_adddup2 (&file_actions, write_null, 2);
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2-devel/files/which.patch b/devel/glib2-devel/files/which.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 58eb6e9..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2-devel/files/which.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,25 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Use "command -v" instead of "which" to fix build on Tiger when gtk-doc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-is not installed.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://gitlab.gnome.org/GNOME/glib/merge_requests/277
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- autogen.sh.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ autogen.sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -7,8 +7,7 @@ test -n "$srcdir" || srcdir=.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- olddir=`pwd`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cd "$srcdir"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--GTKDOCIZE=$(which gtkdocize 2>/dev/null)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if test -z $GTKDOCIZE; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if ! command -v gtkdocize >/dev/null 2>&1; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "You don't have gtk-doc installed, and thus won't be able to generate the documentation."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rm -f gtk-doc.make
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cat > gtk-doc.make <<EOF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -19,8 +18,7 @@ else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gtkdocize || exit $?
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--AUTORECONF=`which autoreconf`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if test -z $AUTORECONF; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if ! command -v autoreconf >/dev/null 2>&1; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "*** No autoreconf found, please install it ***"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- exit 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span></pre><pre style='margin:0'>
</pre>