From owner-svn-ports-all@freebsd.org Tue Apr 2 00:54:37 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E1C0C154D9FB; Tue, 2 Apr 2019 00:54:36 +0000 (UTC) (envelope-from wen@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 7E7E769DF2; Tue, 2 Apr 2019 00:54:36 +0000 (UTC) (envelope-from wen@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 559E01E875; Tue, 2 Apr 2019 00:54:36 +0000 (UTC) (envelope-from wen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x320sarW081308; Tue, 2 Apr 2019 00:54:36 GMT (envelope-from wen@FreeBSD.org) Received: (from wen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x320sZHg081306; Tue, 2 Apr 2019 00:54:35 GMT (envelope-from wen@FreeBSD.org) Message-Id: <201904020054.x320sZHg081306@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: wen set sender to wen@FreeBSD.org using -f From: Wen Heping Date: Tue, 2 Apr 2019 00:54:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r497542 - in head/finance/homebank: . files X-SVN-Group: ports-head X-SVN-Commit-Author: wen X-SVN-Commit-Paths: in head/finance/homebank: . files X-SVN-Commit-Revision: 497542 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 7E7E769DF2 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.95)[-0.950,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Apr 2019 00:54:37 -0000 Author: wen Date: Tue Apr 2 00:54:35 2019 New Revision: 497542 URL: https://svnweb.freebsd.org/changeset/ports/497542 Log: - Fix the segfault when importing files PR: 236942 Submitted by: freebsd.org@bilke.org Added: head/finance/homebank/files/ head/finance/homebank/files/patch-fix-236942.patch (contents, props changed) Modified: head/finance/homebank/Makefile Modified: head/finance/homebank/Makefile ============================================================================== --- head/finance/homebank/Makefile Tue Apr 2 00:42:06 2019 (r497541) +++ head/finance/homebank/Makefile Tue Apr 2 00:54:35 2019 (r497542) @@ -2,6 +2,7 @@ PORTNAME= homebank PORTVERSION= 5.2.3 +PORTREVISION= 1 CATEGORIES= finance MASTER_SITES= http://homebank.free.fr/public/ Added: head/finance/homebank/files/patch-fix-236942.patch ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/finance/homebank/files/patch-fix-236942.patch Tue Apr 2 00:54:35 2019 (r497542) @@ -0,0 +1,63 @@ +=== modified file 'src/ui-assist-import.c' +--- src/ui-assist-import.c 2019-03-17 16:01:28 +0000 ++++ src/ui-assist-import.c 2019-03-21 18:12:19 +0000 +@@ -1994,6 +1994,12 @@ + data->txndata = NULL; + } + data->txndata = g_array_sized_new(FALSE, TRUE, sizeof(ImpTxnData), nbacc); ++ ++ //#1820618 patch for glib < 2.58 https://gitlab.gnome.org/GNOME/glib/issues/1374 ++ if( glib_minor_version < 58 ) ++ { ++ g_array_set_size(data->txndata, nbacc); ++ } + + DB( g_print(" accnb=%d @%p\n", nbacc, data->txndata) ); + + +=== modified file 'src/ui-assist-start.c' +--- src/ui-assist-start.c 2019-03-17 16:01:28 +0000 ++++ src/ui-assist-start.c 2019-03-21 18:12:19 +0000 +@@ -35,7 +35,7 @@ + /* our global datas */ + extern struct HomeBank *GLOBALS; + +-extern gchar *CYA_ACC_TYPE[]; ++extern HbKvData CYA_ACC_TYPE[]; + + /* = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = */ + +@@ -84,7 +84,7 @@ + } + + item->kcur = GLOBALS->kcur; +- item->type = gtk_combo_box_get_active(GTK_COMBO_BOX(data->CY_type)); ++ item->type = hbtk_combo_box_get_active_id(GTK_COMBO_BOX_TEXT(data->CY_type)); + + item->number = g_strdup(gtk_entry_get_text(GTK_ENTRY(data->ST_number))); + +@@ -390,7 +390,8 @@ + row++; + label = make_label_widget(_("_Type:")); + gtk_grid_attach (GTK_GRID (table), label, 1, row, 1, 1); +- widget = make_cycle(label, CYA_ACC_TYPE); ++ //widget = make_cycle(label, CYA_ACC_TYPE); ++ widget = hbtk_combo_box_new_with_data(label, CYA_ACC_TYPE); + data->CY_type = widget; + gtk_widget_set_hexpand(widget, TRUE); + gtk_grid_attach (GTK_GRID (table), widget, 2, row, 1, 1); + +=== modified file 'src/ui-widgets.c' +--- src/ui-widgets.c 2019-03-17 16:01:28 +0000 ++++ src/ui-widgets.c 2019-03-21 18:12:19 +0000 +@@ -695,7 +695,8 @@ + break; + if( tmp->key == key ) + { +- retval = (gchar *)tmp->name; ++ //#1820372 ++ retval = (gchar *)_(tmp->name); + break; + } + } +