svn commit: r553166 - in head/devel/geany: . files

[Guido Falsi]

Author: madpilot
Date: Sat Oct 24 08:51:59 2020
New Revision: 553166
URL: https://svnweb.freebsd.org/changeset/ports/553166

Log:
  Fix crash on close due to a signal handler on VTE widget being fired
  after the widget is destroyed.
  
  PR:		250403
  Submitted by:	Hodong <hodong at nimfsoft.com>
  MFH:		2020Q4

Added:
  head/devel/geany/files/
  head/devel/geany/files/patch-src_vte.c   (contents, props changed)
Modified:
  head/devel/geany/Makefile

Modified: head/devel/geany/Makefile
==============================================================================
--- head/devel/geany/Makefile	Sat Oct 24 08:38:27 2020	(r553165)
+++ head/devel/geany/Makefile	Sat Oct 24 08:51:59 2020	(r553166)
@@ -3,6 +3,7 @@
 
 PORTNAME=	geany
 PORTVERSION=	1.36
+PORTREVISION=	1
 CATEGORIES=	devel editors
 MASTER_SITES=	http://download.geany.org/ SF
 
@@ -42,17 +43,18 @@ NLS_CONFIGURE_ENABLE=	nls
 
 VTE_DESC=	Embedded virtual terminal
 VTE_CONFIGURE_ENABLE=	vte
-VTE_USE=	GNOME=vte
 
 THEMES_DESC=	Additional color schemes
 THEMES_RUN_DEPENDS=	${LOCALBASE}/share/geany/colorschemes/bespin.conf:devel/geany-themes
 
 .if ${FLAVOR} == gtk2
 USE_GNOME+=	gtk20
+VTE_USE=	GNOME=vte
 CONFIGURE_ARGS+=	--disable-gtk3
 PLIST_SUB+=	GTK2="" GTK3="@comment "
 .elif ${FLAVOR} == gtk3
 USE_GNOME+=	gtk30
+VTE_USE=	GNOME=vte3
 CONFIGURE_ARGS+=	--enable-gtk3
 PLIST_SUB+=	GTK2="@comment " GTK3=""
 .endif

Added: head/devel/geany/files/patch-src_vte.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/geany/files/patch-src_vte.c	Sat Oct 24 08:51:59 2020	(r553166)
@@ -0,0 +1,10 @@
+--- src/vte.c.orig	2019-09-28 12:38:17 UTC
++++ src/vte.c
+@@ -399,6 +399,7 @@ void vte_close(void)
+ 	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 */
++	g_signal_handlers_disconnect_by_func(vc->vte, G_CALLBACK(vte_start), NULL);
+ 	gtk_widget_destroy(vc->vte);
+ 	gtk_widget_destroy(vc->menu);
+ 	g_object_unref(vc->menu);