From nobody Thu Mar 21 18:02:17 2024 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 4V0tZy1vdRz5F9tB; Thu, 21 Mar 2024 18:02:18 +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 4V0tZx6dx3z46D0; Thu, 21 Mar 2024 18:02:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711044137; 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=ijrWRMFWdpkdT8U1uFHRcePl/czOo7ERgnga7Ys4obQ=; b=cgTco9GkLezbdpinQjQqU0h59ngUqq6fULA97adUo56MlsBVHagJb9Fz71IdRi1bdk77JE 2Z2d/cLkb5sgIB67LGRU6wRElvgx31WreddI3yGuNn/HWvguwurAdRtgvD+twRXNu404Fu dyLzPPX+l59atkVof1G42Wj1VW92uEv5PoctvedIRHxMlDIKROLr9Oc3DR5AzvrGbRe0lr 91reqFvuxo5wLAhTWP1lgVhvQpR9/Jx6yaVCtgxt252cxW3hVixyoETjGXpcLQozORUf1D IrkBY4mjkQjSHk40lQzYdlwWLL5aJ6g+/ULnGiQad6w+pjoFX1f3kTLRziH4QQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711044137; a=rsa-sha256; cv=none; b=qOxdhVHHAdoRQzxtaYrBJDoOM33x/i4mVUI2UFNVdO/5tU6MQ9Qmxr8NNr/CSSSFASYInS 26XHb+cjJ/1iD1AKdmFzkwFe+uzPec6HFs6zO0DKqcNBaa/XURAn5g1zspjLeYKuyZ/bkt Uljyh/qT4XEwRLYnhI+YLqIUkUG7lp7idbe0TrdM99dub2zxLZXglsqXpIuduiVKkH/Rh8 3ONenu79PBLAWkmEjbSP7CnFJgpbQo0Sh89spRtdDCAsRJ74S27PHhM98uEqHS/Y/2yzoH CMtSSQX8fFeCxctrIzV+S9P2g3vxpJ58deJ8cJ0Gdkw52XfJ7s9wQuOXqcMYlA== 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=1711044137; 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=ijrWRMFWdpkdT8U1uFHRcePl/czOo7ERgnga7Ys4obQ=; b=p0mIwNBVcgH9/qyFI0kH0LX/HPVRR9wGMYwluy10D5iHIYbtRq/+7ekJFWf+zbVk8oxYvx ikL4mFUNIYYh5unkzWrCGmxQCwonel8sFJ6kH+d6QvA8RckA3nEsb4/sosA/X9z7fmrLSD SLGgxQRgrFfV+PSy4BxbFJmPou0TIh7wTNJiGBp5zh4V32q+Z7RZqjpgfgyUZKjSHaxMBQ Vlb/BedHpXoCyi6G03F2ZKzByfrPddbLIkVLGRLmxXYfZi0dJviH6RoqtZYn+/JoLtKPaG jz/KrkQpIw3buCEMDjiihV6sznhoprpEkwJhtkDesugiijINl/s6tnDD54pBXA== 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 4V0tZx57s5zlnL; Thu, 21 Mar 2024 18:02:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42LI2HF5023454; Thu, 21 Mar 2024 18:02:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42LI2HOx023451; Thu, 21 Mar 2024 18:02:17 GMT (envelope-from git) Date: Thu, 21 Mar 2024 18:02:17 GMT Message-Id: <202403211802.42LI2HOx023451@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Thierry Thomas Subject: git: 7632031eb3a9 - main - cad/kicad-devel: support of OpenCascade 7.8.0 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: thierry X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7632031eb3a9c542cdab66527b459790004cdf91 Auto-Submitted: auto-generated The branch main has been updated by thierry: URL: https://cgit.FreeBSD.org/ports/commit/?id=7632031eb3a9c542cdab66527b459790004cdf91 commit 7632031eb3a9c542cdab66527b459790004cdf91 Author: Thierry Thomas AuthorDate: 2024-03-17 14:39:52 +0000 Commit: Thierry Thomas CommitDate: 2024-03-21 18:01:18 +0000 cad/kicad-devel: support of OpenCascade 7.8.0 Patch from OpenBSD by Johannes Thyssen Tishman. PR: 277311 Approved by: maintainer’s time-out --- cad/kicad-devel/Makefile | 2 +- cad/kicad-devel/files/patch-cmake_FindOCC.cmake | 35 ++++++++++++++++++++++ cad/kicad-devel/files/patch-include-kiway.h | 4 +-- ...tch-pcbnew_import__gfx_dxf__import__plugin.cpp} | 20 +++++++++---- .../files/patch-thirdparty_glew_CMakeLists.txt | 6 ++-- .../files/patch-thirdparty_nanodbc_CMakeLists.txt | 11 ++----- 6 files changed, 57 insertions(+), 21 deletions(-) diff --git a/cad/kicad-devel/Makefile b/cad/kicad-devel/Makefile index 625b03f8efc9..2950c10a75d4 100644 --- a/cad/kicad-devel/Makefile +++ b/cad/kicad-devel/Makefile @@ -1,6 +1,6 @@ PORTNAME= kicad DISTVERSION= r${GIT_SRC_DATE} -PORTREVISION= 7 +PORTREVISION= 8 #PORTREVISION= 1 CATEGORIES= cad PKGNAMESUFFIX= -devel diff --git a/cad/kicad-devel/files/patch-cmake_FindOCC.cmake b/cad/kicad-devel/files/patch-cmake_FindOCC.cmake new file mode 100644 index 000000000000..b3eb1132e754 --- /dev/null +++ b/cad/kicad-devel/files/patch-cmake_FindOCC.cmake @@ -0,0 +1,35 @@ +--- cmake/FindOCC.cmake.orig 2023-06-22 13:35:48 UTC ++++ cmake/FindOCC.cmake +@@ -45,7 +45,7 @@ set( OCC_LIBS + TKGeomAlgo + TKGeomBase + TKHLR +- TKIGES ++ TKDEIGES + TKLCAF + TKMath + TKMesh +@@ -55,18 +55,15 @@ set( OCC_LIBS + TKPrim + TKService + TKShHealing +- TKSTEP209 +- TKSTEPAttr +- TKSTEPBase +- TKSTEP +- TKSTL ++ TKDESTEP ++ TKDESTL + TKTObj + TKTopAlgo + TKV3d +- TKVRML ++ TKDEVRML + TKXCAF +- TKXDEIGES +- TKXDESTEP ++ TKXSDRAWIGES ++ TKXSDRAWSTEP + TKXMesh + TKXmlL + TKXml diff --git a/cad/kicad-devel/files/patch-include-kiway.h b/cad/kicad-devel/files/patch-include-kiway.h index dda125f679c6..9244e58c8eea 100644 --- a/cad/kicad-devel/files/patch-include-kiway.h +++ b/cad/kicad-devel/files/patch-include-kiway.h @@ -1,6 +1,6 @@ ---- include/kiway.h.orig 2021-12-11 08:54:03 UTC +--- include/kiway.h.orig 2023-06-22 13:35:48 UTC +++ include/kiway.h -@@ -114,7 +114,7 @@ +@@ -115,7 +115,7 @@ #define KIFACE_INSTANCE_NAME_AND_VERSION "KIFACE_1" #ifndef SWIG diff --git a/cad/kicad-devel/files/patch-pcbnew_import_gfx_dxf_import_plugin.cpp b/cad/kicad-devel/files/patch-pcbnew_import__gfx_dxf__import__plugin.cpp similarity index 58% rename from cad/kicad-devel/files/patch-pcbnew_import_gfx_dxf_import_plugin.cpp rename to cad/kicad-devel/files/patch-pcbnew_import__gfx_dxf__import__plugin.cpp index 12625f24511b..2eeba09414c4 100644 --- a/cad/kicad-devel/files/patch-pcbnew_import_gfx_dxf_import_plugin.cpp +++ b/cad/kicad-devel/files/patch-pcbnew_import__gfx_dxf__import__plugin.cpp @@ -1,27 +1,34 @@ ---- pcbnew/import_gfx/dxf_import_plugin.cpp.orig 2023-01-08 16:40:34.270267000 +0100 -+++ pcbnew/import_gfx/dxf_import_plugin.cpp 2023-01-08 16:40:37.228586000 +0100 -@@ -581,5 +581,5 @@ +--- pcbnew/import_gfx/dxf_import_plugin.cpp.orig 2023-06-22 13:35:48 UTC ++++ pcbnew/import_gfx/dxf_import_plugin.cpp +@@ -580,7 +580,7 @@ void DXF_IMPORT_PLUGIN::addEllipse( const DL_EllipseDa + // For now, we assume ellipses in the XY plane. VECTOR2D center( mapX( centerCoords.x ), mapY( centerCoords.y ) ); - VECTOR2D major( mapX( majorCoords.x ), mapY( majorCoords.y ) ); + VECTOR2D _major( mapX( majorCoords.x ), mapY( majorCoords.y ) ); // DXF elliptical arcs store their angles in radians (unlike circular arcs which use degrees) -@@ -599,5 +599,5 @@ + // The arcs wind CCW as in KiCad. The end angle must be greater than the start angle, and if +@@ -598,7 +598,7 @@ void DXF_IMPORT_PLUGIN::addEllipse( const DL_EllipseDa + if( aData.ratio == 1.0 ) { - double radius = major.EuclideanNorm(); + double radius = _major.EuclideanNorm(); if( startAngle == endAngle ) -@@ -617,5 +617,5 @@ + { +@@ -616,7 +616,7 @@ void DXF_IMPORT_PLUGIN::addEllipse( const DL_EllipseDa + } std::vector> splines; - ELLIPSE ellipse( center, major, aData.ratio, startAngle, endAngle ); + ELLIPSE ellipse( center, _major, aData.ratio, startAngle, endAngle ); TransformEllipseToBeziers( ellipse, splines ); -@@ -631,6 +631,6 @@ + +@@ -630,8 +630,8 @@ void DXF_IMPORT_PLUGIN::addEllipse( const DL_EllipseDa + bufferToUse->AddSpline( b.Start, b.C1, b.C2, b.End, lineWidth ); // Naive bounding - updateImageLimits( center + major ); @@ -30,3 +37,4 @@ + updateImageLimits( center - _major ); } + diff --git a/cad/kicad-devel/files/patch-thirdparty_glew_CMakeLists.txt b/cad/kicad-devel/files/patch-thirdparty_glew_CMakeLists.txt index 18c5a496dd6c..d56f7dd4d070 100644 --- a/cad/kicad-devel/files/patch-thirdparty_glew_CMakeLists.txt +++ b/cad/kicad-devel/files/patch-thirdparty_glew_CMakeLists.txt @@ -1,10 +1,10 @@ ---- thirdparty/glew/CMakeLists.txt.orig 2022-05-07 15:44:23 +0200 +--- thirdparty/glew/CMakeLists.txt.orig 2023-06-22 13:35:48 UTC +++ thirdparty/glew/CMakeLists.txt -@@ -5,6 +5,7 @@ +@@ -5,6 +5,7 @@ target_include_directories( glew PRIVATE "${CMAKE_CURR # The actual include directories will be added to the global include paths as # system headers target_include_directories( glew PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/include" ) +target_include_directories( glew SYSTEM PRIVATE "${CMAKE_INSTALL_PREFIX}/include" ) # Definitions for compiling GLEW staticly for EGL (extracted from the main GLEW CMakeLists.txt file) - add_definitions( -DGLEW_STATIC ) + add_compile_definitions( GLEW_STATIC ) diff --git a/cad/kicad-devel/files/patch-thirdparty_nanodbc_CMakeLists.txt b/cad/kicad-devel/files/patch-thirdparty_nanodbc_CMakeLists.txt index a4b434935ab1..79157d85e791 100644 --- a/cad/kicad-devel/files/patch-thirdparty_nanodbc_CMakeLists.txt +++ b/cad/kicad-devel/files/patch-thirdparty_nanodbc_CMakeLists.txt @@ -1,6 +1,6 @@ ---- thirdparty/nanodbc/CMakeLists.txt.orig 2022-09-14 12:06:32 UTC +--- thirdparty/nanodbc/CMakeLists.txt.orig 2023-06-22 13:35:48 UTC +++ thirdparty/nanodbc/CMakeLists.txt -@@ -165,16 +165,11 @@ elseif(MINGW) +@@ -155,16 +155,11 @@ endif() endif() ######################################## @@ -21,10 +21,3 @@ ######################################## ## 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()