<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/784cc98b3b2be4ea2a47962c64d66508cd282bf5">https://github.com/macports/macports-ports/commit/784cc98b3b2be4ea2a47962c64d66508cd282bf5</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 784cc98 glib2-devel: Update to 2.57.1
</span>784cc98 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 784cc98b3b2be4ea2a47962c64d66508cd282bf5
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Fri May 25 22:20:08 2018 -0500
<span style='display:block; white-space:pre;color:#404040;'> glib2-devel: Update to 2.57.1
</span>---
devel/glib2-devel/Portfile | 11 ++++-----
.../files/gcocoanotificationbackend.patch | 18 --------------
.../patch-configure-switch-for-gappinfo-impl.diff | 28 +++++++++++-----------
.../files/patch-gio_xdgmime_xdgmime.c.diff | 6 ++---
devel/glib2-devel/files/universal.patch | 16 ++++++-------
5 files changed, 30 insertions(+), 49 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 f2a63fa..085d690 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,7 +8,7 @@ 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.56.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.57.1
</span> set branch [join [lrange [split ${version} .] 0 1] .]
categories devel
maintainers {ryandesign @ryandesign} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,12 +28,11 @@ long_description Glib is a library which includes support routines \
</span>
master_sites gnome:sources/${my_name}/${branch}/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 da4e45bf52d28b610a71bed8b4331bfb0b5c8d56 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 40ef3f44f2c651c7a31aedee44259809b6f03d3d20be44545cd7d177221c0b8d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 8028716
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 1f60b8a19634a65b6e81275797d9fe4b50d82b13 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 d029e7c4536835f1f103472f7510332c28d58b9b7d6cd0e9f45c2653e670d9b4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 6976232
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles gcocoanotificationbackend.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libintl.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles libintl.patch \
</span> patch-glib-gmain.c.diff \
patch-glib_gunicollate.c.diff \
patch-gio_xdgmime_xdgmime.c.diff \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2-devel/files/gcocoanotificationbackend.patch b/devel/glib2-devel/files/gcocoanotificationbackend.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 27dfef9..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2-devel/files/gcocoanotificationbackend.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,18 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Don't try to compile gcocoanotificationbackend.c on OS X < 10.9 which
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-doesn't support it.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://bugzilla.gnome.org/show_bug.cgi?id=794380
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gio/Makefile.am.orig 2018-03-12 11:23:37.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gio/Makefile.am 2018-03-15 14:27:31.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -612,8 +612,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gnextstepsettingsbackend.c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gosxcontenttype.c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gosxappinfo.c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gosxappinfo.h \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gosxappinfo.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if MAC_OS_X_9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+libgio_objc_2_0_la_SOURCES += \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gcocoanotificationbackend.c
</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;'>- noinst_LTLIBRARIES += libgio-objc-2.0.la
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libgio_2_0_la_LIBADD += libgio-objc-2.0.la
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2-devel/files/patch-configure-switch-for-gappinfo-impl.diff b/devel/glib2-devel/files/patch-configure-switch-for-gappinfo-impl.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 5de9d64..9e2c4ff 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2-devel/files/patch-configure-switch-for-gappinfo-impl.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2-devel/files/patch-configure-switch-for-gappinfo-impl.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,10 +12,10 @@ shared library at build time.
</span> For X11 builds of glib (our default), we want to support .desktop files.
See: https://trac.macports.org/ticket/53911
<span style='display:block; white-space:pre;background:#ffe0e0;'>-See: https://bugzilla.gnome.org/show_bug.cgi?id=781548
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.ac.orig 2018-03-12 15:49:26.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.ac 2018-03-15 16:22:00.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1803,6 +1803,31 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+See: https://gitlab.gnome.org/GNOME/glib/issues/1263
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.ac.orig 2018-05-22 16:21:16.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.ac 2018-05-25 22:12:08.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1818,6 +1818,31 @@
</span> ])
AC_SUBST(XATTR_LIBS)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,8 +47,8 @@ See: https://bugzilla.gnome.org/show_bug.cgi?id=781548
</span> dnl ************************
dnl *** check for libelf ***
dnl ************************
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- gio/Makefile.am.orig 2018-03-16 05:24:56.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gio/Makefile.am 2018-03-18 20:20:48.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gio/Makefile.am.orig 2018-05-22 16:21:16.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gio/Makefile.am 2018-05-25 22:07:09.000000000 -0500
</span> @@ -255,9 +255,13 @@
if OS_UNIX
platform_libadd += xdgmime/libxdgmime.la
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -73,7 +73,7 @@ See: https://bugzilla.gnome.org/show_bug.cgi?id=781548
</span> $(NULL)
if HAVE_NETLINK
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -348,7 +352,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -349,7 +353,13 @@
</span> win32/gwin32filemonitor.c
if OS_WIN32
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -88,7 +88,7 @@ See: https://bugzilla.gnome.org/show_bug.cgi?id=781548
</span> contenttype_sources += gcontenttype-win32.c
platform_libadd += -lshlwapi -lws2_32 -ldnsapi -liphlpapi
win32_sources = $(win32_actual_sources)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -357,6 +367,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -358,6 +368,7 @@
</span> giowin32include_HEADERS = \
gwin32inputstream.h \
gwin32outputstream.h \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -96,7 +96,7 @@ See: https://bugzilla.gnome.org/show_bug.cgi?id=781548
</span> $(NULL)
endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -396,7 +407,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -397,7 +408,12 @@
</span> $(NULL)
if OS_UNIX
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -110,7 +110,7 @@ See: https://bugzilla.gnome.org/show_bug.cgi?id=781548
</span> contenttype_sources += gcontenttype.c
appinfo_sources += gdesktopappinfo.c
endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -609,10 +625,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -610,10 +626,12 @@
</span> libgio_objc_2_0_la_CPPFLAGS = $(libgio_2_0_la_CPPFLAGS)
libgio_objc_2_0_la_LDFLAGS = $(libgio_2_0_la_LDFLAGS) -Wl,-framework,Foundation -Wl,-framework,AppKit
libgio_objc_2_0_la_SOURCES = \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -126,8 +126,8 @@ See: https://bugzilla.gnome.org/show_bug.cgi?id=781548
</span> if MAC_OS_X_9
libgio_objc_2_0_la_SOURCES += \
gcocoanotificationbackend.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- gio/giomodule.c.orig 2018-01-22 14:28:02.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gio/giomodule.c 2018-02-16 05:55:21.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gio/giomodule.c.orig 2018-05-02 07:30:40.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gio/giomodule.c 2018-05-25 22:07:09.000000000 -0500
</span> @@ -43,12 +43,13 @@
#endif
#include <glib/gstdio.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -145,7 +145,7 @@ See: https://bugzilla.gnome.org/show_bug.cgi?id=781548
</span>
#ifdef HAVE_COCOA
#include <AvailabilityMacros.h>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1011,7 +1012,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1012,7 +1013,7 @@
</span> {
registered_extensions = TRUE;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -154,7 +154,7 @@ See: https://bugzilla.gnome.org/show_bug.cgi?id=781548
</span> #if !GLIB_CHECK_VERSION (3, 0, 0)
ep = g_io_extension_point_register (G_DESKTOP_APP_INFO_LOOKUP_EXTENSION_POINT_NAME);
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1152,8 +1153,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1153,8 +1154,10 @@
</span> #endif
#ifdef HAVE_COCOA
g_type_ensure (g_nextstep_settings_backend_get_type ());
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2-devel/files/patch-gio_xdgmime_xdgmime.c.diff b/devel/glib2-devel/files/patch-gio_xdgmime_xdgmime.c.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index f17d2b5..c2a51ad 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2-devel/files/patch-gio_xdgmime_xdgmime.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2-devel/files/patch-gio_xdgmime_xdgmime.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gio/xdgmime/xdgmime.c.orig 2018-03-12 11:23:37.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gio/xdgmime/xdgmime.c 2018-03-24 00:51:20.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -253,7 +253,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gio/xdgmime/xdgmime.c.orig 2018-05-22 06:42:46.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gio/xdgmime/xdgmime.c 2018-05-25 22:07:10.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -255,7 +255,7 @@
</span>
xdg_data_dirs = getenv ("XDG_DATA_DIRS");
if (xdg_data_dirs == NULL)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2-devel/files/universal.patch b/devel/glib2-devel/files/universal.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index bc895c0..b88b053 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2-devel/files/universal.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2-devel/files/universal.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,8 +2,8 @@ Allow universal builds. This is only part of the solution; the config.h.ed
</span> script is the other part. If new variables appear in the configure script
that are affected by endianness or bitness, remember to handle them both
here and in config.h.ed.
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.ac.orig 2018-03-12 15:49:26.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.ac 2018-03-18 21:25:46.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.ac.orig 2018-05-22 16:21:16.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.ac 2018-05-25 22:13:02.000000000 -0500
</span> @@ -677,9 +677,6 @@
# check for bytesex stuff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,7 +14,7 @@ here and in config.h.ed.
</span>
# check for header files
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2812,18 +2809,34 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2861,18 +2858,34 @@
</span> cat >>$outfile <<_______EOF
#define G_HAVE_GINT64 1 /* deprecated, always true */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -56,7 +56,7 @@ here and in config.h.ed.
</span> _______EOF
else
cat >>$outfile <<_______EOF
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2835,10 +2848,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2884,10 +2897,17 @@
</span>
cat >>$outfile <<_______EOF
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -78,7 +78,7 @@ here and in config.h.ed.
</span>
_______EOF
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2869,18 +2889,39 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2918,18 +2938,39 @@
</span> if test -z "$glib_unknown_void_p"; then
cat >>$outfile <<_______EOF
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -127,7 +127,7 @@ here and in config.h.ed.
</span> _______EOF
else
echo '#error SIZEOF_VOID_P unknown - This should never happen' >>$outfile
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2975,7 +3016,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3024,7 +3065,9 @@
</span>
if test x"$g_memory_barrier_needed" != xno; then
echo >>$outfile
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -137,7 +137,7 @@ here and in config.h.ed.
</span> fi
if test x"$g_atomic_lock_free" = xyes; then
echo >>$outfile
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2985,27 +3028,52 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3034,27 +3077,52 @@
</span> g_bit_sizes="16 32 64"
for bits in $g_bit_sizes; do
cat >>$outfile <<_______EOF
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -203,7 +203,7 @@ here and in config.h.ed.
</span>
#define GLIB_SYSDEF_POLLIN =$g_pollin
#define GLIB_SYSDEF_POLLOUT =$g_pollout
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3246,10 +3314,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3295,10 +3363,10 @@
</span> *) glib_vacopy=''
esac
</pre><pre style='margin:0'>
</pre>