commit b20d9891483e21299a738c25c4d4ac49359c6409 Author: Danny Rawlins <monster.romster@gmail.com> Date: Fri Sep 28 20:46:36 2018 +1000 vte3: 0.50.2 -> 0.54.1 diff --git a/vte3/.footprint b/vte3/.footprint index 346ce0ee0..e6ddd0ed4 100644 --- a/vte3/.footprint +++ b/vte3/.footprint @@ -1,4 +1,6 @@ drwxr-xr-x root/root usr/ +drwxr-xr-x root/root usr/bin/ +-rwxr-xr-x root/root usr/bin/vte-2.91 drwxr-xr-x root/root usr/etc/ drwxr-xr-x root/root usr/etc/profile.d/ -rw-r--r-- root/root usr/etc/profile.d/vte.sh @@ -19,9 +21,9 @@ drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/girepository-1.0/ -rw-r--r-- root/root usr/lib/girepository-1.0/Vte-2.91.typelib -rwxr-xr-x root/root usr/lib/libvte-2.91.la -lrwxrwxrwx root/root usr/lib/libvte-2.91.so -> libvte-2.91.so.0.5000.2 -lrwxrwxrwx root/root usr/lib/libvte-2.91.so.0 -> libvte-2.91.so.0.5000.2 --rwxr-xr-x root/root usr/lib/libvte-2.91.so.0.5000.2 +lrwxrwxrwx root/root usr/lib/libvte-2.91.so -> libvte-2.91.so.0.5400.1 +lrwxrwxrwx root/root usr/lib/libvte-2.91.so.0 -> libvte-2.91.so.0.5400.1 +-rwxr-xr-x root/root usr/lib/libvte-2.91.so.0.5400.1 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/vte-2.91.pc drwxr-xr-x root/root usr/share/ diff --git a/vte3/.signature b/vte3/.signature index 8a916e877..570b33036 100644 --- a/vte3/.signature +++ b/vte3/.signature @@ -1,8 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/V5YEX87WUO0Xm5C7QyMihZttUb9YYAZn/5pk1MipBaK3YkoxBCzjQnJFO907tJcBP6NsSIv1COm5bHLKeuB2QA= -SHA256 (Pkgfile) = cd2e804445aba24a0dd8d4e17dfd385648832565cb03349ba89e1d325c3526ff -SHA256 (.footprint) = b2debc514eaa50397750caa45b88dfad49a31daa00cd7d999fd41aafde53ce08 -SHA256 (vte-0.50.2.tar.xz) = 79dd316bfaff48f2fb74d066baae0d830e1f44436796fe410a57297e5c5f09cf -SHA256 (vte3-790539.patch) = bd3aaec0ceaa47948160a016f1eaaabf783df7771932a335448a060882ec97e4 -SHA256 (vte3-pty_memory_leak.patch) = b7e57d7e5e40a75eb5f409f163adc649f1c040d4f9c0594ddc1369aea45df291 -SHA256 (vte3-790536.patch) = 9d0561dc8e8bb46b936d31b8265a42bed0d112d36a734ebe11fcff7aa9be1be4 +RWSE3ohX2g5d/fLRfyVX0iUUmUJPrKnw+2t86WBUShI7QfDXkIvZbhVuBBhNPuI9iEk7a4xQZYzURtdFnYB/cx8vxu90oOVUKg4= +SHA256 (Pkgfile) = 8deedf7a06d6dcb65abfb529900b9a0f9b2ab1bb413abf1a053076b0b09b5a58 +SHA256 (.footprint) = 068498c588730d025b647cf7378a26f4c913746fe5698430f3abf14e18263e51 +SHA256 (vte-0.54.1.tar.xz) = a724fa0543c689e30a3d0ff07e4195a86dc7c4fe57b469be97c7c87f27604e53 diff --git a/vte3/Pkgfile b/vte3/Pkgfile index 52e5c4bc6..69b54b5d1 100644 --- a/vte3/Pkgfile +++ b/vte3/Pkgfile @@ -1,31 +1,16 @@ # Description: Virtual Terminal Emulator widget for use with GTK3 # URL: https://wiki.gnome.org/action/show/Apps/Terminal/VTE # Maintainer: Danny Rawlins, crux at romster dot me -# Depends on: gnutls gtk3 libgmp libpcre2 util-linux +# Depends on: gnutls gtk3 libpcre2 util-linux name=vte3 -version=0.50.2 +version=0.54.1 release=1 -source=(https://download.gnome.org/sources/vte/${version%.*}/vte-$version.tar.xz - $name-790539.patch - $name-pty_memory_leak.patch - $name-790536.patch) +source=(https://download.gnome.org/sources/vte/${version%.*}/vte-$version.tar.xz) build() { cd vte-$version - # https://bugzilla.gnome.org/show_bug.cgi?id=790539 - # https://git.gnome.org/browse/vte/commit/?h=vte-0-50&id=1d200a63ac4e39035af35e80881aa4fdae5556c6 - patch -p1 -i $SRC/$name-790539.patch - - # pty: Fix memory leak - # https://git.gnome.org/browse/vte/commit/?h=vte-0-50&id=ddd6dc998d9842369ec20f8e83c380401a8aed02 - patch -p1 -i $SRC/$name-pty_memory_leak.patch - - # https://bugzilla.gnome.org/show_bug.cgi?id=790536 - # https://git.gnome.org/browse/vte/commit/?h=vte-0-50&id=504db1b97f684778ee52f6e280a9e734936be20f - patch -p1 -i $SRC/$name-790536.patch - ./configure \ --prefix=/usr \ --libexecdir=/usr/lib/vte \ diff --git a/vte3/vte3-790536.patch b/vte3/vte3-790536.patch deleted file mode 100644 index 097ee775f..000000000 --- a/vte3/vte3-790536.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 504db1b97f684778ee52f6e280a9e734936be20f Mon Sep 17 00:00:00 2001 -From: Egmont Koblinger <egmont@gmail.com> -Date: Sat, 18 Nov 2017 20:50:06 +0100 -Subject: widget: Reset might need to start blinking the cursor - -https://bugzilla.gnome.org/show_bug.cgi?id=790536 -(cherry picked from commit f6678e7e938aaf6f4fd72ceb8f1bb71b2bf3e69e) ---- - src/vte.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/vte.cc b/src/vte.cc -index 6f28670..a9f73e2 100644 ---- a/src/vte.cc -+++ b/src/vte.cc -@@ -10349,7 +10349,7 @@ VteTerminalPrivate::reset(bool clear_tabstops, - adjust_adjustments_full(); - } - /* DECSCUSR cursor style */ -- m_cursor_style = VTE_CURSOR_STYLE_TERMINAL_DEFAULT; -+ set_cursor_style(VTE_CURSOR_STYLE_TERMINAL_DEFAULT); - /* Do more stuff we refer to as a "full" reset. */ - if (clear_tabstops) { - set_default_tabstops(); --- -cgit v0.12 - diff --git a/vte3/vte3-790539.patch b/vte3/vte3-790539.patch deleted file mode 100644 index ebcfa0f8a..000000000 --- a/vte3/vte3-790539.patch +++ /dev/null @@ -1,91 +0,0 @@ -From 1d200a63ac4e39035af35e80881aa4fdae5556c6 Mon Sep 17 00:00:00 2001 -From: Christian Persch <chpe@src.gnome.org> -Date: Sat, 18 Nov 2017 18:40:03 +0100 -Subject: matcher: Fix memory leak - -Don't leak the GValueArray. - -https://bugzilla.gnome.org/show_bug.cgi?id=790539 -(cherry picked from commit dda73cc07250ea324b4227907197c39b93fcd365) ---- - src/matcher.cc | 12 +++++++----- - src/table.cc | 19 +++++++++++-------- - 2 files changed, 18 insertions(+), 13 deletions(-) - -diff --git a/src/matcher.cc b/src/matcher.cc -index 10f3bc7..a4f7584 100644 ---- a/src/matcher.cc -+++ b/src/matcher.cc -@@ -202,14 +202,16 @@ _vte_matcher_print(struct _vte_matcher *matcher) - * we need to free those ourselves. */ - void - _vte_matcher_free_params_array(struct _vte_matcher *matcher, -- GValueArray *params) -+ GValueArray *params) - { - guint i; - for (i = 0; i < params->n_values; i++) { -- GValue *value = ¶ms->values[i]; -- if (G_UNLIKELY (g_type_is_a (value->g_type, G_TYPE_POINTER))) { -- g_free (g_value_get_pointer (value)); -- } -+ auto value = g_value_array_get_nth(params, i); -+ if (G_UNLIKELY (G_VALUE_HOLDS_POINTER(value))) { -+ g_free(g_value_get_pointer(value)); -+ } else if (G_UNLIKELY (G_VALUE_HOLDS_BOXED(value))) { -+ g_value_array_free((GValueArray*)g_value_get_boxed(value)); -+ } - } - if (G_UNLIKELY (matcher == NULL || matcher->free_params != NULL)) { - g_value_array_free (params); -diff --git a/src/table.cc b/src/table.cc -index 3c78f3a..09a6172 100644 ---- a/src/table.cc -+++ b/src/table.cc -@@ -516,18 +516,14 @@ static void - _vte_table_extract_numbers(GValueArray **array, - struct _vte_table_arginfo *arginfo) - { -- GValue value = {0,}; -- GValue subvalue = {0,}; -- GValueArray *subarray = NULL; -- gssize i; -- - if (G_UNLIKELY (*array == NULL)) { - *array = g_value_array_new(1); - } - -+ GValue value = {0,}; - g_value_init(&value, G_TYPE_LONG); -- g_value_init(&subvalue, G_TYPE_VALUE_ARRAY); -- i = 0; -+ gssize i = 0; -+ GValueArray *subarray = nullptr; - do { - long total = 0; - for (; i < arginfo->length && arginfo->start[i] != ';' && arginfo->start[i] != ':'; i++) { -@@ -546,13 +542,20 @@ _vte_table_extract_numbers(GValueArray **array, - g_value_array_append(*array, &value); - } else { - g_value_array_append(subarray, &value); -- g_value_set_boxed(&subvalue, subarray); -+ -+ GValue subvalue = {0,}; -+ g_value_init(&subvalue, G_TYPE_VALUE_ARRAY); -+ g_value_take_boxed(&subvalue, subarray); - g_value_array_append(*array, &subvalue); -+ g_value_unset(&subvalue); -+ - subarray = NULL; - } - } - } while (i++ < arginfo->length); - g_value_unset(&value); -+ if (subarray != nullptr) -+ g_value_array_free(subarray); - } - - static void --- -cgit v0.12 - diff --git a/vte3/vte3-pty_memory_leak.patch b/vte3/vte3-pty_memory_leak.patch deleted file mode 100644 index e82ec89ee..000000000 --- a/vte3/vte3-pty_memory_leak.patch +++ /dev/null @@ -1,25 +0,0 @@ -From ddd6dc998d9842369ec20f8e83c380401a8aed02 Mon Sep 17 00:00:00 2001 -From: Christian Persch <chpe@src.gnome.org> -Date: Sat, 18 Nov 2017 19:10:10 +0100 -Subject: pty: Fix mem leak - -(cherry picked from commit 304e29d8a603828f42410ceac39ad803fcac475b) ---- - src/pty.cc | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/pty.cc b/src/pty.cc -index c1741d2..0c0b001 100644 ---- a/src/pty.cc -+++ b/src/pty.cc -@@ -1200,5 +1200,7 @@ vte_pty_spawn_finish(VtePty *pty, - *child_pid = *(GPid*)pidptr; - if (error) - *error = nullptr; -+ -+ g_free(pidptr); - return TRUE; - } --- -cgit v0.12 -