From nobody Thu Mar 21 18:02:21 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 4V0tb13qj9z5F9YM; Thu, 21 Mar 2024 18:02:21 +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 4V0tb11VDwz46DX; Thu, 21 Mar 2024 18:02:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711044141; 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=DkYcC4r2H13LRnedLqn5EsCnx+dIBqyvPT9vOS58+qk=; b=tQ2/vLNmLjkhXohXRjAQNvXbGseDbBDGkB1t7FxKKUfxAHVCbHVIQC5HyvzcPoKcSHn2JS 3XTGXiSDi5Y0t5Kp7l5CDGobHR+pLI9VyhFEB5L/EXHXEpnbKSNNjocInZvUDW0oPfegnz MXo6ZIyfLvEeOfZF4PaqNl576Qh7RynNkldOEUxwK6R5VeSNn89Fi6/SNYVGwkwEND8561 6yQ9wyQVQQ7y9dWd5tPqgEPuJDmCLCkxRDG0pNJAFZhUU5Cs5mCSsFnj/lzEAQBwmizHHP fxL+8oao4mbBQQisCQZ7VaUPh8/L21Avd3x1RmtDp58ma7pMBnctQXuHZkbEzQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711044141; a=rsa-sha256; cv=none; b=uAaAB2EE35NBx7rIuwXpT60BMNrE3ELXyNLTVvMgO03dny4EtoMOSivoS0QkkBpehsBFYp cDynGxg+gQqG3UutGl0cFBsACv209NFEPq2+4eSHSE5kFIdX3ZrOGE3Jnh7srtO+nCJINj MUBCOERzTu19kladDeGCDh6lPqV6T+pIQ7mRlEfhPafWHXNaggrXYSLQNk48lnRpcAGoeZ 9e+Nn/ALzEapvPUKEDIvgiYckWmpjSV21ZiTES+kTKOgTj4TZGxcznLP3CIJI8HNR23DkN RgTDucxte7K1bWKC4c4tbnFwimXyCYlE4syHFlyHpdZbTwC3zeX+1+KZBo/hFA== 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=1711044141; 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=DkYcC4r2H13LRnedLqn5EsCnx+dIBqyvPT9vOS58+qk=; b=Bv+DybAInMhEbVoKTo+F01ZuxS5DC9vOKGkMe0Ju0A61IT+ryX0nsnT7dNQgigzbYB7LBi OChGgFJ4XbmgXHM+MqXYVkE9MC9IW2wJMT3JuVe01UIcdJZU/9rVt8pO+8SRCs4PjDwG6n sMKD3sxNxVVbAJLiRJr9ydjocSp1RM/PGWVOQCfPz9PCusdFVuKVqaZ3vg2CWRTJ20Wmlw 5UmVf9xyehtMi+8QwgYGidT0W369tV8BDCYSsnTdmaI/o4v98ycOPrELoLH1+cWGxELCCh MX8I23+pGD44meRrEO/qHmJ0Ik+6agANuz6G/SWMLliVMotFXLuRFv8w0J18nw== 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 4V0tb111yhzmK9; Thu, 21 Mar 2024 18:02:21 +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 42LI2LUT023587; Thu, 21 Mar 2024 18:02:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42LI2LYH023584; Thu, 21 Mar 2024 18:02:21 GMT (envelope-from git) Date: Thu, 21 Mar 2024 18:02:21 GMT Message-Id: <202403211802.42LI2LYH023584@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: 6935b6360e88 - main - cad/gmsh: support of OpenCascade 7.8.0 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: 6935b6360e884afbd9e81e188ae43a994fc91b9b Auto-Submitted: auto-generated The branch main has been updated by thierry: URL: https://cgit.FreeBSD.org/ports/commit/?id=6935b6360e884afbd9e81e188ae43a994fc91b9b commit 6935b6360e884afbd9e81e188ae43a994fc91b9b Author: Thierry Thomas AuthorDate: 2024-03-18 08:40:45 +0000 Commit: Thierry Thomas CommitDate: 2024-03-21 18:01:19 +0000 cad/gmsh: support of OpenCascade 7.8.0 Backport of the patch e97e555 from upstream. PR: 277314 Approved by: wen (maintainer) --- cad/gmsh/Makefile | 2 +- cad/gmsh/files/patch-CMakeLists.txt | 170 ++++++++++++++++++++++++++++++++++++ 2 files changed, 171 insertions(+), 1 deletion(-) diff --git a/cad/gmsh/Makefile b/cad/gmsh/Makefile index 9b5e2516d39c..047c30362b5e 100644 --- a/cad/gmsh/Makefile +++ b/cad/gmsh/Makefile @@ -1,6 +1,6 @@ PORTNAME= gmsh DISTVERSION= 4.11.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= cad MASTER_SITES= http://gmsh.info/src/ DISTNAME= ${PORTNAME}-${PORTVERSION}-source diff --git a/cad/gmsh/files/patch-CMakeLists.txt b/cad/gmsh/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..1b16dc9cb329 --- /dev/null +++ b/cad/gmsh/files/patch-CMakeLists.txt @@ -0,0 +1,170 @@ +--- CMakeLists.txt.orig 2022-12-20 15:30:55 UTC ++++ CMakeLists.txt +@@ -1,4 +1,4 @@ +-# Gmsh - Copyright (C) 1997-2022 C. Geuzaine, J.-F. Remacle ++# Gmsh - Copyright (C) 1997-2023 C. Geuzaine, J.-F. Remacle + # + # See the LICENSE.txt file in the Gmsh root directory for license information. + # Please report all issues on https://gitlab.onelab.info/gmsh/gmsh/issues. +@@ -107,8 +107,8 @@ set(GMSH_MAJOR_VERSION 4) + opt(ZIPPER "Enable Zip file compression/decompression" OFF) + + set(GMSH_MAJOR_VERSION 4) +-set(GMSH_MINOR_VERSION 11) +-set(GMSH_PATCH_VERSION 1) ++set(GMSH_MINOR_VERSION 12) ++set(GMSH_PATCH_VERSION 0) + if(NOT GMSH_EXTRA_VERSION) + set(GMSH_EXTRA_VERSION "") + endif() +@@ -343,13 +343,19 @@ if(ENABLE_OPENMP) + "${CMAKE_CXX_FLAGS} -Xpreprocessor -fopenmp -I/opt/local/include/libomp") + list(APPEND EXTERNAL_LIBRARIES "-L/opt/local/lib/libomp -lomp") + elseif(APPLE AND EXISTS "/usr/local/lib/libomp.dylib") +- # official Apple compiler with homebrew's libomp ++ # official Apple compiler with homebrew's libomp on Intel + set_config_option(HAVE_OPENMP "OpenMP[Homebrew]") ++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Xpreprocessor -fopenmp") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Xpreprocessor -fopenmp") ++ list(APPEND EXTERNAL_LIBRARIES "-L/usr/local/lib -lomp") ++ elseif(APPLE AND EXISTS "/opt/homebrew/opt/libomp") ++ # official Apple compiler with homebrew's libomp on M processors ++ set_config_option(HAVE_OPENMP "OpenMP[Homebrew]") + set(CMAKE_C_FLAGS +- "${CMAKE_C_FLAGS} -Xpreprocessor -fopenmp") ++ "${CMAKE_C_FLAGS} -Xpreprocessor -fopenmp -I/opt/homebrew/opt/libomp/include") + set(CMAKE_CXX_FLAGS +- "${CMAKE_CXX_FLAGS} -Xpreprocessor -fopenmp") +- list(APPEND EXTERNAL_LIBRARIES "-L/usr/local/lib -lomp") ++ "${CMAKE_CXX_FLAGS} -Xpreprocessor -fopenmp -I/opt/homebrew/opt/libomp/include") ++ list(APPEND EXTERNAL_LIBRARIES "-L/opt/homebrew/opt/libomp/lib -lomp") + elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux" AND EXISTS "/usr/local/lib64/libgomp.a") + # custom static openmp for official linux builds + set_config_option(HAVE_OPENMP "OpenMP[static]") +@@ -1101,9 +1107,9 @@ if(HAVE_SOLVER) + string(REPLACE " " ";" PETSC_PACKAGES_INCLUDES ${PETSC_PACKAGES_INCLUDES}) + foreach(VAR ${PETSC_PACKAGES_INCLUDES}) + # seem to include unexisting directories (/usr/include/lib64) +- # check to avoid warnings +- if(EXISTS ${VAR}) +- list(APPEND EXTERNAL_INCLUDES ${VAR}) ++ # check to avoid warnings ++ if(EXISTS ${VAR}) ++ list(APPEND EXTERNAL_INCLUDES ${VAR}) + endif() + endforeach() + endif() +@@ -1119,10 +1125,10 @@ if(HAVE_SOLVER) + endif() + if(PETSC_LIBS) + set_config_option(HAVE_PETSC "PETSc") +- if(NOT HAVE_BLAS) ++ if(NOT HAVE_BLAS) + set_config_option(HAVE_BLAS "Blas[petsc]") + endif() +- if(NOT HAVE_LAPACK) ++ if(NOT HAVE_LAPACK) + set_config_option(HAVE_LAPACK "Lapack[petsc]") + endif() + endif() +@@ -1264,21 +1270,34 @@ if(ENABLE_OCC) + message(STATUS "Found OpenCASCADE version ${OCC_VERSION} in ${OCC_INC}") + endif() + endif() +- if(OCC_VERSION AND OCC_VERSION STRLESS ${OCC_MINIMAL_VERSION}) ++ if(OCC_VERSION AND OCC_VERSION VERSION_LESS ${OCC_MINIMAL_VERSION}) + message(WARNING "Gmsh requires OpenCASCADE >= ${OCC_MINIMAL_VERSION}. " + "Use CMAKE_PREFIX_PATH or the CASROOT environment variable " + "to explicitly specify the installation path of OpenCASCADE") + elseif(OCC_INC) +- set(OCC_LIBS_REQUIRED +- # subset of DataExchange +- TKSTEP TKSTEP209 TKSTEPAttr TKSTEPBase TKIGES TKXSBase +- # ModelingAlgorithms +- TKOffset TKFeat TKFillet TKBool TKMesh TKHLR TKBO TKPrim TKShHealing +- TKTopAlgo TKGeomAlgo +- # ModelingData +- TKBRep TKGeomBase TKG3d TKG2d +- # FoundationClasses +- TKMath TKernel) ++ if(OCC_VERSION AND OCC_VERSION VERSION_GREATER_EQUAL "7.8.0") ++ set(OCC_LIBS_REQUIRED ++ # subset of DataExchange ++ TKDESTEP TKDEIGES TKXSBase ++ # ModelingAlgorithms ++ TKOffset TKFeat TKFillet TKBool TKMesh TKHLR TKBO TKPrim TKShHealing ++ TKTopAlgo TKGeomAlgo ++ # ModelingData ++ TKBRep TKGeomBase TKG3d TKG2d ++ # FoundationClasses ++ TKMath TKernel) ++ else() ++ set(OCC_LIBS_REQUIRED ++ # subset of DataExchange ++ TKSTEP TKSTEP209 TKSTEPAttr TKSTEPBase TKIGES TKXSBase ++ # ModelingAlgorithms ++ TKOffset TKFeat TKFillet TKBool TKMesh TKHLR TKBO TKPrim TKShHealing ++ TKTopAlgo TKGeomAlgo ++ # ModelingData ++ TKBRep TKGeomBase TKG3d TKG2d ++ # FoundationClasses ++ TKMath TKernel) ++ endif() + if(ENABLE_OCC_TBB) + list(APPEND OCC_LIBS_REQUIRED tbb tbbmalloc) + endif() +@@ -1310,8 +1329,13 @@ if(ENABLE_OCC) + if(ENABLE_OCC_CAF) + find_package(Freetype) + if(FREETYPE_FOUND) +- set(OCC_CAF_LIBS_REQUIRED +- TKXDESTEP TKXDEIGES TKXCAF TKLCAF TKVCAF TKCAF TKV3d TKService TKCDF) ++ if(OCC_VERSION AND OCC_VERSION VERSION_GREATER_EQUAL "7.8.0") ++ set(OCC_CAF_LIBS_REQUIRED ++ TKXCAF TKLCAF TKVCAF TKCAF TKV3d TKService TKCDF) ++ else() ++ set(OCC_CAF_LIBS_REQUIRED ++ TKXDESTEP TKXDEIGES TKXCAF TKLCAF TKVCAF TKCAF TKV3d TKService TKCDF) ++ endif() + list(LENGTH OCC_CAF_LIBS_REQUIRED NUM_OCC_CAF_LIBS_REQUIRED) + set(OCC_CAF_LIBS) + foreach(OCC ${OCC_CAF_LIBS_REQUIRED}) +@@ -1493,6 +1517,10 @@ if(WALL AND NOT MSVC) + # FIXME: remove this when GCC behaves more intelligently + set(WF "${WF} -Wno-attributes") + endif() ++ check_cxx_compiler_flag("-Wno-unused-but-set-variable" WUNUSED) ++ if(WUNUSED) ++ set(WF "${WF} -Wno-unused-but-set-variable") ++ endif() + if(WIN32 OR NOT HAVE_64BIT_SIZE_T) + # FIXME: remove printf family warnings on 32 bit systems and windows + check_cxx_compiler_flag("-Wno-format" WFORMAT) +@@ -1768,8 +1796,10 @@ elseif(APPLE) + elseif(MSVC) + set_target_properties(gmsh PROPERTIES LINK_FLAGS "/STACK:16777216 /SAFESEH:NO") + elseif(APPLE) +- # this remove ld warnings with PETSc+MUMPS on recent macOS versions +- # set_target_properties(gmsh PROPERTIES LINK_FLAGS "-Wl,-no_compact_unwind") ++ # this remove ld warnings with PETSc+MUMPS on recent macOS versions; but ++ # breaks exception handling ++ # set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-no_compact_unwind") ++ # set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-no_compact_unwind") + endif() + + # android target +@@ -2203,9 +2233,6 @@ if(ENABLE_TESTS AND NOT DISABLE_GMSH_TESTS) + set(FLAGS "${FLAGS} -mconsole") + endif() + set_target_properties(${TEST} PROPERTIES LINK_FLAGS "${FLAGS}") +- elseif(APPLE) +- # this remove ld warnings with PETSc+MUMPS on recent macOS versions +- # set_target_properties(${TEST} PROPERTIES LINK_FLAGS "-Wl,-no_compact_unwind") + endif() + add_test(${TEST} ${TEST} -nopopup) + endforeach() +@@ -2245,3 +2272,4 @@ mark_as_advanced(ANN_INC ANN_LIB CAIRO_LIB CAIRO_INC C + PETSC_LIBS SLEPC_INC SLEPC_INC2 SLEPC_LIB + BISON FLEX MAKEINFO TEXI2PDF FLTK_CONFIG_SCRIPT + GMSH_EXTERNAL_INCLUDE_DIRS GMSH_EXTERNAL_LIBRARIES) ++