<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/0d2da890b35833dcc91b81fb96d9aea24d216085">https://github.com/macports/macports-ports/commit/0d2da890b35833dcc91b81fb96d9aea24d216085</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 0d2da89 glib2-devel: Update to 2.54.1
</span>0d2da89 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 0d2da890b35833dcc91b81fb96d9aea24d216085
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Mon Oct 2 23:02:50 2017 -0500
<span style='display:block; white-space:pre;color:#404040;'> glib2-devel: Update to 2.54.1
</span>---
devel/glib2-devel/Portfile | 14 ++++++++++----
...atch-configure-switch-for-gappinfo-impl-mp.diff | 22 +++++++++++-----------
devel/glib2-devel/files/patch-configure.diff | 18 +++++++++---------
.../patch-get-launchd-dbus-session-address.diff | 4 ++--
4 files changed, 32 insertions(+), 26 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 d2fb762..8ee53b2 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.54.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.54.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,8 +28,9 @@ 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 20fcb075e92f148c5592eae26c4aa82a2447349d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 fe22998ff0394ec31e6e5511c379b74011bee61a4421bca7fcab223dfbe0fc6a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 c14a2ab435e47d706a88d4d1efb1008216107abc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 50c01b1419324f10fbf9b9709ec2164b18586968bdce7540583bf32302cf47a3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 7829104
</span>
# ${prefix}/include/glib-2.0/glib/gi18n.h requires -I${prefix}/include to find libintl.h
# See https://trac.macports.org/changeset/27148
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -74,8 +75,13 @@ configure.cflags-append -fstrict-aliasing
</span>
configure.args --enable-static --disable-libelf \
--disable-compile-warnings \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-gtk-doc \
</span> --with-pcre=system \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ac_cv_prog_AWK=/usr/bin/awk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ac_cv_prog_AWK=/usr/bin/awk \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ac_cv_prog_GTKDOC_CHECK= \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ac_cv_path_GTKDOC_CHECK_PATH= \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ac_cv_path_GTKDOC_MKPDF= \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ac_cv_path_GTKDOC_REBASE=
</span>
configure.perl /usr/bin/perl
configure.python /usr/bin/python
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2-devel/files/patch-configure-switch-for-gappinfo-impl-mp.diff b/devel/glib2-devel/files/patch-configure-switch-for-gappinfo-impl-mp.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index fea2a38..172172c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2-devel/files/patch-configure-switch-for-gappinfo-impl-mp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2-devel/files/patch-configure-switch-for-gappinfo-impl-mp.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,9 +38,9 @@ WARNING: changes to autoconf.ac will lead to the build system trying to
</span> re-generate and re-run the configure script, which will OVERWRITE
MacPorts-specific changes!
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- config.h.in.orig 2017-06-24 05:44:07.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ config.h.in 2017-06-24 05:45:52.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -713,6 +713,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- config.h.in.orig 2017-10-02 10:02:22.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ config.h.in 2017-10-02 17:24:24.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -714,6 +714,13 @@
</span> /* Use w32 threads */
#undef THREADS_WIN32
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,8 +54,8 @@ WARNING: changes to autoconf.ac will lead to the build system trying to
</span> /* Using GNU libiconv */
#undef USE_LIBICONV_GNU
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2017-06-24 05:44:06.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2017-06-24 05:45:51.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2017-10-02 18:22:29.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2017-10-02 18:22:29.000000000 -0500
</span> @@ -722,6 +722,10 @@
LIBMOUNT_CFLAGS
LIBELF_LIBS
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -84,7 +84,7 @@ WARNING: changes to autoconf.ac will lead to the build system trying to
</span> --with-threads=[posix/win32]
specify a thread implementation to use
--with-pcre=[internal/system]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -26252,6 +26259,49 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -26344,6 +26351,49 @@
</span> fi
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -134,7 +134,7 @@ WARNING: changes to autoconf.ac will lead to the build system trying to
</span> # Check whether --enable-libelf was given.
if test "${enable_libelf+set}" = set; then :
enableval=$enable_libelf;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -29698,6 +29748,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -29790,6 +29840,14 @@
</span> as_fn_error $? "conditional \"HAVE_FAM\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -149,8 +149,8 @@ WARNING: changes to autoconf.ac will lead to the build system trying to
</span> if test -z "${HAVE_LIBMOUNT_TRUE}" && test -z "${HAVE_LIBMOUNT_FALSE}"; then
as_fn_error $? "conditional \"HAVE_LIBMOUNT\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- gio/Makefile.in.orig 2017-06-24 05:44:09.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gio/Makefile.in 2017-06-24 05:45:54.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gio/Makefile.in.orig 2017-06-24 06:14:15.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gio/Makefile.in 2017-06-24 06:26:20.000000000 -0500
</span> @@ -160,55 +160,65 @@
@ENABLE_INSTALLED_TESTS_TRUE@ $(dist_installed_test_data)
@ENABLE_INSTALLED_TESTS_TRUE@am__append_13 = $(test_ltlibraries) $(installed_test_ltlibraries)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -561,8 +561,8 @@ WARNING: changes to autoconf.ac will lead to the build system trying to
</span> libgio_2_0_la-gcontenttype-win32.lo: gcontenttype-win32.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgio_2_0_la_CPPFLAGS) $(CPPFLAGS) $(libgio_2_0_la_CFLAGS) $(CFLAGS) -MT libgio_2_0_la-gcontenttype-win32.lo -MD -MP -MF $(DEPDIR)/libgio_2_0_la-gcontenttype-win32.Tpo -c -o libgio_2_0_la-gcontenttype-win32.lo `test -f 'gcontenttype-win32.c' || echo '$(srcdir)/'`gcontenttype-win32.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgio_2_0_la-gcontenttype-win32.Tpo $(DEPDIR)/libgio_2_0_la-gcontenttype-win32.Plo
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- gio/giomodule.c.orig 2017-05-31 15:16:11.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gio/giomodule.c 2017-06-24 05:44:54.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gio/giomodule.c.orig 2017-06-22 07:52:49.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gio/giomodule.c 2017-06-24 06:25:26.000000000 -0500
</span> @@ -43,12 +43,13 @@
#endif
#include <glib/gstdio.h>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2-devel/files/patch-configure.diff b/devel/glib2-devel/files/patch-configure.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 321c2a7..2464ad2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2-devel/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2-devel/files/patch-configure.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;'>---- configure.orig 2017-06-19 20:51:58.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2017-06-24 05:57:31.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -22792,9 +22792,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2017-10-02 10:02:21.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2017-10-02 18:18:23.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -22884,9 +22884,6 @@
</span> presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
esac
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,7 +10,7 @@
</span>
# check for header files
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -30770,10 +30767,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -31051,10 +31048,10 @@
</span> *) glib_vacopy=''
esac
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,7 +24,7 @@
</span>
g_have_gnuc_varargs=$g_have_gnuc_varargs
g_have_iso_c_varargs=$g_have_iso_c_varargs
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -32625,18 +32622,32 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -32710,18 +32707,32 @@
</span> cat >>$outfile <<_______EOF
#define G_HAVE_GINT64 1 /* deprecated, always true */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -64,7 +64,7 @@
</span> _______EOF
else
cat >>$outfile <<_______EOF
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -32648,10 +32659,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -32733,10 +32744,17 @@
</span>
cat >>$outfile <<_______EOF
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -86,7 +86,7 @@
</span>
_______EOF
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -32682,18 +32700,33 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -32767,18 +32785,33 @@
</span> if test -z "$glib_unknown_void_p"; then
cat >>$outfile <<_______EOF
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -129,7 +129,7 @@
</span> _______EOF
else
echo '#error SIZEOF_VOID_P unknown - This should never happen' >>$outfile
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -32788,7 +32821,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -32873,7 +32906,9 @@
</span>
if test x"$g_memory_barrier_needed" != xno; then
echo >>$outfile
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -139,7 +139,7 @@
</span> fi
if test x"$g_atomic_lock_free" = xyes; then
echo >>$outfile
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -32798,27 +32833,52 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -32883,27 +32918,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;color:#808080;'>diff --git a/devel/glib2-devel/files/patch-get-launchd-dbus-session-address.diff b/devel/glib2-devel/files/patch-get-launchd-dbus-session-address.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 80b86da..c3a7d8f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2-devel/files/patch-get-launchd-dbus-session-address.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2-devel/files/patch-get-launchd-dbus-session-address.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- gio/gdbusaddress.c.orig 2017-02-13 09:53:27.000000000 -0600
+++ gio/gdbusaddress.c 2017-03-29 21:05:12.000000000 -0500
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1511,6 +1511,103 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1514,6 +1514,103 @@
</span>
/* ---------------------------------------------------------------------------------------------------- */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -104,7 +104,7 @@
</span> static gchar *
get_session_address_platform_specific (GError **error)
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1539,7 +1636,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1542,7 +1639,12 @@
</span> * X11 autolaunching; on Windows this means a different autolaunching
* mechanism based on shared memory.
*/
</pre><pre style='margin:0'>
</pre>