<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/d1d1dc561eb35d9eb3123449338b700b11785368">https://github.com/macports/macports-ports/commit/d1d1dc561eb35d9eb3123449338b700b11785368</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 d1d1dc5 glib2: Update to 2.54.3
</span>d1d1dc5 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d1d1dc561eb35d9eb3123449338b700b11785368
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Wed Jan 17 19:41:18 2018 -0600
<span style='display:block; white-space:pre;color:#404040;'> glib2: Update to 2.54.3
</span>---
devel/glib2/Portfile | 11 ++---
devel/glib2/files/gosxapp.patch | 101 ----------------------------------------
2 files changed, 4 insertions(+), 108 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 bfbeac9..8688a44 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,8 +8,7 @@ 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.54.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.54.3
</span> set branch [join [lrange [split ${version} .] 0 1] .]
categories devel
maintainers {ryandesign @ryandesign} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,9 +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 6804848c49bc882da563d8c3e025f1e37518bbc5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 bb89e5c5aad33169a8c7f28b45671c7899c12f74caf707737f784d7102758e6c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 7830724
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 7439dbf9d661352e7f2c1beae84b76e401798675 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 963fdc6685dc3da8e5381dfb9f15ca4b5709b28be84d9d05a9bb8e446abac0a8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 7836536
</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;'>@@ -49,8 +48,6 @@ patchfiles patch-configure.diff \
</span> patch-gmodule-gmodule-dl.c.diff \
patch-configure-switch-for-gappinfo-impl-mp.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append gosxapp.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_build bin:xmllint:libxml2
depends_lib port:gettext \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2/files/gosxapp.patch b/devel/glib2/files/gosxapp.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 15da679..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2/files/gosxapp.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,101 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fix runtime crash (and build failure in C89 mode) when +quartz variant is used.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://bugzilla.gnome.org/show_bug.cgi?id=789784
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/GNOME/glib/commit/d74a69826ffc5591a7eeea61ca25f66f48fcf939
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gio/gosxappinfo.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gio/gosxappinfo.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -175,44 +175,14 @@ static gchar *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- create_cstr_from_cfstring (CFStringRef str)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const gchar *cstr;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CFIndex length = CFStringGetLength (str);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- char *buffer = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (str == NULL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cstr = CFStringGetCStringPtr (str, kCFStringEncodingUTF8);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /* CFStringGetCStringPtr returns "NULL if the internal storage of
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- * theString does not allow [a pointer] to be returned efficiently".
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- * (Apple's docs don't say what that means). In that case we must
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- * use CFStringGetCString as a fallback.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (cstr != NULL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CFRelease (str);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return g_strdup (cstr);
</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;'>-- buffer = g_malloc0 (length + 1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /* Start off with a buffer size sufficient for the most likely case
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- * that the CFString is ASCII so the UTF8 representation will be 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- * byte per code point. Keep trying up to 4 bytes per code point,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- * the max allowed by RFC3629.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- for (int i = 1; i <= 4; ++i)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (CFStringGetCString (str, buffer, length, kCFStringEncodingUTF8))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CFRelease (str);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return buffer;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- length += length;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- buffer = g_realloc (buffer, length + 1);
</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;'>-- g_free (buffer);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFRelease (str);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return g_strdup (cstr);
</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;'>- static char *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gio/gosxcontenttype.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gio/gosxcontenttype.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -53,44 +53,14 @@ static gchar *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- create_cstr_from_cfstring (CFStringRef str)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const gchar *cstr;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CFIndex length = CFStringGetLength (str);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- char *buffer = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (str == NULL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cstr = CFStringGetCStringPtr (str, kCFStringEncodingUTF8);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /* CFStringGetCStringPtr returns "NULL if the internal storage of
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- * theString does not allow [a pointer] to be returned efficiently".
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- * (Apple's docs don't say what that means). In that case we must
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- * use CFStringGetCString as a fallback.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (cstr != NULL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CFRelease (str);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return g_strdup (cstr);
</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;'>-- buffer = g_malloc0 (length + 1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /* Start off with a buffer size sufficient for the most likely case
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- * that the CFString is ASCII so the UTF8 representation will be 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- * byte per code point. Keep trying up to 4 bytes per code point,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- * the max allowed by RFC3629.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- for (int i = 1; i <= 4; ++i)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (CFStringGetCString (str, buffer, length, kCFStringEncodingUTF8))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CFRelease (str);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return buffer;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- length += length;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- buffer = g_realloc (buffer, length + 1);
</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;'>-- g_free (buffer);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFRelease (str);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return g_strdup (cstr);
</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;'>- /*< internal >
</span></pre><pre style='margin:0'>
</pre>