<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/cef5a87934508fda828f4335604d91caca75b539">https://github.com/macports/macports-ports/commit/cef5a87934508fda828f4335604d91caca75b539</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 cef5a87 glib2, glib2-devel: Remove gi18n.h patch
</span>cef5a87 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit cef5a87934508fda828f4335604d91caca75b539
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Wed Jan 31 17:30:26 2018 -0600
<span style='display:block; white-space:pre;color:#404040;'> glib2, glib2-devel: Remove gi18n.h patch
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The problem this patch was working around (popt.h defining N_; see
</span><span style='display:block; white-space:pre;color:#404040;'> f0206ffaa5dbeee26a9fc28f13878d3e2931d457) was fixed in popt 1.13 10 years ago.
</span>---
devel/glib2-devel/Portfile | 2 +-
devel/glib2-devel/files/patch-gi18n.h.diff | 12 ------------
devel/glib2/Portfile | 2 +-
devel/glib2/files/patch-gi18n.h.diff | 12 ------------
4 files changed, 2 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 d8ece36..8ece3bb 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;'>@@ -9,6 +9,7 @@ name glib2-devel
</span> conflicts glib2
set my_name glib
version 2.55.1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 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;'>@@ -41,7 +42,6 @@ patchfiles patch-configure.diff \
</span> patch-glib-2.0.pc.in.diff \
patch-glib-gmain.c.diff \
patch-glib_gunicollate.c.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-gi18n.h.diff \
</span> patch-gio_xdgmime_xdgmime.c.diff \
patch-gio_gdbusprivate.c.diff \
patch-get-launchd-dbus-session-address.diff \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2-devel/files/patch-gi18n.h.diff b/devel/glib2-devel/files/patch-gi18n.h.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 3b8999b..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2-devel/files/patch-gi18n.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,12 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- glib/gi18n.h.orig 2014-12-19 15:49:48.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ glib/gi18n.h 2016-08-18 03:30:23.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -25,7 +25,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define _(String) gettext (String)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define Q_(String) g_dpgettext (NULL, String, 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef N_
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define N_(String) (String)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define C_(Context,String) g_dpgettext (NULL, Context "\004" String, strlen (Context) + 1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define NC_(Context, String) (String)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><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 8688a44..9b33899 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;'>@@ -9,6 +9,7 @@ name glib2
</span> conflicts glib2-devel
set my_name glib
version 2.54.3
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 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;'>@@ -41,7 +42,6 @@ patchfiles patch-configure.diff \
</span> patch-glib-2.0.pc.in.diff \
patch-glib-gmain.c.diff \
patch-glib_gunicollate.c.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-gi18n.h.diff \
</span> patch-gio_xdgmime_xdgmime.c.diff \
patch-gio_gdbusprivate.c.diff \
patch-get-launchd-dbus-session-address.diff \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2/files/patch-gi18n.h.diff b/devel/glib2/files/patch-gi18n.h.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 3b8999b..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2/files/patch-gi18n.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,12 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- glib/gi18n.h.orig 2014-12-19 15:49:48.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ glib/gi18n.h 2016-08-18 03:30:23.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -25,7 +25,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define _(String) gettext (String)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define Q_(String) g_dpgettext (NULL, String, 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef N_
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define N_(String) (String)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define C_(Context,String) g_dpgettext (NULL, Context "\004" String, strlen (Context) + 1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define NC_(Context, String) (String)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>