Hello community, here is the log from the commit of package geany for openSUSE:Factory checked in at 2020-04-27 23:43:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/geany (Old) and /work/SRC/openSUSE:Factory/.geany.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "geany" Mon Apr 27 23:43:09 2020 rev:36 rq:798371 version:1.36 Changes: -------- --- /work/SRC/openSUSE:Factory/geany/geany.changes 2020-01-27 00:23:44.065533655 +0100 +++ /work/SRC/openSUSE:Factory/.geany.new.2738/geany.changes 2020-04-27 23:43:15.848104342 +0200 @@ -1,0 +2,7 @@ +Wed Apr 8 21:24:34 UTC 2020 - Bernhard Voelker <[email protected]> + +- geany-avoid-segfault-on-quit.patch: Add patch. (boo#1166820) +- geany-appstream.patch: Refresh patch. +- geany.spec: Reference above new patch. + +------------------------------------------------------------------- New: ---- geany-avoid-segfault-on-quit.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ geany.spec ++++++ --- /var/tmp/diff_new_pack.IUb96T/_old 2020-04-27 23:43:16.616105913 +0200 +++ /var/tmp/diff_new_pack.IUb96T/_new 2020-04-27 23:43:16.616105913 +0200 @@ -1,7 +1,7 @@ # # spec file for package geany # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,11 +22,12 @@ Summary: GTK-based integrated development environment License: GPL-2.0-or-later Group: Development/Tools/IDE -Url: https://geany.org +URL: https://geany.org Source0: https://download.geany.org/%{name}-%{version}.tar.bz2 Source1: %{name}-rpmlintrc # PATCH-FIX-UPSTREAM geany-appstream.patch gh#geany/geany#1142 [email protected] -- Downstream created appstream file, submitted upstream Patch0: geany-appstream.patch +Patch100: geany-avoid-segfault-on-quit.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: docutils @@ -74,6 +75,7 @@ %prep %setup -q %patch0 -p1 +%patch100 -p1 %build autoreconf -i ++++++ geany-appstream.patch ++++++ --- /var/tmp/diff_new_pack.IUb96T/_old 2020-04-27 23:43:16.640105963 +0200 +++ /var/tmp/diff_new_pack.IUb96T/_new 2020-04-27 23:43:16.640105963 +0200 @@ -1,7 +1,13 @@ -diff --git a/Makefile.am b/Makefile.am -index 04e4a87..a1b35b7 100644 ---- a/Makefile.am -+++ b/Makefile.am +--- + Makefile.am | 7 +++++++ + geany.appdata.xml.in | 32 ++++++++++++++++++++++++++++++++ + po/POTFILES.in | 1 + + 3 files changed, 40 insertions(+) + +Index: geany-1.36/Makefile.am +=================================================================== +--- geany-1.36.orig/Makefile.am ++++ geany-1.36/Makefile.am @@ -15,6 +15,7 @@ WIN32_BUILD_FILES = \ EXTRA_DIST = \ autogen.sh \ @@ -10,7 +16,7 @@ geany.desktop.in \ geany.pc.in \ ChangeLog.pre-1-22 \ -@@ -85,3 +86,9 @@ desktopdir = $(datadir)/applications +@@ -83,3 +84,9 @@ desktopdir = $(datadir)/applications desktop_in_files = geany.desktop desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) @INTLTOOL_DESKTOP_RULE@ @@ -20,11 +26,10 @@ +appdatadir = $(datadir)/appdata +nodist_appdata_DATA = geany.appdata.xml +@INTLTOOL_XML_RULE@ -diff --git a/geany.appdata.xml.in b/geany.appdata.xml.in -new file mode 100644 -index 0000000..862cbcc +Index: geany-1.36/geany.appdata.xml.in +=================================================================== --- /dev/null -+++ b/geany.appdata.xml.in ++++ geany-1.36/geany.appdata.xml.in @@ -0,0 +1,32 @@ +<?xml version='1.0' encoding='UTF-8'?> +<component> @@ -58,10 +63,10 @@ + <update_contact>[email protected]</update_contact> + <translation type="gettext">geany</translation> +</component> -diff --git a/po/POTFILES.in b/po/POTFILES.in -index 83057ac..3d14135 100644 ---- a/po/POTFILES.in -+++ b/po/POTFILES.in +Index: geany-1.36/po/POTFILES.in +=================================================================== +--- geany-1.36.orig/po/POTFILES.in ++++ geany-1.36/po/POTFILES.in @@ -1,5 +1,6 @@ # List of source files containing translatable strings. @@ -69,4 +74,3 @@ geany.desktop.in data/geany.glade src/about.c - ++++++ geany-avoid-segfault-on-quit.patch ++++++ Avoid segfault on quit [boo#1166820] https://github.com/geany/geany/issues/2457 --- src/vte.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) Index: geany-1.36/src/vte.c =================================================================== --- geany-1.36.orig/src/vte.c +++ geany-1.36/src/vte.c @@ -393,9 +393,10 @@ static void create_vte(void) g_signal_connect_after(vte, "realize", G_CALLBACK(on_vte_realize), NULL); } - +static int vte_closing; void vte_close(void) { + vte_closing = 1; g_free(vf); /* free the vte widget before unloading vte module * this prevents a segfault on X close window if the message window is hidden */ @@ -485,6 +486,8 @@ static void vte_commit_cb(VteTerminal *v static void vte_start(GtkWidget *widget) { + if (0 < vte_closing) + return; /* split the shell command line, so arguments will work too */ gchar **argv = g_strsplit(vc->shell, " ", -1);
