From nobody Tue Oct 25 05:44:23 2022 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 4MxLVJ0TTqz4gksk; Tue, 25 Oct 2022 05:44:24 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MxLVH6pJ6z3pft; Tue, 25 Oct 2022 05: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=1666676664; 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=qfGAJNMEF6m3/raaqgHF7YqKppj0uXkpINxbszc2tFk=; b=eP4gO/4ih8gMf/rZPuorklgs4v1USxLdgSphoUhdYc90ofmRhwsnTFKlvhFDlGcwDPGrTk RszuT8LCRA8i58soZ2ZhoQLDHHQUS4qniQI8vkBm0sVwRzItihRInrfkjHr39LYLdreP0V YOfYLQRHBxPRNr2zvflP7sKGrWs4mFqVnRPFTOPkwRMkTk5eCsUlcY+1m7Ye8Lhhumqr+z tKzKyBOFmfQEA0j5hfayNFC15HlYcPdR/uZs9sSoh3TkGLAq5sXQuMfAKVrobBEEhmhOLA yxwV/1VX/pZqm9MCaZ5q9621OkTtRxiHc6LaUaHS8s6QtawmZkRKbb2mjyBqBg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MxLVH5lzQzV7g; Tue, 25 Oct 2022 05:44:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 29P5iNDK047398; Tue, 25 Oct 2022 05:44:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29P5iNqt047397; Tue, 25 Oct 2022 05:44:23 GMT (envelope-from git) Date: Tue, 25 Oct 2022 05:44:23 GMT Message-Id: <202210250544.29P5iNqt047397@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Lo=C3=AFc=20Bartoletti?= Subject: git: d5bd9f5d0557 - main - cad/kicad: use wx 32 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lbartoletti X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d5bd9f5d05575bda0bf5696f532e57eebea7f618 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666676664; 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=qfGAJNMEF6m3/raaqgHF7YqKppj0uXkpINxbszc2tFk=; b=ZJomGJvL+8+cT26KgLVdIjdBbUQO695arQt4gmWWD/2JS3yaZbX5UyacSpb7p9hk6swXw+ dTSMAalTLcsHXQF5drI7Cs81Fqs1A4xSlp2M9o202A/CLvBylYBp5v11WwkDYDj8K0dTDn srq1ZkUVKF4TltYXvsTfM7IQE7qU9qpMUoQtzJecsRzcl1p4OqyY5fSuKxqmT+lW3k53tw 08CaM1pVro+wuuIrGQ+BW/+U8zqFZSzjagNVJp4JGGPpl0FX++2GPSSc5b87ot/UQenr0P PRogH3b3tzHbFIK7OUel2ECYdArJYtNNnAHlVz3QPTQnf+Q+9D+Uen61XYJ+tg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666676664; a=rsa-sha256; cv=none; b=gjsOsd3xII9VWrB2Ff1UQXNpKGP+1zdKbMaQGLrxvTZ14piStM19yj2oE0kLBHvmQKkYNc xkwJeyyVLgSMc/QTkKMrnDexS/SI85i+4v+mkvRR+EI9+hpu/JtNBvaDogwy7+SxJoh4ap M0vgHgk8zMt/N5/3OPW5gvii2n3QnuMPkcyq6YdEP282AX37OJyeQWy310alo8SIXAwfLb 7dRwP20MKGjxBw1UaHCSRgoxXSCdu3VFaRRsz6gu6EKNlj8ma700GHtWpQSe/p7LndopCN RR8oR64VsF/dxZ2HdRGMBevUOAGzWBa50KxzItkD+aFB3lE3+admHVpQ64SW5A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by lbartoletti: URL: https://cgit.FreeBSD.org/ports/commit/?id=d5bd9f5d05575bda0bf5696f532e57eebea7f618 commit d5bd9f5d05575bda0bf5696f532e57eebea7f618 Author: Loïc Bartoletti AuthorDate: 2022-10-11 21:13:08 +0000 Commit: Loïc Bartoletti CommitDate: 2022-10-25 05:44:04 +0000 cad/kicad: use wx 32 PR: 265093 --- cad/kicad/Makefile | 3 ++- .../files/patch-eeschema_sim_sim__plot__frame.cpp | 23 ++++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/cad/kicad/Makefile b/cad/kicad/Makefile index cca7ae65d8e8..839ee8e978a1 100644 --- a/cad/kicad/Makefile +++ b/cad/kicad/Makefile @@ -1,5 +1,6 @@ PORTNAME= kicad PORTVERSION= 6.0.8 +PORTREVISION= 1 PORTEPOCH= 2 CATEGORIES= cad MASTER_SITES= https://gitlab.com/${PORTNAME}/code/${PORTNAME}/-/archive/${DISTVERSION}/ @@ -30,7 +31,7 @@ SHEBANG_FILES= pcbnew/python/plugins/touch_slider_wizard.py USE_XORG= ice x11 xext USE_GL= gl glu glut -USE_WX= 3.1 +USE_WX= 3.2 WX_COMPS= python:lib wx USE_GNOME= atk cairo gdkpixbuf2 gtk30 pango CXXFLAGS+= --std=c++11 -I${WRKSRC}/include -I${LOCALBASE}/include diff --git a/cad/kicad/files/patch-eeschema_sim_sim__plot__frame.cpp b/cad/kicad/files/patch-eeschema_sim_sim__plot__frame.cpp new file mode 100644 index 000000000000..a7b40f4b3256 --- /dev/null +++ b/cad/kicad/files/patch-eeschema_sim_sim__plot__frame.cpp @@ -0,0 +1,23 @@ +--- eeschema/sim/sim_plot_frame.cpp.orig 2022-09-14 16:35:24 UTC ++++ eeschema/sim/sim_plot_frame.cpp +@@ -167,15 +167,15 @@ SIM_PLOT_FRAME::SIM_PLOT_FRAME( KIWAY* aKiway, wxWindo + Bind( EVT_SIM_CURSOR_UPDATE, &SIM_PLOT_FRAME::onCursorUpdate, this ); + + // Toolbar buttons +- m_toolSimulate = m_toolBar->AddTool( ID_SIM_RUN, _( "Run/Stop Simulation" ), ++ m_toolSimulate = m_toolBar->AddTool( ID_SIM_RUN, wxEmptyString, + KiBitmap( BITMAPS::sim_run ), _( "Run Simulation" ), wxITEM_NORMAL ); +- m_toolAddSignals = m_toolBar->AddTool( ID_SIM_ADD_SIGNALS, _( "Add Signals" ), ++ m_toolAddSignals = m_toolBar->AddTool( ID_SIM_ADD_SIGNALS, wxEmptyString, + KiBitmap( BITMAPS::sim_add_signal ), _( "Add signals to plot" ), wxITEM_NORMAL ); +- m_toolProbe = m_toolBar->AddTool( ID_SIM_PROBE, _( "Probe" ), ++ m_toolProbe = m_toolBar->AddTool( ID_SIM_PROBE, wxEmptyString, + KiBitmap( BITMAPS::sim_probe ), _( "Probe signals on the schematic" ), wxITEM_NORMAL ); +- m_toolTune = m_toolBar->AddTool( ID_SIM_TUNE, _( "Tune" ), ++ m_toolTune = m_toolBar->AddTool( ID_SIM_TUNE, wxEmptyString, + KiBitmap( BITMAPS::sim_tune ), _( "Tune component values" ), wxITEM_NORMAL ); +- m_toolSettings = m_toolBar->AddTool( wxID_ANY, _( "Sim Parameters" ), ++ m_toolSettings = m_toolBar->AddTool( wxID_ANY, wxEmptyString, + KiBitmap( BITMAPS::config ), _( "Simulation parameters and settings" ), wxITEM_NORMAL ); + + // Start all toolbar buttons except settings as disabled