<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/01a408e12e1cdf2d771c2cc7067cde605d452b13">https://github.com/macports/macports-ports/commit/01a408e12e1cdf2d771c2cc7067cde605d452b13</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 01a408e12e1 vte: Fix build on 32-bit platforms
</span>01a408e12e1 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 01a408e12e1cdf2d771c2cc7067cde605d452b13
</span>Author: Evan Miller <emmiller@gmail.com>
AuthorDate: Sat Sep 25 21:22:39 2021 -0400
<span style='display:block; white-space:pre;color:#404040;'> vte: Fix build on 32-bit platforms
</span>---
gnome/vte/Portfile | 3 +-
gnome/vte/files/patch-vte-gsize.diff | 53 ++++++++++++++++++++++++++++++++++++
2 files changed, 55 insertions(+), 1 deletion(-)
<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 ac3870c0414..4ebb80dd4c4 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;'>@@ -46,7 +46,8 @@ depends_run port:adwaita-icon-theme
</span> gobject_introspection yes
patchfiles patch-src-pty.cc.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-src-vteutils.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;'>+ patch-vte-gsize.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/vte/files/patch-vte-gsize.diff b/gnome/vte/files/patch-vte-gsize.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..c043163d9ec
</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-vte-gsize.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,53 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+gsize and size_t are not the same type on 32-bit platforms.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+See: https://gitlab.gnome.org/GNOME/glib/-/issues/2493
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/vte.cc.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/vte.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1189,7 +1189,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ match_context)) >= 0 || r == PCRE2_ERROR_PARTIAL)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gsize ko = offset;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gsize rm_so, rm_eo;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gsize *ovector;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ size_t *ovector;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ovector = pcre2_get_ovector_pointer_8(match_data);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rm_so = ovector[0];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3412,7 +3412,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Convert the data to UTF-8 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ auto inbuf = (char*)buf->data;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- size_t inbytes = buf->len;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ gsize inbytes = buf->len;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _VTE_DEBUG_IF(VTE_DEBUG_IO) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _vte_debug_hexdump("Incoming buffer before conversion to UTF-8",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3422,7 +3422,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ auto unibuf = _vte_byte_array_new();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _vte_byte_array_set_minimum_size(unibuf, VTE_UTF8_BPC * inbytes);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ auto outbuf = (char*)unibuf->data;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- size_t outbytes = unibuf->len;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ gsize outbytes = unibuf->len;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool stop = false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ do {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -10653,7 +10653,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int (* match_fn) (const pcre2_code_8 *,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PCRE2_SPTR8, PCRE2_SIZE, PCRE2_SIZE, uint32_t,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pcre2_match_data_8 *, pcre2_match_context_8 *);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gsize *ovector, so, eo;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ size_t *ovector; gsize so, eo;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int r;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (_vte_regex_get_jited(m_search_regex.regex))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/vteregex.cc.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/vteregex.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -213,7 +213,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (code == nullptr) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set_gerror_from_pcre_error(errcode, error);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ g_prefix_error(error, "Failed to compile pattern to regex at offset %" G_GSIZE_FORMAT ":",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- erroffset);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (gsize)erroffset);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>