diff --git a/science/openmodelica/Makefile b/science/openmodelica/Makefile index c8871a14e888..e22cc9b6f70c 100644 --- a/science/openmodelica/Makefile +++ b/science/openmodelica/Makefile @@ -1,118 +1,117 @@ PORTNAME= openmodelica DISTVERSIONPREFIX= v -DISTVERSION= 1.24.2 +DISTVERSION= 1.24.3 CATEGORIES= science cad java DIST_SUBDIR= ${PORTNAME}-${PORTVERSION} PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ PATCHFILES= 0d83043bf3815a75549353acf15d333c3b675675.patch:-p1 # https://github.com/OpenModelica/OpenModelica/pull/12515 MAINTAINER= yuri@FreeBSD.org COMMENT= Modelica-based modeling and simulation environment WWW= https://openmodelica.org/ \ https://github.com/OpenModelica/OpenModelica LICENSE= OSMC-PL LICENSE_NAME= Public license for OpenModelica LICENSE_TEXT= See https://github.com/OpenModelica/OpenModelica/blob/master/OSMC-License.txt LICENSE_PERMS= auto-accept dist-mirror dist-sell pkg-mirror pkg-sell BROKEN_aarch64= link fails: ld: cannot find -lquadmath: No such file or directory BROKEN_armv7= link fails: ld: cannot find -lquadmath: No such file or directory BROKEN_i386= compilation fails: /wrkdirs/usr/ports/science/openmodelica/work/OpenModelica-1.20.0/OMCompiler/3rdParty/libffi/src/x86/sysv.S:841:1: error: changed section flags for .eh_frame, expected: 0x2 -BROKEN= fails to build with boost-1.86+ BUILD_DEPENDS= asciidoc:textproc/asciidoc \ autoconf>0:devel/autoconf \ automake:devel/automake \ gmake:devel/gmake \ libtool>0:devel/libtool \ ${LOCALBASE}/include/readline/readline.h:devel/readline \ sundials>0:math/sundials LIB_DEPENDS= libboost_filesystem.so:devel/boost-libs \ libcurl.so:ftp/curl \ libicuuc.so:devel/icu \ libosg.so:graphics/osg \ libuuid.so:misc/e2fsprogs-libuuid RUN_DEPENDS= bash:shells/bash \ gmake:devel/gmake USES= cmake compiler:c++14-lang iconv fortran gettext-runtime gl \ gnome blaslapack localbase:ldflags qt:5 readline pkgconfig \ python:build shebangfix USE_QT= concurrent core declarative gui location network opengl \ printsupport svg webchannel webengine widgets xml xmlpatterns \ buildtools:build qmake:build USE_GL= gl opengl USE_GNOME= libxml2 USE_JAVA= yes USE_LDCONFIG= ${PREFIX}/lib/omc ${PREFIX}/lib/omc/OMSimulator ${PREFIX}/lib/omc/cpp ${PREFIX}/lib/omc/ffi # https://github.com/OpenModelica/OpenModelica/issues/9925 USE_GITHUB= yes GH_ACCOUNT= OpenModelica GH_PROJECT= OpenModelica SHEBANG_GLOB= *.sh *.in *.ac GH_TUPLE= \ OpenModelica:OMOptim:f1036f43db18c5015da259771004cfb80e08a110:OpenModelica_OMOptim/OMOptim \ - OpenModelica:OMSimulator:6ed45ec:OpenModelica_OMSimulator/OMSimulator \ + OpenModelica:OMSimulator:46fa40f:OpenModelica_OMSimulator/OMSimulator \ OpenModelica:OMSimulator-3rdParty:5c10de1648d1134a577d9284b58580a72383d89f:OpenModelica_OMSimulator_3rdParty/OMSimulator/3rdParty \ - OpenModelica:OMCompiler-3rdParty:82e892e:OpenModelica_OMCompiler_3rdParty/OMCompiler/3rdParty \ - OpenModelica:OMSens:0d804d5:OpenModelica_OMSens/OMSens \ - OpenModelica:OMSens_Qt:a392576:OpenModelica_OMSens_Qt/OMSens_Qt \ + OpenModelica:OMCompiler-3rdParty:4bcf74a:OpenModelica_OMCompiler_3rdParty/OMCompiler/3rdParty \ + OpenModelica:OMSens:093ad11:OpenModelica_OMSens/OMSens \ + OpenModelica:OMSens_Qt:bab329a:OpenModelica_OMSens_Qt/OMSens_Qt \ OpenModelica:OpenModelica-common:08a01802db5ba5edb540383c46718b89ff229ef2:OpenModelica_OpenModelica_common/OMOptim/common \ OpenModelica:OpenModelica-common:08a01802db5ba5edb540383c46718b89ff229ef2:OpenModelica_OpenModelica_common/OMSens_Qt/common GH_TUPLE+= OpenModelica:OMBootstrapping:c289e97c41d00939a4a69fe504961b47283a6d8e:bootstrapping/OMCompiler/Compiler/boot/bomc # downloaded by cmake # this should change make program everywhere, but it doesn't, # hence the patches in OMCompiler/Compiler/runtime/CMakeLists.txt, OMEdit/OMEditLIB/Simulation/SimulationOutputWidget.cpp CMAKE_ARGS= -DCMAKE_MAKE_PROGRAM=gmake \ -DPython_EXECUTABLE=${PYTHON_CMD} CMAKE_ARGS+= -DOM_USE_CCACHE:BOOL=${CCACHE_ENABLED:S/yes/ON/:S/no/OFF/} # if refuses to build w/out ccache by default CMAKE_ON= OM_OMEDIT_ENABLE_QTWEBENGINE LDFLAGS+= -lexecinfo -lintl -pthread BINARY_ALIAS= make=${GMAKE} post-extract: # remove stray *.orig files @${FIND} ${WRKSRC} -name "*.orig" -delete # remove rtime that isn't used on FreeBSD @${RM} -r ${WRKSRC}/OMSimulator/OMTLMSimulator/3rdParty/rtime # prevent bootstrap file download #${MKDIR} ${WRKSRC}/bomc ${TOUCH} ${WRKSRC}/OMCompiler/Compiler/boot/bomc/sources.tar.gz # workaround for broken fetch @${RLN} ${WRKSRC}/OMOptim/common ${WRKSRC}/OMSens_Qt/common post-patch: # fix bash shebangs @${REINPLACE_CMD} -e 's|#!/bin/bash|#!${LOCALBASE}/bin/bash|' \ ${WRKSRC}/OMCompiler/Examples/GenerateDoc.mos \ ${WRKSRC}/OMCompiler/3rdParty/tbb/build/generate_tbbvars.sh # add path to libgfortran to link flags for OM internal builds @${REINPLACE_CMD} \ -e 's|@RT_LDFLAGS_GENERATED_CODE_SIM@|& -L${LOCALBASE}/lib/gcc${FC:S/gfortran//}|' \ ${WRKSRC}/OMCompiler/Compiler/Util/Autoconf.mo.in post-install: # workaround for https://github.com/OpenModelica/OpenModelica/issues/9919 #cd ${STAGEDIR}${PREFIX} && ${CHMOD} +x \ # bin/OMSimulator bin/OMSimulatorPython3 bin/StartTLMFmiWrapper # remove unnecessary files ${RM} -r \ ${STAGEDIR}${PREFIX}/share/zmq \ ${STAGEDIR}${PREFIX}/doc \ ${STAGEDIR}${PREFIX}/share/doc # remove empty directories ${FIND} ${STAGEDIR}${PREFIX}/include -type d -empty -delete # strip binaries #cd ${STAGEDIR}${PREFIX} && ${STRIP_CMD} \ bin/OMSimulator bin/FMIWrapper \ lib/omc/OMSimulator/libomtlmsimulator.so lib/omc/OMSimulator/libOMSimulator.so \ lib/omc/libomtlmsimulator.so lib/omc/libOMSimulator.so .include diff --git a/science/openmodelica/distinfo b/science/openmodelica/distinfo index 6067449d8ff8..ea904d76dd5b 100644 --- a/science/openmodelica/distinfo +++ b/science/openmodelica/distinfo @@ -1,21 +1,21 @@ -TIMESTAMP = 1731747767 -SHA256 (openmodelica-1.24.2/OpenModelica-OpenModelica-v1.24.2_GH0.tar.gz) = 7abafb1244afb9c78527fe8a5138027acf5ae7e2dda0684b672df2ab8ade12c3 -SIZE (openmodelica-1.24.2/OpenModelica-OpenModelica-v1.24.2_GH0.tar.gz) = 146948791 -SHA256 (openmodelica-1.24.2/OpenModelica-OMOptim-f1036f43db18c5015da259771004cfb80e08a110_GH0.tar.gz) = 11189c8ab3fb9d22ed805271ef53b9698b0d41007a1708d7a77ef074a5b20447 -SIZE (openmodelica-1.24.2/OpenModelica-OMOptim-f1036f43db18c5015da259771004cfb80e08a110_GH0.tar.gz) = 4022842 -SHA256 (openmodelica-1.24.2/OpenModelica-OMSimulator-6ed45ec_GH0.tar.gz) = 084e00bfd13942f81c072dec4a1ca9424a6e14587aad8f6f9f4c0f0f9f54dc38 -SIZE (openmodelica-1.24.2/OpenModelica-OMSimulator-6ed45ec_GH0.tar.gz) = 89937739 -SHA256 (openmodelica-1.24.2/OpenModelica-OMSimulator-3rdParty-5c10de1648d1134a577d9284b58580a72383d89f_GH0.tar.gz) = ea57e90ea76eca2657e8ddaa6c87301a16661200b3e8a00347a12bfdbb5f973d -SIZE (openmodelica-1.24.2/OpenModelica-OMSimulator-3rdParty-5c10de1648d1134a577d9284b58580a72383d89f_GH0.tar.gz) = 7637943 -SHA256 (openmodelica-1.24.2/OpenModelica-OMCompiler-3rdParty-82e892e_GH0.tar.gz) = f7f9b171e8716fb29cc4ca18cc950ac3dcc0628df46e11746b24dfad2868b5e3 -SIZE (openmodelica-1.24.2/OpenModelica-OMCompiler-3rdParty-82e892e_GH0.tar.gz) = 50208265 -SHA256 (openmodelica-1.24.2/OpenModelica-OMSens-0d804d5_GH0.tar.gz) = a2afae88880ddedd10ab8a5d76ce6405356f5d147f06b78110cd86bb9567553d -SIZE (openmodelica-1.24.2/OpenModelica-OMSens-0d804d5_GH0.tar.gz) = 8870432 -SHA256 (openmodelica-1.24.2/OpenModelica-OMSens_Qt-a392576_GH0.tar.gz) = bd2f3db40a1921d4ac8f9375ba655a97d2eff5804223352ae006fa2216e5a58a -SIZE (openmodelica-1.24.2/OpenModelica-OMSens_Qt-a392576_GH0.tar.gz) = 211271 -SHA256 (openmodelica-1.24.2/OpenModelica-OpenModelica-common-08a01802db5ba5edb540383c46718b89ff229ef2_GH0.tar.gz) = fdb5bb442da0375373ef221cf26195114bf149511c1c2be051caad6301c21c9a -SIZE (openmodelica-1.24.2/OpenModelica-OpenModelica-common-08a01802db5ba5edb540383c46718b89ff229ef2_GH0.tar.gz) = 36148 -SHA256 (openmodelica-1.24.2/OpenModelica-OMBootstrapping-c289e97c41d00939a4a69fe504961b47283a6d8e_GH0.tar.gz) = 986be2c217f8afcded765c3c30d4a89ff5f397d23c0ccbc1c838699ff8692d4e -SIZE (openmodelica-1.24.2/OpenModelica-OMBootstrapping-c289e97c41d00939a4a69fe504961b47283a6d8e_GH0.tar.gz) = 3329128 -SHA256 (openmodelica-1.24.2/0d83043bf3815a75549353acf15d333c3b675675.patch) = 444045777cacc3896be76e89869944346b4268df06c563309cc63f178fbc7188 -SIZE (openmodelica-1.24.2/0d83043bf3815a75549353acf15d333c3b675675.patch) = 826 +TIMESTAMP = 1734337153 +SHA256 (openmodelica-1.24.3/OpenModelica-OpenModelica-v1.24.3_GH0.tar.gz) = f5cc52aa0b653b916d8eeb376cc943284cd2a2c90bca93244187e32063196447 +SIZE (openmodelica-1.24.3/OpenModelica-OpenModelica-v1.24.3_GH0.tar.gz) = 146966947 +SHA256 (openmodelica-1.24.3/OpenModelica-OMOptim-f1036f43db18c5015da259771004cfb80e08a110_GH0.tar.gz) = 11189c8ab3fb9d22ed805271ef53b9698b0d41007a1708d7a77ef074a5b20447 +SIZE (openmodelica-1.24.3/OpenModelica-OMOptim-f1036f43db18c5015da259771004cfb80e08a110_GH0.tar.gz) = 4022842 +SHA256 (openmodelica-1.24.3/OpenModelica-OMSimulator-46fa40f_GH0.tar.gz) = eb5fbb88b2cf6a3556c43ee4c0b446fb26a70be06ddfb4031e50636dc1af1048 +SIZE (openmodelica-1.24.3/OpenModelica-OMSimulator-46fa40f_GH0.tar.gz) = 92370094 +SHA256 (openmodelica-1.24.3/OpenModelica-OMSimulator-3rdParty-5c10de1648d1134a577d9284b58580a72383d89f_GH0.tar.gz) = ea57e90ea76eca2657e8ddaa6c87301a16661200b3e8a00347a12bfdbb5f973d +SIZE (openmodelica-1.24.3/OpenModelica-OMSimulator-3rdParty-5c10de1648d1134a577d9284b58580a72383d89f_GH0.tar.gz) = 7637943 +SHA256 (openmodelica-1.24.3/OpenModelica-OMCompiler-3rdParty-4bcf74a_GH0.tar.gz) = 7bca155785476dc08ff7bf7bbefda9835caad1e8dcefca2758d2e5bc97a6dbe5 +SIZE (openmodelica-1.24.3/OpenModelica-OMCompiler-3rdParty-4bcf74a_GH0.tar.gz) = 50256209 +SHA256 (openmodelica-1.24.3/OpenModelica-OMSens-093ad11_GH0.tar.gz) = 335512c08f94902bb07e75278cea791370a551336272f7bebef8c707ef5e5e2b +SIZE (openmodelica-1.24.3/OpenModelica-OMSens-093ad11_GH0.tar.gz) = 8871049 +SHA256 (openmodelica-1.24.3/OpenModelica-OMSens_Qt-bab329a_GH0.tar.gz) = 2f2dcba4defd7f13e9fd5e0c26bb4951b9f1fcc7da64960a6ad1cee32a628efa +SIZE (openmodelica-1.24.3/OpenModelica-OMSens_Qt-bab329a_GH0.tar.gz) = 211270 +SHA256 (openmodelica-1.24.3/OpenModelica-OpenModelica-common-08a01802db5ba5edb540383c46718b89ff229ef2_GH0.tar.gz) = fdb5bb442da0375373ef221cf26195114bf149511c1c2be051caad6301c21c9a +SIZE (openmodelica-1.24.3/OpenModelica-OpenModelica-common-08a01802db5ba5edb540383c46718b89ff229ef2_GH0.tar.gz) = 36148 +SHA256 (openmodelica-1.24.3/OpenModelica-OMBootstrapping-c289e97c41d00939a4a69fe504961b47283a6d8e_GH0.tar.gz) = 986be2c217f8afcded765c3c30d4a89ff5f397d23c0ccbc1c838699ff8692d4e +SIZE (openmodelica-1.24.3/OpenModelica-OMBootstrapping-c289e97c41d00939a4a69fe504961b47283a6d8e_GH0.tar.gz) = 3329128 +SHA256 (openmodelica-1.24.3/0d83043bf3815a75549353acf15d333c3b675675.patch) = 444045777cacc3896be76e89869944346b4268df06c563309cc63f178fbc7188 +SIZE (openmodelica-1.24.3/0d83043bf3815a75549353acf15d333c3b675675.patch) = 826 diff --git a/science/openmodelica/files/patch-OMCompiler_SimulationRuntime_ParModelica_auto_pm__cluster__system.hpp b/science/openmodelica/files/patch-OMCompiler_SimulationRuntime_ParModelica_auto_pm__cluster__system.hpp new file mode 100644 index 000000000000..a316e59e609c --- /dev/null +++ b/science/openmodelica/files/patch-OMCompiler_SimulationRuntime_ParModelica_auto_pm__cluster__system.hpp @@ -0,0 +1,19 @@ +- workaround for https://github.com/OpenModelica/OpenModelica/issues/13413 + +--- OMCompiler/SimulationRuntime/ParModelica/auto/pm_cluster_system.hpp.orig 2024-12-16 08:23:05 UTC ++++ OMCompiler/SimulationRuntime/ParModelica/auto/pm_cluster_system.hpp +@@ -38,6 +38,7 @@ + */ + + #include ++#include + #include + + #include +@@ -534,4 +535,4 @@ class TaskSystem_v2 { + + }} // namespace openmodelica::parmodelica + +-#endif // header +\ No newline at end of file ++#endif // header diff --git a/science/openmodelica/files/patch-OMSimulator_CMakeLists.txt b/science/openmodelica/files/patch-OMSimulator_CMakeLists.txt new file mode 100644 index 000000000000..255b24edc548 --- /dev/null +++ b/science/openmodelica/files/patch-OMSimulator_CMakeLists.txt @@ -0,0 +1,13 @@ +- workaround for https://github.com/OpenModelica/OpenModelica/issues/13415 + +--- OMSimulator/CMakeLists.txt.orig 2024-12-16 17:36:25 UTC ++++ OMSimulator/CMakeLists.txt +@@ -68,7 +68,7 @@ add_subdirectory(src/OMSimulatorServer) + add_subdirectory(src/OMSimulatorLua) + add_subdirectory(src/OMSimulatorPython) + add_subdirectory(src/OMSimulatorServer) +-add_subdirectory(src/pip) ++#add_subdirectory(src/pip) + + add_subdirectory(doc) +