<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/982efe3ec7541df70b33e03298d8d85cf18846c1">https://github.com/macports/macports-ports/commit/982efe3ec7541df70b33e03298d8d85cf18846c1</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 982efe3ec7541df70b33e03298d8d85cf18846c1
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Sat Aug 15 00:06:22 2020 -0700
<span style='display:block; white-space:pre;color:#404040;'> vte: update to version 0.58.4
</span>---
gnome/vte/Portfile | 25 ++++++++++---------------
gnome/vte/files/patch-app-vala.diff | 10 ----------
gnome/vte/files/patch-src-vteutils.cc.diff | 13 +++++++++++++
gnome/vte/files/patch-strchrnul.diff | 25 -------------------------
4 files changed, 23 insertions(+), 50 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/vte/Portfile b/gnome/vte/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 11c3b4199ad..3cbd96638fb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/vte/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/vte/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,8 +5,8 @@ PortGroup gobject_introspection 1.0
</span> PortGroup compiler_blacklist_versions 1.0
name vte
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 0.52.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 0.56.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> set branch [join [lrange [split $version .] 0 1] .]
maintainers {devans @dbevans} openmaintainer
categories gnome
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,9 +24,9 @@ master_sites gnome:sources/$name/$branch/
</span>
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 3707a2a4a0ca7bbc562dbf2d570e7e4a4a15afef \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 0f2657cef52accbfe56feede553155552d7c1984b1291838af3cb8cfc19b26af \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1011696
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 6ba070a2f6d4d67f11aa1dbbc74d274b4db9419f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 8bb06176e2a921491509f529e99853c68face1a3d70cc8862cf9203015a5118f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1100952
</span>
depends_build port:pkgconfig \
port:intltool \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,24 +43,19 @@ depends_lib port:gtk3 \
</span>
depends_run port:adwaita-icon-theme
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-src-pty.cc.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-strchrnul.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-app-vala.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> gobject_introspection yes
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-src-pty.cc.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-src-vteutils.cc.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # reconfigure using upstream autogen.sh for intltool 0.51 compatibility
post-patch {
xinstall -m 755 ${filespath}/autogen.sh ${worksrcpath}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# uses C++11 bracketed initialization which requires clang 7.0.0 or better
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# app.cc:309:31: error: no viable conversion from 'const GdkRGBA' (aka 'const _GdkRGBA') to 'gdouble' (aka 'double')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# GdkRGBA color{bg_color};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# ^~~~~~~~
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.cxx_standard 2011
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist *gcc-3.* *gcc-4.* {clang < 700}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# requires C++17
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard 2017
</span>
if {[vercmp $xcodeversion 4.3] < 0 && [string match "*macports*" ${configure.compiler}]} {
# Xcode 4.2 fails with load commands in the newer toolchain
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/vte/files/patch-app-vala.diff b/gnome/vte/files/patch-app-vala.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 2048aea7bea..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/vte/files/patch-app-vala.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- bindings/vala/app.vala.orig 2018-05-21 15:30:33.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ bindings/vala/app.vala 2020-03-02 16:55:42.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -819,6 +819,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- public struct Options
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public int dummy;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- public static bool audible = false;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- public static string? command = null;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- private static string? cjk_ambiguous_width_string = null;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/vte/files/patch-src-vteutils.cc.diff b/gnome/vte/files/patch-src-vteutils.cc.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..b5599b9788e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/vte/files/patch-src-vteutils.cc.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/vteutils.cc.orig 2020-08-15 00:24:24.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/vteutils.cc 2020-08-15 00:27:54.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -41,6 +41,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif /* __linux__ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef O_CLOEXEC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define O_CLOEXEC 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _vte_mkstemp (void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/vte/files/patch-strchrnul.diff b/gnome/vte/files/patch-strchrnul.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index fb9f9dfe109..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/vte/files/patch-strchrnul.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,25 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/vteseq.cc.orig 2017-09-12 16:11:05.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/vteseq.cc 2017-09-12 16:23:57.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -26,6 +26,22 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <sys/syslimits.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* As of Sierra, Mac OS X, macOS does not provide strchrnul() */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* Find the first occurrence of C in S or the final NUL byte. */
</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;'>-+strchrnul (const char *s, int c_in)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ char c = c_in;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ while (*s && (*s != c))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ s++;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return (char *) s;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <glib.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <vte/vte.h>
</span></pre><pre style='margin:0'>
</pre>