<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/78024419d754a2e399cd3cb4e93cb0a24f60f960">https://github.com/macports/macports-ports/commit/78024419d754a2e399cd3cb4e93cb0a24f60f960</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 7802441 glib2: Update to 2.58.3
</span>7802441 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 78024419d754a2e399cd3cb4e93cb0a24f60f960
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Wed Jan 30 10:48:11 2019 -0600
<span style='display:block; white-space:pre;color:#404040;'> glib2: Update to 2.58.3
</span>---
devel/glib2/Portfile | 8 +++----
.../patch-configure-switch-for-gappinfo-impl.diff | 28 +++++++++++-----------
devel/glib2/files/patch-gio_xdgmime_xdgmime.c.diff | 6 ++---
devel/glib2/files/patch-glib-gmain.c.diff | 6 ++---
devel/glib2/files/universal.patch | 18 +++++++-------
5 files changed, 33 insertions(+), 33 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2/Portfile b/devel/glib2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a9c6c2b..99587c9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,11 +8,11 @@ PortGroup compiler_blacklist_versions 1.0
</span> name glib2
conflicts glib2-devel
set my_name glib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.58.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.58.3
</span> revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 29102e684ab62a69cf4aad980f687c47f6356b42 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 c7b24ed6536f1a10fc9bce7994e55c427b727602e78342821f1f07fb48753d4b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 4862612
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 3fafbb1e6288ff1e8146ecd0a14547ba779406e5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 8f43c31767e88a25da72b52a40f3301fefc49a665b56dc10ee7cc9565cbe7481 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 4863648
</span>
set branch [join [lrange [split ${version} .] 0 1] .]
categories devel
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2/files/patch-configure-switch-for-gappinfo-impl.diff b/devel/glib2/files/patch-configure-switch-for-gappinfo-impl.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 5de9d64..9c04bf2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2/files/patch-configure-switch-for-gappinfo-impl.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2/files/patch-configure-switch-for-gappinfo-impl.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,9 +13,9 @@ For X11 builds of glib (our default), we want to support .desktop files.
</span>
See: https://trac.macports.org/ticket/53911
See: https://bugzilla.gnome.org/show_bug.cgi?id=781548
<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;'>+--- configure.ac.orig 2019-01-21 07:38:50.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.ac 2019-01-30 10:36:32.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1741,6 +1738,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 2019-01-21 07:38:50.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gio/Makefile.am 2019-01-30 10:36:31.000000000 -0600
</span> @@ -255,9 +255,13 @@
if OS_UNIX
platform_libadd += xdgmime/libxdgmime.la
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -64,7 +64,7 @@ See: https://bugzilla.gnome.org/show_bug.cgi?id=781548
</span>
unix_sources = \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -300,7 +304,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -303,7 +307,7 @@
</span> gunixinputstream.h \
gunixoutputstream.h \
gunixsocketaddress.h \
<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;'>+@@ -357,7 +361,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;'>+@@ -367,6 +377,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;'>+@@ -407,7 +418,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;'>+@@ -644,10 +660,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 2019-01-21 07:38:50.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gio/giomodule.c 2019-01-30 10:33:48.000000000 -0600
</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;'>+@@ -1027,7 +1028,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;'>+@@ -1168,8 +1169,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/files/patch-gio_xdgmime_xdgmime.c.diff b/devel/glib2/files/patch-gio_xdgmime_xdgmime.c.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index f17d2b5..bd44b6f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2/files/patch-gio_xdgmime_xdgmime.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2/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 2019-01-21 07:38:50.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gio/xdgmime/xdgmime.c 2019-01-30 10:33:48.000000000 -0600
</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/files/patch-glib-gmain.c.diff b/devel/glib2/files/patch-glib-gmain.c.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 33fa728..dae309a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2/files/patch-glib-gmain.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2/files/patch-glib-gmain.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,9 +1,9 @@
</span> Fix g_get_monotonic_time on non-Intel processors
https://bugzilla.gnome.org/show_bug.cgi?id=728123
https://bug728123.bugzilla-attachments.gnome.org/attachment.cgi?id=275596
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- glib/gmain.c.orig 2018-08-16 19:03:20.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ glib/gmain.c 2018-08-22 10:13:00.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2753,46 +2753,34 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- glib/gmain.c.orig 2019-01-21 07:38:50.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ glib/gmain.c 2019-01-30 10:36:31.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2759,46 +2759,34 @@
</span> g_get_monotonic_time (void)
{
static mach_timebase_info_data_t timebase_info;
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2/files/universal.patch b/devel/glib2/files/universal.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index bc895c0..7677bd0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2/files/universal.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2/files/universal.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,9 +2,9 @@ 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:#ffe0e0;'>-@@ -677,9 +677,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.ac.orig 2019-01-21 07:38:50.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.ac 2019-01-30 10:33:48.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -626,9 +626,6 @@
</span>
# check for bytesex stuff
AC_C_BIGENDIAN
<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;'>+@@ -2774,18 +2771,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;'>+@@ -2797,10 +2810,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;'>+@@ -2831,18 +2851,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;'>+@@ -2937,7 +2978,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;'>+@@ -2947,27 +2990,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;'>+@@ -3199,10 +3267,10 @@
</span> *) glib_vacopy=''
esac
</pre><pre style='margin:0'>
</pre>