From nobody Tue Oct 25 05:44:24 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 4MxLVK1jbpz4gkkv; Tue, 25 Oct 2022 05:44:25 +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 4MxLVK0Ypkz3prX; Tue, 25 Oct 2022 05:44:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666676665; 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=vkaxGg6BdfV05TKz2AhvPcnmoVJBPq2ykbSETDbJpYU=; b=eI8/q1Id/QiOf9KQnMy+YGEotePnXEkwdm+yaje293R83gShaAE2kXDCdgsB6ORYIHyTFX W78NFCoxV+L1a6zio+/CF5+3LdUPficmnUN61NkbESYaS0Tcz8XXaFcjDli7YAu5duyaVQ CwvuyfkblXQLr4vhR8aRkOvn6I2nAe+gxKm4P+W+xpToOYvey9HH8woYyxxQLKJd857eAy f2rXWtoG9D3CFX7VuwmPQ2kZPpBlKJO2irScGKxGyDV6C1LilRXmpS5FIiZE2SzkIa8cMt Wz1N7vEh7eUjp+1UHZorpHnhwsuwbV3iH/+elD1LhOGEHE7GCKNG9bDSUGdyVw== 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 4MxLVJ6hRxzV5f; Tue, 25 Oct 2022 05:44:24 +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 29P5iOak047430; Tue, 25 Oct 2022 05:44:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29P5iOA7047429; Tue, 25 Oct 2022 05:44:24 GMT (envelope-from git) Date: Tue, 25 Oct 2022 05:44:24 GMT Message-Id: <202210250544.29P5iOA7047429@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: d775565a3b3b - main - cad/kicad-devel: 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: d775565a3b3bfa4f3cb935a471f347aea64dcdd5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666676665; 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=vkaxGg6BdfV05TKz2AhvPcnmoVJBPq2ykbSETDbJpYU=; b=we5xrX/HVv2sSjXGXlziTYa3MWf4QYE7l2vlZbSjVDG14qvvalPtC+GkHGDCvZNIHpTRIs GaM1VpdfZdPLd75F97MjxautPkzX+6vtJI/m47QNPbKRcougKqS+OMaYxwgQI5rubN7BDf OaacXifoHmjHAAfT5O3BgnuNaULSuQ/ccskMwlKe0e6LJ89fLHonBbL8wjB8nkuW3A5EV2 ukOoOBVVLPT17ZsTujOu6zYP3jFi33+XcrSx15fnzgtgptNOKHluPDsnBUcezwujtiRar2 MSfR3f/FNgB2L8MlifBsvaeKHGkDdLNTahSswM7cHJHD+p8qn2G0Oao1ZoV6Pg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666676665; a=rsa-sha256; cv=none; b=nSs95qErZ+lHwOXLSGw4IDApud1MaFy+DDZoF5Ko8C29mrMBvwZdfMsKZtOJ5lT8PyV0Iq Uou7ztQJbnC7X1/GCxI74QG77Em/iPMcNFoAv4uzUkXKOeQlegiYLs9kduZpfevOirvUP1 6yryXrV3NChcws2/bvXbddvLQKmdsWkMxaKUisN3AlG9UFU2liPgjTW3/Xx2PJ6QZOviK+ DPh4FrzO4nBTgfrzvoq3JMvv9XWY3F5qITjNUb0hzARlyxIf7lzIvtO2XjYXuZVXP5tvWF ceyCaPxe5EApzs3X3RzkIzv+/vbX/lsQ6KKDaUtkLKO9CljkSA9NGsLLM7uHUg== 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=d775565a3b3bfa4f3cb935a471f347aea64dcdd5 commit d775565a3b3bfa4f3cb935a471f347aea64dcdd5 Author: Loïc Bartoletti AuthorDate: 2022-10-11 21:13:26 +0000 Commit: Loïc Bartoletti CommitDate: 2022-10-25 05:44:04 +0000 cad/kicad-devel: use wx 32 PR: 265093 --- cad/kicad-devel/Makefile | 4 +-- .../files/patch-eeschema_sim_sim__plot__frame.cpp | 23 +++++++++++++++++ .../files/patch-thirdparty_nanodbc_CMakeLists.txt | 30 ++++++++++++++++++++++ 3 files changed, 55 insertions(+), 2 deletions(-) diff --git a/cad/kicad-devel/Makefile b/cad/kicad-devel/Makefile index 4802cb5a8bae..5c1eb5d720a9 100644 --- a/cad/kicad-devel/Makefile +++ b/cad/kicad-devel/Makefile @@ -1,6 +1,6 @@ PORTNAME= kicad DISTVERSION= r${GIT_SRC_DATE} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= cad PKGNAMESUFFIX= -devel DIST_SUBDIR= ${PORTNAME} @@ -42,7 +42,7 @@ GL_ACCOUNT= kicad/code GL_PROJECT= kicad GL_COMMIT= ${GIT_SRC_HASH} USE_GL= gl glew glu glut -USE_WX= 3.1 +USE_WX= 3.2 WX_COMPS= wx python:lib USE_GNOME= atk cairo gtk30 gdkpixbuf2 pango USE_XORG+= ice pixman x11 xext diff --git a/cad/kicad-devel/files/patch-eeschema_sim_sim__plot__frame.cpp b/cad/kicad-devel/files/patch-eeschema_sim_sim__plot__frame.cpp new file mode 100644 index 000000000000..a7b40f4b3256 --- /dev/null +++ b/cad/kicad-devel/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 diff --git a/cad/kicad-devel/files/patch-thirdparty_nanodbc_CMakeLists.txt b/cad/kicad-devel/files/patch-thirdparty_nanodbc_CMakeLists.txt new file mode 100644 index 000000000000..a4b434935ab1 --- /dev/null +++ b/cad/kicad-devel/files/patch-thirdparty_nanodbc_CMakeLists.txt @@ -0,0 +1,30 @@ +--- thirdparty/nanodbc/CMakeLists.txt.orig 2022-09-14 12:06:32 UTC ++++ thirdparty/nanodbc/CMakeLists.txt +@@ -165,16 +165,11 @@ elseif(MINGW) + endif() + + ######################################## +-## Mac OS X specifics for targets ++## FreeBSD specifics for targets + ######################################## +-if(APPLE) +- set(CMAKE_MACOSX_RPATH ON) +- message(STATUS "Use rpaths on Mac OS X - ${CMAKE_MACOSX_RPATH}") +- +- # AppleClang complains of unused `-I/path/` arguments. +- # These are harmless and can be safely ignored. +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-command-line-argument") +-endif() ++# Clang complains of unused `-I/path/` arguments. ++# These are harmless and can be safely ignored. ++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-command-line-argument") + + ######################################## + ## library target +@@ -202,4 +197,4 @@ endif() + if(NANODBC_ENABLE_UNICODE) + add_compile_definitions(NANODBC_ENABLE_UNICODE) + target_compile_definitions(nanodbc PUBLIC NANODBC_ENABLE_UNICODE) +-endif() +\ No newline at end of file ++endif()