<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/90137660bc16e2462271a585242017b3efc04f25">https://github.com/macports/macports-ports/commit/90137660bc16e2462271a585242017b3efc04f25</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 90137660bc1 vte: update to 0.70.2
</span>90137660bc1 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 90137660bc16e2462271a585242017b3efc04f25
</span>Author: Filippe LeMarchand <gasinvein@gmail.com>
AuthorDate: Mon Jan 23 01:01:39 2023 +0200
<span style='display:block; white-space:pre;color:#404040;'> vte: update to 0.70.2
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * update to version 0.70.2
</span><span style='display:block; white-space:pre;color:#404040;'> * switch to meson build system
</span><span style='display:block; white-space:pre;color:#404040;'> * drop patches
</span>---
gnome/vte/Portfile | 38 ++++++++-------------
gnome/vte/files/autogen.sh | 16 ---------
gnome/vte/files/patch-src-pty.cc.diff | 14 --------
gnome/vte/files/patch-src-vteutils.cc.diff | 13 --------
gnome/vte/files/patch-vte-gsize.diff | 53 ------------------------------
5 files changed, 13 insertions(+), 121 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 4dc7a6fc378..d92ddf7a2aa 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;'>@@ -1,12 +1,11 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup gobject_introspection 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup compiler_blacklist_versions 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup meson 1.0
</span>
name vte
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 0.56.4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 0.70.2
</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 +23,9 @@ master_sites gnome:sources/$name/$branch/
</span>
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 6ba070a2f6d4d67f11aa1dbbc74d274b4db9419f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 8bb06176e2a921491509f529e99853c68face1a3d70cc8862cf9203015a5118f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1100952
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 9eb4db09fb0be0bb483e27b22c79827f6fa5b20b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 4d15b4380de3f564d57eabd006389c407c705df5b0c70030fdcc24971a334d80 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 898596
</span>
depends_build port:pkgconfig \
port:intltool \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,18 +42,6 @@ depends_lib path:lib/pkgconfig/gtk+-3.0.pc:gtk3 \
</span>
depends_run port:adwaita-icon-theme
<span style='display:block; white-space:pre;background:#ffe0e0;'>-gobject_introspection yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><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-src-vteutils.cc.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-vte-gsize.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# reconfigure using upstream autogen.sh for intltool 0.51 compatibility
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 ${filespath}/autogen.sh ${worksrcpath}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # requires C++17
compiler.cxx_standard 2017
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,17 +54,18 @@ if {[vercmp $xcodeversion 4.3] < 0 && [string match "*macports*" ${configure.com
</span> RANLIB=${prefix}/bin/ranlib
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cmd ./autogen.sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --disable-Bsymbolic \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-silent-rules \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-vala=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args -Dgir=true \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dvapi=true \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dgtk3=true \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dgtk4=false \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dglade=false \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -D_b_symbolic_functions=false
</span>
configure.cflags-append -fstrict-aliasing
variant glade description {Enable building of glade catalog items} {
depends_lib-append port:glade
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-glade-catalogue
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -Dglade=false -Dglade=true
</span> }
# glade expects catalog modules and libraries to have a .so suffix
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/vte/files/autogen.sh b/gnome/vte/files/autogen.sh
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 5d1cf39ce9c..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/vte/files/autogen.sh
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,16 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#!/bin/sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Run this to generate all the initial makefiles, etc.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set -e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-srcdir=`dirname $0`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-test -z "$srcdir" && srcdir=.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-cd "$srcdir"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-mkdir -p m4 >/dev/null 2>&1 || true
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-gtkdocize --copy --flavour no-tmpl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-intltoolize --force --copy
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-autoreconf --verbose --force --install
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-cd -
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-test -n "$NOCONFIGURE" || "$srcdir/configure" "$@"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/vte/files/patch-src-pty.cc.diff b/gnome/vte/files/patch-src-pty.cc.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index e2a8e281ab5..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/vte/files/patch-src-pty.cc.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/pty.cc.orig 2016-01-30 10:31:41.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/pty.cc 2016-01-30 10:33:32.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -60,6 +60,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef HAVE_PTY_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <pty.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;'>-+#ifndef O_CLOEXEC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define O_CLOEXEC 0
</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;'>- #if defined(__sun) && defined(HAVE_STROPTS_H)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stropts.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index b5599b9788e..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/vte/files/patch-src-vteutils.cc.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/vteutils.cc.orig 2020-08-15 00:24:24.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/vteutils.cc 2020-08-15 00:27:54.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -41,6 +41,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif /* __linux__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef O_CLOEXEC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define O_CLOEXEC 0
</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;'>- int
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _vte_mkstemp (void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/vte/files/patch-vte-gsize.diff b/gnome/vte/files/patch-vte-gsize.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index c043163d9ec..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/vte/files/patch-vte-gsize.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,53 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-gsize and size_t are not the same type on 32-bit platforms.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-See: https://gitlab.gnome.org/GNOME/glib/-/issues/2493
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/vte.cc.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/vte.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1189,7 +1189,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- match_context)) >= 0 || r == PCRE2_ERROR_PARTIAL)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gsize ko = offset;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gsize rm_so, rm_eo;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gsize *ovector;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ size_t *ovector;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ovector = pcre2_get_ovector_pointer_8(match_data);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rm_so = ovector[0];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3412,7 +3412,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Convert the data to UTF-8 */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- auto inbuf = (char*)buf->data;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- size_t inbytes = buf->len;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gsize inbytes = buf->len;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _VTE_DEBUG_IF(VTE_DEBUG_IO) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _vte_debug_hexdump("Incoming buffer before conversion to UTF-8",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3422,7 +3422,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- auto unibuf = _vte_byte_array_new();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _vte_byte_array_set_minimum_size(unibuf, VTE_UTF8_BPC * inbytes);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- auto outbuf = (char*)unibuf->data;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- size_t outbytes = unibuf->len;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gsize outbytes = unibuf->len;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool stop = false;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- do {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -10653,7 +10653,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int (* match_fn) (const pcre2_code_8 *,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PCRE2_SPTR8, PCRE2_SIZE, PCRE2_SIZE, uint32_t,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pcre2_match_data_8 *, pcre2_match_context_8 *);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gsize *ovector, so, eo;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ size_t *ovector; gsize so, eo;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int r;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (_vte_regex_get_jited(m_search_regex.regex))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/vteregex.cc.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/vteregex.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -213,7 +213,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (code == nullptr) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set_gerror_from_pcre_error(errcode, error);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- g_prefix_error(error, "Failed to compile pattern to regex at offset %" G_GSIZE_FORMAT ":",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- erroffset);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (gsize)erroffset);
</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;'>-
</span></pre><pre style='margin:0'>
</pre>