From 2e849cedb32a8e3ee37566f01b3d969647e39949 Mon Sep 17 00:00:00 2001 From: Yuri Victorovich Date: Sat, 5 Apr 2025 19:59:00 -0700 Subject: [PATCH] =?UTF-8?q?science/openmodelica:=20update=201.24.5=20?= =?UTF-8?q?=E2=86=92=201.25.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reported by: portscout --- science/openmodelica/Makefile | 8 ++-- science/openmodelica/distinfo | 40 +++++++++---------- ...OMCompiler_Compiler_runtime_CMakeLists.txt | 15 ------- ...ationRuntime_c_meta_meta__modelica__segv.c | 28 ------------- ...tLIB_Simulation_SimulationOutputWidget.cpp | 13 ------ .../patch-OMEdit_OMEditLIB_Util_Utilities.cpp | 11 ----- science/openmodelica/pkg-plist | 9 +++++ 7 files changed, 32 insertions(+), 92 deletions(-) delete mode 100644 science/openmodelica/files/patch-OMCompiler_Compiler_runtime_CMakeLists.txt delete mode 100644 science/openmodelica/files/patch-OMCompiler_SimulationRuntime_c_meta_meta__modelica__segv.c delete mode 100644 science/openmodelica/files/patch-OMEdit_OMEditLIB_Simulation_SimulationOutputWidget.cpp delete mode 100644 science/openmodelica/files/patch-OMEdit_OMEditLIB_Util_Utilities.cpp diff --git a/science/openmodelica/Makefile b/science/openmodelica/Makefile index 9e79eba2caa4..0140a1415d77 100644 --- a/science/openmodelica/Makefile +++ b/science/openmodelica/Makefile @@ -1,11 +1,11 @@ PORTNAME= openmodelica DISTVERSIONPREFIX= v -DISTVERSION= 1.24.5 +DISTVERSION= 1.25.0 CATEGORIES= science cad java DIST_SUBDIR= ${PORTNAME}-${PORTVERSION} -PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ -PATCHFILES= 6f8126fcd491d8c4d8b8c643bf0b6abd3a1f23f5.patch:-p1 # https://github.com/OpenModelica/OpenModelica/pull/13683 +#PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ +#PATCHFILES= 6f8126fcd491d8c4d8b8c643bf0b6abd3a1f23f5.patch:-p1 # https://github.com/OpenModelica/OpenModelica/pull/13683 MAINTAINER= yuri@FreeBSD.org COMMENT= Modelica-based modeling and simulation environment @@ -41,7 +41,7 @@ USES= cmake compiler:c++14-lang iconv fortran gettext-runtime gl \ python:build shebangfix java USE_QT= concurrent core declarative gui location network opengl \ printsupport svg webchannel webengine widgets xml xmlpatterns \ - buildtools:build qmake:build + buildtools:build linguisttools:build qmake:build USE_GL= gl opengl USE_GNOME= libxml2 USE_LDCONFIG= ${PREFIX}/lib/omc ${PREFIX}/lib/omc/OMSimulator ${PREFIX}/lib/omc/cpp ${PREFIX}/lib/omc/ffi # https://github.com/OpenModelica/OpenModelica/issues/9925 diff --git a/science/openmodelica/distinfo b/science/openmodelica/distinfo index 05ca95ef65c4..7311a47a4919 100644 --- a/science/openmodelica/distinfo +++ b/science/openmodelica/distinfo @@ -1,21 +1,19 @@ -TIMESTAMP = 1741539422 -SHA256 (openmodelica-1.24.5/OpenModelica-OpenModelica-v1.24.5_GH0.tar.gz) = 174f0dbe64fcad718e11dd1b064833d6f23ee8810cdb68a54d080a7cd6333398 -SIZE (openmodelica-1.24.5/OpenModelica-OpenModelica-v1.24.5_GH0.tar.gz) = 146976022 -SHA256 (openmodelica-1.24.5/OpenModelica-OMOptim-f1036f43db18c5015da259771004cfb80e08a110_GH0.tar.gz) = 11189c8ab3fb9d22ed805271ef53b9698b0d41007a1708d7a77ef074a5b20447 -SIZE (openmodelica-1.24.5/OpenModelica-OMOptim-f1036f43db18c5015da259771004cfb80e08a110_GH0.tar.gz) = 4022842 -SHA256 (openmodelica-1.24.5/OpenModelica-OMSimulator-46fa40f_GH0.tar.gz) = eb5fbb88b2cf6a3556c43ee4c0b446fb26a70be06ddfb4031e50636dc1af1048 -SIZE (openmodelica-1.24.5/OpenModelica-OMSimulator-46fa40f_GH0.tar.gz) = 92370094 -SHA256 (openmodelica-1.24.5/OpenModelica-OMSimulator-3rdParty-5c10de1648d1134a577d9284b58580a72383d89f_GH0.tar.gz) = ea57e90ea76eca2657e8ddaa6c87301a16661200b3e8a00347a12bfdbb5f973d -SIZE (openmodelica-1.24.5/OpenModelica-OMSimulator-3rdParty-5c10de1648d1134a577d9284b58580a72383d89f_GH0.tar.gz) = 7637943 -SHA256 (openmodelica-1.24.5/OpenModelica-OMCompiler-3rdParty-520663f_GH0.tar.gz) = 37c82357fc1e862eb13d79cf1ff2d143f263502472db9bb2c350c0c551022954 -SIZE (openmodelica-1.24.5/OpenModelica-OMCompiler-3rdParty-520663f_GH0.tar.gz) = 50256095 -SHA256 (openmodelica-1.24.5/OpenModelica-OMSens-093ad11_GH0.tar.gz) = 335512c08f94902bb07e75278cea791370a551336272f7bebef8c707ef5e5e2b -SIZE (openmodelica-1.24.5/OpenModelica-OMSens-093ad11_GH0.tar.gz) = 8871049 -SHA256 (openmodelica-1.24.5/OpenModelica-OMSens_Qt-bab329a_GH0.tar.gz) = 2f2dcba4defd7f13e9fd5e0c26bb4951b9f1fcc7da64960a6ad1cee32a628efa -SIZE (openmodelica-1.24.5/OpenModelica-OMSens_Qt-bab329a_GH0.tar.gz) = 211270 -SHA256 (openmodelica-1.24.5/OpenModelica-OpenModelica-common-08a01802db5ba5edb540383c46718b89ff229ef2_GH0.tar.gz) = fdb5bb442da0375373ef221cf26195114bf149511c1c2be051caad6301c21c9a -SIZE (openmodelica-1.24.5/OpenModelica-OpenModelica-common-08a01802db5ba5edb540383c46718b89ff229ef2_GH0.tar.gz) = 36148 -SHA256 (openmodelica-1.24.5/OpenModelica-OMBootstrapping-91938f0acbdc6e9ba91114376e3640ca6147b579_GH0.tar.gz) = 1a0327dabedd09dab3aa872af194b6d4e79bacc45659ea3154076e7f1f54b2cc -SIZE (openmodelica-1.24.5/OpenModelica-OMBootstrapping-91938f0acbdc6e9ba91114376e3640ca6147b579_GH0.tar.gz) = 3328929 -SHA256 (openmodelica-1.24.5/6f8126fcd491d8c4d8b8c643bf0b6abd3a1f23f5.patch) = d19d8bd980741cd5782522ed06747650cea375817c0710e17aa9ede439eae688 -SIZE (openmodelica-1.24.5/6f8126fcd491d8c4d8b8c643bf0b6abd3a1f23f5.patch) = 1394 +TIMESTAMP = 1743866725 +SHA256 (openmodelica-1.25.0/OpenModelica-OpenModelica-v1.25.0_GH0.tar.gz) = 77c810ca3a1b72f7f96af2bfbf7bba0162136c76b3e83771b7d82db16c65a1a0 +SIZE (openmodelica-1.25.0/OpenModelica-OpenModelica-v1.25.0_GH0.tar.gz) = 148273042 +SHA256 (openmodelica-1.25.0/OpenModelica-OMOptim-f1036f43db18c5015da259771004cfb80e08a110_GH0.tar.gz) = 11189c8ab3fb9d22ed805271ef53b9698b0d41007a1708d7a77ef074a5b20447 +SIZE (openmodelica-1.25.0/OpenModelica-OMOptim-f1036f43db18c5015da259771004cfb80e08a110_GH0.tar.gz) = 4022842 +SHA256 (openmodelica-1.25.0/OpenModelica-OMSimulator-46fa40f_GH0.tar.gz) = eb5fbb88b2cf6a3556c43ee4c0b446fb26a70be06ddfb4031e50636dc1af1048 +SIZE (openmodelica-1.25.0/OpenModelica-OMSimulator-46fa40f_GH0.tar.gz) = 92370094 +SHA256 (openmodelica-1.25.0/OpenModelica-OMSimulator-3rdParty-5c10de1648d1134a577d9284b58580a72383d89f_GH0.tar.gz) = ea57e90ea76eca2657e8ddaa6c87301a16661200b3e8a00347a12bfdbb5f973d +SIZE (openmodelica-1.25.0/OpenModelica-OMSimulator-3rdParty-5c10de1648d1134a577d9284b58580a72383d89f_GH0.tar.gz) = 7637943 +SHA256 (openmodelica-1.25.0/OpenModelica-OMCompiler-3rdParty-520663f_GH0.tar.gz) = 37c82357fc1e862eb13d79cf1ff2d143f263502472db9bb2c350c0c551022954 +SIZE (openmodelica-1.25.0/OpenModelica-OMCompiler-3rdParty-520663f_GH0.tar.gz) = 50256095 +SHA256 (openmodelica-1.25.0/OpenModelica-OMSens-093ad11_GH0.tar.gz) = 335512c08f94902bb07e75278cea791370a551336272f7bebef8c707ef5e5e2b +SIZE (openmodelica-1.25.0/OpenModelica-OMSens-093ad11_GH0.tar.gz) = 8871049 +SHA256 (openmodelica-1.25.0/OpenModelica-OMSens_Qt-bab329a_GH0.tar.gz) = 2f2dcba4defd7f13e9fd5e0c26bb4951b9f1fcc7da64960a6ad1cee32a628efa +SIZE (openmodelica-1.25.0/OpenModelica-OMSens_Qt-bab329a_GH0.tar.gz) = 211270 +SHA256 (openmodelica-1.25.0/OpenModelica-OpenModelica-common-08a01802db5ba5edb540383c46718b89ff229ef2_GH0.tar.gz) = fdb5bb442da0375373ef221cf26195114bf149511c1c2be051caad6301c21c9a +SIZE (openmodelica-1.25.0/OpenModelica-OpenModelica-common-08a01802db5ba5edb540383c46718b89ff229ef2_GH0.tar.gz) = 36148 +SHA256 (openmodelica-1.25.0/OpenModelica-OMBootstrapping-91938f0acbdc6e9ba91114376e3640ca6147b579_GH0.tar.gz) = 1a0327dabedd09dab3aa872af194b6d4e79bacc45659ea3154076e7f1f54b2cc +SIZE (openmodelica-1.25.0/OpenModelica-OMBootstrapping-91938f0acbdc6e9ba91114376e3640ca6147b579_GH0.tar.gz) = 3328929 diff --git a/science/openmodelica/files/patch-OMCompiler_Compiler_runtime_CMakeLists.txt b/science/openmodelica/files/patch-OMCompiler_Compiler_runtime_CMakeLists.txt deleted file mode 100644 index e4efc44b1f1b..000000000000 --- a/science/openmodelica/files/patch-OMCompiler_Compiler_runtime_CMakeLists.txt +++ /dev/null @@ -1,15 +0,0 @@ ---- OMCompiler/Compiler/runtime/CMakeLists.txt.orig 2023-04-14 14:33:28 UTC -+++ OMCompiler/Compiler/runtime/CMakeLists.txt -@@ -234,7 +234,11 @@ endif() - if (MINGW) - set(OMC_MAKE_EXE "mingw32-make") - else() -- set(OMC_MAKE_EXE "make") -+ if(CMAKE_HOST_SYSTEM_NAME STREQUAL "FreeBSD") -+ set(OMC_MAKE_EXE "gmake") -+ else() -+ set(OMC_MAKE_EXE "make") -+ endif() - endif() - - set(OMC_CMAKE_EXE "${CMAKE_COMMAND}") diff --git a/science/openmodelica/files/patch-OMCompiler_SimulationRuntime_c_meta_meta__modelica__segv.c b/science/openmodelica/files/patch-OMCompiler_SimulationRuntime_c_meta_meta__modelica__segv.c deleted file mode 100644 index f53fd11e2c14..000000000000 --- a/science/openmodelica/files/patch-OMCompiler_SimulationRuntime_c_meta_meta__modelica__segv.c +++ /dev/null @@ -1,28 +0,0 @@ -- replace the pthread_getattr_np function - ---- OMCompiler/SimulationRuntime/c/meta/meta_modelica_segv.c.orig 2023-10-04 02:19:12 UTC -+++ OMCompiler/SimulationRuntime/c/meta/meta_modelica_segv.c -@@ -35,6 +35,10 @@ - /* for pthread_getattr_np */ - #endif - -+#if defined(__FreeBSD__) -+#include -+#endif -+ - #include "meta_modelica.h" - - void* mmc_getStacktraceMessages_threadData(threadData_t *threadData) -@@ -192,7 +196,12 @@ static void* getStackBase() { - size_t size = 0; - pthread_attr_t sattr; - pthread_attr_init(&sattr); -+#if defined(__FreeBSD__) -+ pthread_attr_init(&sattr); -+ pthread_attr_get_np(self, &sattr); -+#elif defined(OS_LINUX) - pthread_getattr_np(self, &sattr); -+#endif - assert(0==pthread_attr_getstack(&sattr, &stackBottom, &size)); - assert(stackBottom); - pthread_attr_destroy(&sattr); diff --git a/science/openmodelica/files/patch-OMEdit_OMEditLIB_Simulation_SimulationOutputWidget.cpp b/science/openmodelica/files/patch-OMEdit_OMEditLIB_Simulation_SimulationOutputWidget.cpp deleted file mode 100644 index a80b0dd09db8..000000000000 --- a/science/openmodelica/files/patch-OMEdit_OMEditLIB_Simulation_SimulationOutputWidget.cpp +++ /dev/null @@ -1,13 +0,0 @@ ---- OMEdit/OMEditLIB/Simulation/SimulationOutputWidget.cpp.orig 2022-12-12 04:38:34 UTC -+++ OMEdit/OMEditLIB/Simulation/SimulationOutputWidget.cpp -@@ -577,8 +577,8 @@ void SimulationOutputWidget::compileModel() - args << "-j" + numProcs; - } - args << "-f" << mSimulationOptions.getOutputFileName() + ".makefile"; -- writeCompilationOutput(QString("%1 %2\n").arg("make").arg(args.join(" ")), Qt::blue); -- mpCompilationProcess->start("make", args); -+ writeCompilationOutput(QString("%1 %2\n").arg("gmake").arg(args.join(" ")), Qt::blue); -+ mpCompilationProcess->start("gmake", args); - #endif - } - diff --git a/science/openmodelica/files/patch-OMEdit_OMEditLIB_Util_Utilities.cpp b/science/openmodelica/files/patch-OMEdit_OMEditLIB_Util_Utilities.cpp deleted file mode 100644 index 24df8db90a43..000000000000 --- a/science/openmodelica/files/patch-OMEdit_OMEditLIB_Util_Utilities.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- OMEdit/OMEditLIB/Util/Utilities.cpp.orig 2023-04-14 14:33:28 UTC -+++ OMEdit/OMEditLIB/Util/Utilities.cpp -@@ -1019,7 +1019,7 @@ QIcon Utilities::FileIconProvider::FileIconProviderImp - // Get icon from OS. - QIcon icon; - // File icons are unknown on linux systems. --#if defined(Q_OS_LINUX) -+#if defined(Q_OS_UNIX) - icon = isDir ? QFileIconProvider::icon(fileInfo) : mUnknownFileIcon; - #else - icon = QFileIconProvider::icon(fileInfo); diff --git a/science/openmodelica/pkg-plist b/science/openmodelica/pkg-plist index 06d6b64644ba..2f3a85526399 100644 --- a/science/openmodelica/pkg-plist +++ b/science/openmodelica/pkg-plist @@ -896,6 +896,15 @@ share/omc/sources/c/util/simulation_options.c share/omc/sources/c/util/string_array.c share/omc/sources/c/util/utility.c share/omc/sources/c/util/varinfo.c +share/omedit/nls/OMEdit_de.qm +share/omedit/nls/OMEdit_es.qm +share/omedit/nls/OMEdit_fr.qm +share/omedit/nls/OMEdit_it.qm +share/omedit/nls/OMEdit_ja.qm +share/omedit/nls/OMEdit_ro.qm +share/omedit/nls/OMEdit_ru.qm +share/omedit/nls/OMEdit_sv.qm +share/omedit/nls/OMEdit_zh_CN.qm share/omnotebook/OMNotebookHelp.onb share/omnotebook/commands.xml share/omnotebook/drmodelica/AccessControl/AccessDemo.onb