From nobody Thu Mar 21 18:02:18 2024 X-Original-To: dev-commits-ports-all@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 4V0tZz21knz5FB6y; Thu, 21 Mar 2024 18:02:19 +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 4V0tZy6rxQz45s9; Thu, 21 Mar 2024 18:02:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711044139; 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=UcH3n+ftfcsNM08WLqGalglnsbzSmHlPPKmgcmknHAg=; b=dWzhE3sr5T+mB0LgBvHvPgJLYlJYNmYlueY20IBo9IQUZeuk0ZS4SewbNbAVgylc0rHd4r Tx6eTtU6f2B7wY+mH7DNDCKTvtYJXgYAt6Up2idw0uSRnX4IUL+Nc3vztZTtY4lKY7Lgsg oYM6UhHdT+QmRaH+5NUTDbLCfPZ0553taj5KWtejXmFDVPyYkOgO3bQ0tJrc2dDBLtsM36 ZoDElmyRhq50hWsC3nOUYAFVxRCQE2i2fQzX5Fy9DOyRvZPRyAH+zsmsWINRhNxY4NjYTH PBDgKqXLMVVpowmhPnbr31LrBNe7mqLcuhuvhNm96gUOQedUAVhOjE6ofE78RQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711044139; a=rsa-sha256; cv=none; b=jnww9xhLuQ91uM2L0wLsztzyRxt3H5rZjGFYeCwhmwPZyPpD7ivb8mOiJr1BnnQNrPFGur UBchXUbMDOkT1yaWC+5c+k/VUnGhSophOSPPgb71glZuWvjUUItGocsKaM7gf9Yw1P/8zM e+olMkku/2N3YM1lesyZss1L6BnotjCcqPpNK1RaqTaPElEsh824oSDQV88qeg6Yf6S+tu JJ5PLYFRrstLjZYZGcCIpsdVhxDZzIj6wTHoxLamCfgr/7NOpJTJ2o4TBAJ23X6faPuIaZ 5C81hW5lGlbt6RTLaXjWUSto5/KUBbZRPDN5ygmbokDiV694mre/8HhYgQVePw== 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=1711044139; 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=UcH3n+ftfcsNM08WLqGalglnsbzSmHlPPKmgcmknHAg=; b=SlVHTVNmFaJXhcfYhS6FzqSqkcMTOxGed/uFaB3tN+IqyBlxortXWxk6E4Pw2QpC5/MBAg VcGuOy5qwmYIxheZhX/F/HmjqsT2QE6GjiOrxHo7+3n0qxJhmgu0Sg1r5jR9oz/Xwl1pZG tgjLO/dYPcWpOQZzCwGAvZeVlf6Mg0S4764VWSKLwOXQTzLWvfIbfzbMUsK4grSwQxJaE8 I+wCY/LSnyxbQRT28VkqLn3FsZ8seMdXi7sfJEFJ3DiV06i+fSaTrpppeU6exRxxfunsPz v7+jpoIlJfLZVBVFlA2oSK1vi5hwwlgwyD/Ng3mwAWQ2VwPbylR2cpedSsPTiA== 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 4V0tZy6890zlnM; Thu, 21 Mar 2024 18:02:18 +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 42LI2IZ9023496; Thu, 21 Mar 2024 18:02:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42LI2I7w023493; Thu, 21 Mar 2024 18:02:18 GMT (envelope-from git) Date: Thu, 21 Mar 2024 18:02:18 GMT Message-Id: <202403211802.42LI2I7w023493@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: b7bc96ccb104 - main - cad/librepcb: add support of OpenCascade List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: b7bc96ccb10409807aa1c39cf7dd3a7436476db0 Auto-Submitted: auto-generated The branch main has been updated by thierry: URL: https://cgit.FreeBSD.org/ports/commit/?id=b7bc96ccb10409807aa1c39cf7dd3a7436476db0 commit b7bc96ccb10409807aa1c39cf7dd3a7436476db0 Author: Thierry Thomas AuthorDate: 2024-03-17 16:36:42 +0000 Commit: Thierry Thomas CommitDate: 2024-03-21 18:01:18 +0000 cad/librepcb: add support of OpenCascade Patch from upstream, slightly modified because cad/opencascade has been fixed against the reported crash. PR: 277312 Approved by: yuri (maintainer) --- cad/librepcb/Makefile | 1 + .../files/patch-cmake_FindOpenCascade.cmake | 39 ++++++++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/cad/librepcb/Makefile b/cad/librepcb/Makefile index 9f02c5448433..9623bce62494 100644 --- a/cad/librepcb/Makefile +++ b/cad/librepcb/Makefile @@ -1,6 +1,7 @@ PORTNAME= librepcb DISTVERSION= 1.0.0 DISTVERSIONSUFFIX= -source +PORTREVISION= 1 CATEGORIES= cad MASTER_SITES= https://download.librepcb.org/releases/${DISTVERSION}/ diff --git a/cad/librepcb/files/patch-cmake_FindOpenCascade.cmake b/cad/librepcb/files/patch-cmake_FindOpenCascade.cmake new file mode 100644 index 000000000000..d18e7215354f --- /dev/null +++ b/cad/librepcb/files/patch-cmake_FindOpenCascade.cmake @@ -0,0 +1,39 @@ +--- cmake/FindOpenCascade.cmake.orig 2023-09-24 10:47:05 UTC ++++ cmake/FindOpenCascade.cmake +@@ -1,6 +1,3 @@ +-# Specify OpenCascade libraries needed for LibrePCB +-set(OCC_LIBRARIES TKXCAF TKXDESTEP) +- + # Add library + add_library(open_cascade INTERFACE) + add_library(OpenCascade::OpenCascade ALIAS open_cascade) +@@ -15,8 +12,16 @@ if(OpenCASCADE_FOUND) + # Try to find OCCT shared library on the system + find_package(OpenCASCADE CONFIG QUIET) + if(OpenCASCADE_FOUND) +- message(STATUS "Using system OpenCASCADE (OCCT)") ++ message(STATUS "Using system OpenCASCADE (OCCT ${OpenCASCADE_VERSION})") + ++ # Specify OpenCascade libraries needed for LibrePCB ++ # https://github.com/LibrePCB/LibrePCB/issues/1315 ++ if(OpenCASCADE_VERSION VERSION_GREATER_EQUAL 7.8.0) ++ set(OCC_LIBRARIES TKCAF TKDESTEP) ++ else() ++ set(OCC_LIBRARIES TKXCAF TKXDESTEP) ++ endif() ++ + # Populate target + target_include_directories( + open_cascade SYSTEM INTERFACE "${OpenCASCADE_INCLUDE_DIR}" +@@ -32,7 +37,10 @@ if(OCE_FOUND) + # Try to find OCE shared library on the system + find_package(OCE CONFIG QUIET) + if(OCE_FOUND) +- message(STATUS "Using system OpenCASCADE (OCE)") ++ message(STATUS "Using system OpenCASCADE (OCE ${OCE_VERSION})") ++ ++ # Specify OpenCascade libraries needed for LibrePCB ++ set(OCC_LIBRARIES TKXCAF TKXDESTEP) + + # Populate target + target_include_directories(