<pre style='margin:0'>
David B. Evans (dbevans) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/efcccd3cb36fc52b4fc359a49547cf973363c562">https://github.com/macports/macports-ports/commit/efcccd3cb36fc52b4fc359a49547cf973363c562</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit efcccd3cb36fc52b4fc359a49547cf973363c562
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Wed Sep 13 15:02:13 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> gnome-terminal: update to version 3.26.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Patch to provide private copy of strchrnul(), not provided
</span><span style='display:block; white-space:pre;color:#404040;'> by Apple platforms as of macOS Sierra.
</span>---
gnome/gnome-terminal/Portfile | 9 ++++----
.../files/patch-src-terminal-screen.c.diff | 2 +-
gnome/gnome-terminal/files/patch-strchrnul.diff | 25 ++++++++++++++++++++++
3 files changed, 31 insertions(+), 5 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gnome-terminal/Portfile b/gnome/gnome-terminal/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index df25f20..0fa5cda 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gnome-terminal/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gnome-terminal/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup compiler_blacklist_versions 1.0
name gnome-terminal
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.24.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.26.0
</span> set branch [join [lrange [split ${version} .] 0 1] .]
description Terminal component for the GNOME 3 Desktop
long_description ${description}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,8 +17,8 @@ master_sites gnome:sources/${name}/${branch}/
</span>
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 659370a7925201ef157a398b60ac03b9b6a5a62f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 281edac30a07ca45beaaaf0a13fe2219cf8b87ece5e55dccbfc49ef769dfec0f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 e072a6d6e0d4af2c3b539b693c43f11ddaa9563c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 94c8d9e85b042160a0487af10f2002e1068f49805356b714a410766d74bc4e77
</span>
depends_build port:pkgconfig \
port:intltool \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -46,7 +46,8 @@ depends_run port:gnome-themes-standard \
</span>
patchfiles patch-src-Makefile.am.diff \
patch-src-terminal-screen.c.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-src-server.c.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-src-server.c.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-strchrnul.diff
</span>
# reconfigure using upstream autogen.sh for intltool 0.51 compatibility
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gnome-terminal/files/patch-src-terminal-screen.c.diff b/gnome/gnome-terminal/files/patch-src-terminal-screen.c.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 1b2876c..75723c8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gnome-terminal/files/patch-src-terminal-screen.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gnome-terminal/files/patch-src-terminal-screen.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- src/terminal-screen.c.orig 2016-08-09 12:37:41.000000000 -0700
+++ src/terminal-screen.c 2016-08-19 22:31:43.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1307,7 +1307,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1311,7 +1311,12 @@
</span> for (j = 0; j < n_fds; j++) {
if (fds[j] == target_fd) {
do {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gnome-terminal/files/patch-strchrnul.diff b/gnome/gnome-terminal/files/patch-strchrnul.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..0fd6a1b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gnome-terminal/files/patch-strchrnul.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,25 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/terminal-util.c.orig 2017-09-13 13:44:09.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/terminal-util.c 2017-09-13 13:46:36.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -30,6 +30,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <langinfo.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <errno.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* As of Sierra, Mac OS X, macOS does not provide strchrnul() */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* Find the first occurrence of C in S or the final NUL byte. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static char *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++strchrnul (const char *s, int c_in)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ char c = c_in;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ while (*s && (*s != c))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ s++;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return (char *) s;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <glib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <glib/gi18n.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>