Hello community, here is the log from the commit of package vte for openSUSE:Factory checked in at 2017-12-15 14:00:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vte (Old) and /work/SRC/openSUSE:Factory/.vte.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vte" Fri Dec 15 14:00:33 2017 rev:106 rq:556464 version:0.50.2 Changes: -------- --- /work/SRC/openSUSE:Factory/vte/vte.changes 2017-11-03 19:06:35.823005827 +0100 +++ /work/SRC/openSUSE:Factory/.vte.new/vte.changes 2017-12-15 14:00:39.174323839 +0100 @@ -1,0 +2,15 @@ +Sat Dec 9 20:22:36 UTC 2017 - [email protected] + +- Add vte-fix-memory-leaks.patch: Fix memory leaks (bgo#790539). +- Add + vte-widget-reset-might-need-to-start-blinking-the-cursor.patch: + widget: Reset might need to start blinking the cursor + (bgo#790536). +- Drop gnome-pty-helper Obsoletes: Not present in any currently + supported opensuse release. +- Modernize spec, run spec-cleaner, switch to to autosetup, + make_build and make_install macros. +- No longer export fPIE/pie SUID_CFLAGS/SUID_LDFLAGS, not needed + anymore. + +------------------------------------------------------------------- New: ---- vte-fix-memory-leaks.patch vte-widget-reset-might-need-to-start-blinking-the-cursor.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vte.spec ++++++ --- /var/tmp/diff_new_pack.MadTKf/_old 2017-12-15 14:00:39.938286959 +0100 +++ /var/tmp/diff_new_pack.MadTKf/_new 2017-12-15 14:00:39.938286959 +0100 @@ -27,13 +27,20 @@ Version: 0.50.2 Release: 0 Summary: Terminal Emulator Library +License: LGPL-2.0 AND GPL-2.0+ +Group: Development/Libraries/GNOME + # Switched to sourceservice, as upstream have a tendency to not release tarballs on time. #Source: http://download.gnome.org/sources/vte/0.45/%%{_name}-%%{version}.tar.xz -License: LGPL-2.0 and GPL-2.0+ -Group: Development/Libraries/GNOME Source: %{_name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM vte-fix-memory-leaks.patch bgo#790539 [email protected] -- Fix memory leaks +Patch0: vte-fix-memory-leaks.patch +# PATCH-FIX-UPSTREAM vte-widget-reset-might-need-to-start-blinking-the-cursor.patch bgo#790536 [email protected] -- widget: Reset might need to start blinking the cursor +Patch1: vte-widget-reset-might-need-to-start-blinking-the-cursor.patch + BuildRequires: fdupes BuildRequires: gcc-c++ +# # Needed due to using sourceservice and we need to bootstrap tarball BuildRequires: gnome-common # @@ -41,9 +48,7 @@ BuildRequires: gperf BuildRequires: gtk-doc BuildRequires: intltool -%if !0%{?is_opensuse} -BuildRequires: translation-update-upstream -%endif +BuildRequires: pkgconfig BuildRequires: pkgconfig(gio-2.0) BuildRequires: pkgconfig(gio-unix-2.0) BuildRequires: pkgconfig(gladeui-2.0) @@ -55,7 +60,9 @@ BuildRequires: pkgconfig(pango) >= 1.22.0 BuildRequires: pkgconfig(vapigen) >= 0.24 BuildRequires: pkgconfig(zlib) -BuildRoot: %{_tmppath}/%{name}-%{version}-build +%if !0%{?is_opensuse} +BuildRequires: translation-update-upstream +%endif %description VTE is a terminal emulator library that provides a terminal widget for @@ -63,7 +70,6 @@ emulation settings. %package -n libvte%{_sover} - Summary: Terminal Emulator Library License: LGPL-2.0 Group: System/Libraries @@ -72,8 +78,6 @@ # have a vte package earlier). Provides: %{name} = %{version} Obsoletes: %{name} < %{version} -# gnome-pty-helper was dropped in 0.41.90 -Obsoletes: gnome-pty-helper %description -n libvte%{_sover} VTE is a terminal emulator library that provides a terminal widget for @@ -106,7 +110,7 @@ %package -n glade-catalog-vte Summary: Glade catalog for the VTE terminal emulator library -License: LGPL-2.0 and GPL-2.0 +License: LGPL-2.0 AND GPL-2.0 Group: Development/Tools/GUI Builders Requires: glade Requires: libvte%{_sover} = %{version} @@ -138,58 +142,51 @@ VTE. %lang_package + %prep -%setup -q -n %{_name}-%{version} +%autosetup -n %{_name}-%{version} -p1 %if !0%{?is_opensuse} translation-update-upstream %endif %build NOCONFIGURE=1 ./autogen.sh -export SUID_CFLAGS="-fPIE" -export SUID_LDFLAGS="-pie" %configure \ --with-gtk=%{_gtkver}\ --disable-static \ --enable-glade-catalogue \ --enable-introspection \ - --enable-gtk-doc -make %{?_smp_mflags} V=1 + --enable-gtk-doc \ + %{nil} +%make_build %install -%makeinstall -%if 0%{?suse_version} <= 1120 -rm %{buildroot}/%{_datadir}/locale/en@shaw/LC_MESSAGES/* -%endif +%make_install + %find_lang vte-%{_apiver} find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print %fdupes %{buildroot}/%{_prefix} %post -n libvte%{_sover} -p /sbin/ldconfig - %postun -n libvte%{_sover} -p /sbin/ldconfig %files -n libvte%{_sover} -%defattr(-,root,root) -%doc AUTHORS COPYING README NEWS +%doc COPYING %{_libdir}/*.so.* -%{_sysconfdir}/profile.d/vte.sh +%config %{_sysconfdir}/profile.d/vte.sh %files -n typelib-1_0-Vte-%{?_binver} -%defattr(-,root,root) %{_libdir}/girepository-1.0/Vte-%{_apiver}.typelib %files tools -%defattr(-,root,root) %{_bindir}/vte-%{?_binver} %files -n glade-catalog-vte -%defattr(-,root,root) %{_datadir}/glade/catalogs/vte-%{?_binver}.xml %{_datadir}/glade/pixmaps/hicolor/*/*/widget-vte-terminal.png %files devel -%defattr(-,root,root) +%doc AUTHORS README NEWS %{_libdir}/pkgconfig/*.pc %{_libdir}/*.so %{_includedir}/vte-%{_apiver}/ @@ -200,7 +197,4 @@ %files lang -f vte-%{_apiver}.lang -%clean -rm -rf $RPM_BUILD_ROOT - %changelog ++++++ vte-fix-memory-leaks.patch ++++++ >From 1d200a63ac4e39035af35e80881aa4fdae5556c6 Mon Sep 17 00:00:00 2001 From: Christian Persch <[email protected]> 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 >From ddd6dc998d9842369ec20f8e83c380401a8aed02 Mon Sep 17 00:00:00 2001 From: Christian Persch <[email protected]> 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 ++++++ vte-widget-reset-might-need-to-start-blinking-the-cursor.patch ++++++ >From 504db1b97f684778ee52f6e280a9e734936be20f Mon Sep 17 00:00:00 2001 From: Egmont Koblinger <[email protected]> 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
