From nobody Wed Apr 29 20:44:23 2026 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g5Tn36PXdz6bvJF for ; Wed, 29 Apr 2026 20:44:23 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g5Tn35tXlz3XH4 for ; Wed, 29 Apr 2026 20:44:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777495463; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Lt+ZOKyPvvstUCfYJ3atksmmSggM1AedG27aXy6tjHY=; b=k+EkYs5xJ/HxszFG6/bMPNMyaesCxDqc8y+AwGX/xVgeXAMa2bq8HK82tlYLgL9pCUCE7t ZvSmcAbxO8FIl0+IOauPJCyOJcul11CMkSxMs/f3T8qa4r7dOjw9LAHHwdLMFBwkgLEZuU KcP1iDG8mrMTTF3AqSoAv/e9FI3SZ3wujkSoFVmkWgDE9adP17nEPj67WZwZcPuChegYDO e0b5H3q05KhwI5O9AoZ/NDX4QvNWjA+wyanuLBLOThehRuup1KXh97y/ddJ3FeQWB/gSB6 J2NV1RNGbp4ICHG3rPblloMvchDEZIANuw0bCtrO9nWnYopHxCnwWQfDdnyd1Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777495463; a=rsa-sha256; cv=none; b=hnQqgzCySHFiVxiRaBFYkVCArL6dHK/i/Ldk2byC13qvauLIlpEuK+szs0210qgAToo8Zk 2p6MM7Pbh+8OeMooilCcellcg6XeCcJWH3IHLk01zeEo0LSy8VaX8qBgaz4rhKZjuowVB5 7nVEy2f5mmaYUYJaxYtu9mCeuJpXRgL59Hmd/UXuWRpXzjFQxPfxMIrwE7WUic3/SKdRJF GLvTaMx6SDcr6iah0fX5kJo5Z0hGGtI67YOuYL1sI/yAm1v3YJ73IIIeVSiF+GouUGQ91D bAb6Q9rXg2gkGVBscsOPM+GjMjPSvx+NBAQETfQ3wVR+FOQNrm1Ka5yGedgu8Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777495463; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Lt+ZOKyPvvstUCfYJ3atksmmSggM1AedG27aXy6tjHY=; b=QtTe/pdyDUmoZtTZii21DYpkbqsx16YkOA2sfXKVV8wC/hzvWiDgxIF+Y9DrMM77m9r641 ZTh0i3I6tytbgUFval66BxdMQEjKzrW8JrFe+YFmmK+itNJt7QDCfsp3nvt9CWsE68bBMJ r8ONLQQaetpvO1nZWgqmAQces1GZNHfXXkoONPGTYAMqfQJ8OGQ5It2ESU6UJNUGfI1xn4 Ai2+ky6R7sEqxfhxx22bgiysXtSCMYA6swGmwYYCPnkXjqA35fyQZpjntNFV9HUsz7yQV2 OpPmUzV9dU6/6icfjh/6DjE8SI1x9xP7wRdJMbznnoKeRWeztjYz1EKQ+WNbrA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g5Tn35RgtzxFQ for ; Wed, 29 Apr 2026 20:44:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 427ed by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 29 Apr 2026 20:44:23 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Christoph Moench-Tegeder Subject: git: fe60c877c868 - main - cad/kicad: fix crash on opening Pre-Defined Sizes dialog List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cmt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fe60c877c868c9ce915d6aac09a88b891c1bce39 Auto-Submitted: auto-generated Date: Wed, 29 Apr 2026 20:44:23 +0000 Message-Id: <69f26da7.427ed.74b705f5@gitrepo.freebsd.org> The branch main has been updated by cmt: URL: https://cgit.FreeBSD.org/ports/commit/?id=fe60c877c868c9ce915d6aac09a88b891c1bce39 commit fe60c877c868c9ce915d6aac09a88b891c1bce39 Author: Christoph Moench-Tegeder AuthorDate: 2026-04-29 20:41:57 +0000 Commit: Christoph Moench-Tegeder CommitDate: 2026-04-29 20:44:14 +0000 cad/kicad: fix crash on opening Pre-Defined Sizes dialog Patch from upstream https://gitlab.com/kicad/code/kicad/-/commit/e466dffadc797958fbebb18e553fdec0f51e2b28 Reported by: Tomek CEDRO --- cad/kicad/Makefile | 1 + .../files/patch-pcbnew_edit__track__width.cpp | 50 ++++++++++++++++++++++ 2 files changed, 51 insertions(+) diff --git a/cad/kicad/Makefile b/cad/kicad/Makefile index 4e38ee2f251d..929c9f0106c3 100644 --- a/cad/kicad/Makefile +++ b/cad/kicad/Makefile @@ -1,5 +1,6 @@ PORTNAME= kicad DISTVERSION= 10.0.1 +PORTREVISION= 1 PORTEPOCH= 2 CATEGORIES= cad diff --git a/cad/kicad/files/patch-pcbnew_edit__track__width.cpp b/cad/kicad/files/patch-pcbnew_edit__track__width.cpp new file mode 100644 index 000000000000..2c0e30dab98a --- /dev/null +++ b/cad/kicad/files/patch-pcbnew_edit__track__width.cpp @@ -0,0 +1,50 @@ +commit e466dffadc797958fbebb18e553fdec0f51e2b28 +Author: Seth Hillbrand +Date: Sun Apr 26 15:42:16 2026 -0700 + + Try to fix crash opening Pre-defined Sizes + + Potential cause is that Gtk events are still on the stack after we + destroy the wxChoice + + Wrap the two ShowBoardSetupDialog calls in CallAfter so the dropdown + event finishes unwinding before the toolbar is rebuilt. + + Fixes https://gitlab.com/kicad/code/kicad/-/issues/23708 + +diff --git pcbnew/edit_track_width.cpp pcbnew/edit_track_width.cpp +index 0f123e8771..07dd200232 100644 +--- pcbnew/edit_track_width.cpp ++++ pcbnew/edit_track_width.cpp +@@ -162,7 +162,16 @@ void PCB_EDIT_FRAME::Tracks_and_Vias_Size_Event( wxCommandEvent& event ) + else if( ii == int( m_SelTrackWidthBox->GetCount() - 1 ) ) + { + m_SelTrackWidthBox->SetSelection( GetDesignSettings().GetTrackWidthIndex() ); +- ShowBoardSetupDialog( _( "Pre-defined Sizes" ) ); ++ ++ // Best-guess fix for issue #23708 (crash on dialog OK reported on ++ // Flatpak/FreeBSD, not reproduced locally). Suspected cause is that ++ // ReCreateAuxiliaryToolbar(), run on dialog OK, destroys this very ++ // wxChoice while its EVT_CHOICE handler is still on the GTK signal ++ // stack. Defer the dialog so the handler unwinds first. ++ CallAfter( [this]() ++ { ++ ShowBoardSetupDialog( _( "Pre-defined Sizes" ) ); ++ } ); + } + else + { +@@ -186,7 +195,12 @@ void PCB_EDIT_FRAME::Tracks_and_Vias_Size_Event( wxCommandEvent& event ) + else if( ii == int( m_SelViaSizeBox->GetCount() - 1 ) ) + { + m_SelViaSizeBox->SetSelection( GetDesignSettings().GetViaSizeIndex() ); +- ShowBoardSetupDialog( _( "Pre-defined Sizes" ) ); ++ ++ // See the matching comment in the track-width case above. ++ CallAfter( [this]() ++ { ++ ShowBoardSetupDialog( _( "Pre-defined Sizes" ) ); ++ } ); + } + else + {