git: 2d44da87e31f - main - science/openmodelica: update 1.22.0-beta-1 → 1.22.0
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 09 Dec 2023 21:50:06 UTC
The branch main has been updated by yuri:
URL: https://cgit.FreeBSD.org/ports/commit/?id=2d44da87e31f73e6810722f012e008be2e4e33ed
commit 2d44da87e31f73e6810722f012e008be2e4e33ed
Author: Jason E. Hale <jhale@FreeBSD.org>
AuthorDate: 2023-12-09 21:47:53 +0000
Commit: Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2023-12-09 21:50:03 +0000
science/openmodelica: update 1.22.0-beta-1 → 1.22.0
PR: 275535
---
science/openmodelica/Makefile | 40 ++++++++++++++++++++++------------------
science/openmodelica/distinfo | 40 +++++++++++++++++++++-------------------
2 files changed, 43 insertions(+), 37 deletions(-)
diff --git a/science/openmodelica/Makefile b/science/openmodelica/Makefile
index 79698d3de465..5620a39863ef 100644
--- a/science/openmodelica/Makefile
+++ b/science/openmodelica/Makefile
@@ -1,9 +1,12 @@
PORTNAME= openmodelica
-#DISTVERSIONPREFIX= v
-DISTVERSION= 1.22.0-beta-1
+DISTVERSIONPREFIX= v
+DISTVERSION= 1.22.0
CATEGORIES= science cad java
DIST_SUBDIR= ${PORTNAME}-${PORTVERSION}
+PATCH_SITES= https://github.com/OpenModelica/OpenModelica/commit/
+PATCHFILES+= 0f4b4ce89dca64287dd4c7a19a6aa98114ea563c.patch:-p1 # Qt WebEngine support
+
MAINTAINER= yuri@FreeBSD.org
COMMENT= Modelica-based modeling and simulation environment
WWW= https://openmodelica.org/
@@ -13,8 +16,6 @@ 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
-DEPRECATED= Depends on deprecated www/qt5-webkit
-EXPIRATION_DATE= 2023-12-31
BROKEN_aarch64= link fails: /usr/local/bin/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
@@ -31,8 +32,12 @@ LIB_DEPENDS= libboost_filesystem.so:devel/boost-libs \
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 gui network opengl printsupport svg webkit widgets xml xmlpatterns buildtools:build qmake:build
+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 network opengl \
+ printsupport svg webchannel webengine widgets xml xmlpatterns \
+ buildtools:build qmake:build
USE_GL= gl opengl
USE_GNOME= libxml2
USE_JAVA= yes
@@ -41,21 +46,19 @@ USE_LDCONFIG= ${PREFIX}/lib/omc ${PREFIX}/lib/omc/OMSimulator ${PREFIX}/lib/omc/
USE_GITHUB= yes
GH_ACCOUNT= OpenModelica
GH_PROJECT= OpenModelica
-GH_TAGNAME= v1.22.0-dev.beta.1
SHEBANG_GLOB= *.sh *.in *.ac
-GH_TUPLE= \
- OpenModelica:OMOptim:55102095970c73a4176820538d19aaf408515da9:OpenModelica_OMOptim/OMOptim \
- OpenModelica:OMSimulator:634b0193a3eb14e75622a8e720bf0fb6dab77487:OpenModelica_OMSimulator/OMSimulator \
- OpenModelica:OMSimulator-3rdParty:b4c3aa4a16a5920e88096780498cc4af157f3c05:OpenModelica_OMSimulator_3rdParty/OMSimulator/3rdParty \
- OpenModelica:OMCompiler-3rdParty:ad7c7b11370e8faf08b720010f40846c53adfed5:OpenModelica_OMCompiler_3rdParty/OMCompiler/3rdParty \
- OpenModelica:OMSens:8216eaefbb4ea2ff0c7a17a3487dcc2a8a17667d:OpenModelica_OMSens/OMSens \
- OpenModelica:OMSens_Qt:ff2ade18e7058f611ddfd575ccbd24f388615d3f: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:c233b75:bootstrapping/OMCompiler/Compiler/boot/bomc # downloaded by cmake
-
+GH_TUPLE= \
+ OpenModelica:OMOptim:55102095970c73a4176820538d19aaf408515da9:OpenModelica_OMOptim/OMOptim \
+ OpenModelica:OMSimulator:634b0193a3eb14e75622a8e720bf0fb6dab77487:OpenModelica_OMSimulator/OMSimulator \
+ OpenModelica:OMSimulator-3rdParty:b4c3aa4a16a5920e88096780498cc4af157f3c05:OpenModelica_OMSimulator_3rdParty/OMSimulator/3rdParty \
+ OpenModelica:OMCompiler-3rdParty:d19136844b49720ae3a8957f0fb1e137c7055b43:OpenModelica_OMCompiler_3rdParty/OMCompiler/3rdParty \
+ OpenModelica:OMSens:8216eaefbb4ea2ff0c7a17a3487dcc2a8a17667d:OpenModelica_OMSens/OMSens \
+ OpenModelica:OMSens_Qt:ff2ade18e7058f611ddfd575ccbd24f388615d3f: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
@@ -63,6 +66,7 @@ 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
diff --git a/science/openmodelica/distinfo b/science/openmodelica/distinfo
index 48174a6801d0..0af48628d4f8 100644
--- a/science/openmodelica/distinfo
+++ b/science/openmodelica/distinfo
@@ -1,19 +1,21 @@
-TIMESTAMP = 1696532157
-SHA256 (openmodelica-1.22.0.b.1/OpenModelica-OpenModelica-1.22.0-beta-1-v1.22.0-dev.beta.1_GH0.tar.gz) = 4358acdc10d0d902d7498b0def26d5478ffaf76cb9e876b7eb5cb5f1787668d5
-SIZE (openmodelica-1.22.0.b.1/OpenModelica-OpenModelica-1.22.0-beta-1-v1.22.0-dev.beta.1_GH0.tar.gz) = 92733670
-SHA256 (openmodelica-1.22.0.b.1/OpenModelica-OMOptim-55102095970c73a4176820538d19aaf408515da9_GH0.tar.gz) = c972df0280e3abb689db11bfa34832f54ba81be65a7f9079150b8cbd8f515fe9
-SIZE (openmodelica-1.22.0.b.1/OpenModelica-OMOptim-55102095970c73a4176820538d19aaf408515da9_GH0.tar.gz) = 4022723
-SHA256 (openmodelica-1.22.0.b.1/OpenModelica-OMSimulator-634b0193a3eb14e75622a8e720bf0fb6dab77487_GH0.tar.gz) = fd063d0b7921a45d38cf0c63bbeb53f3f66206632fae4e1aadfb1b9f334b3492
-SIZE (openmodelica-1.22.0.b.1/OpenModelica-OMSimulator-634b0193a3eb14e75622a8e720bf0fb6dab77487_GH0.tar.gz) = 87881474
-SHA256 (openmodelica-1.22.0.b.1/OpenModelica-OMSimulator-3rdParty-b4c3aa4a16a5920e88096780498cc4af157f3c05_GH0.tar.gz) = a5dd5a4ea2494471db0ff5879a966666606685beb952ee50b06a362f0c5d841f
-SIZE (openmodelica-1.22.0.b.1/OpenModelica-OMSimulator-3rdParty-b4c3aa4a16a5920e88096780498cc4af157f3c05_GH0.tar.gz) = 7636640
-SHA256 (openmodelica-1.22.0.b.1/OpenModelica-OMCompiler-3rdParty-ad7c7b11370e8faf08b720010f40846c53adfed5_GH0.tar.gz) = 48ac1743b6b6f8f0972da40224e43555ef9700fa300c380ce94314175d2679ca
-SIZE (openmodelica-1.22.0.b.1/OpenModelica-OMCompiler-3rdParty-ad7c7b11370e8faf08b720010f40846c53adfed5_GH0.tar.gz) = 50216263
-SHA256 (openmodelica-1.22.0.b.1/OpenModelica-OMSens-8216eaefbb4ea2ff0c7a17a3487dcc2a8a17667d_GH0.tar.gz) = db2171ae5603314edf05728a40f4df31ca4c9107a6fed0cd2208a080455696e2
-SIZE (openmodelica-1.22.0.b.1/OpenModelica-OMSens-8216eaefbb4ea2ff0c7a17a3487dcc2a8a17667d_GH0.tar.gz) = 8870122
-SHA256 (openmodelica-1.22.0.b.1/OpenModelica-OMSens_Qt-ff2ade18e7058f611ddfd575ccbd24f388615d3f_GH0.tar.gz) = 95eac1349089f887e47a02d818c5aa626f505255e0b7c2a31b94b95fc8cd2504
-SIZE (openmodelica-1.22.0.b.1/OpenModelica-OMSens_Qt-ff2ade18e7058f611ddfd575ccbd24f388615d3f_GH0.tar.gz) = 211270
-SHA256 (openmodelica-1.22.0.b.1/OpenModelica-OpenModelica-common-08a01802db5ba5edb540383c46718b89ff229ef2_GH0.tar.gz) = fdb5bb442da0375373ef221cf26195114bf149511c1c2be051caad6301c21c9a
-SIZE (openmodelica-1.22.0.b.1/OpenModelica-OpenModelica-common-08a01802db5ba5edb540383c46718b89ff229ef2_GH0.tar.gz) = 36148
-SHA256 (openmodelica-1.22.0.b.1/OpenModelica-OMBootstrapping-c233b75_GH0.tar.gz) = 1a866e9f8eb925a68593c004efc4d59a0ad564bb438fc2752c667f1422f23d6f
-SIZE (openmodelica-1.22.0.b.1/OpenModelica-OMBootstrapping-c233b75_GH0.tar.gz) = 3327673
+TIMESTAMP = 1701717497
+SHA256 (openmodelica-1.22.0/OpenModelica-OpenModelica-v1.22.0_GH0.tar.gz) = 6b42330458d481d67dcf6c56a0d6e37fac82cefbe1ec0de5f232602dc95029fe
+SIZE (openmodelica-1.22.0/OpenModelica-OpenModelica-v1.22.0_GH0.tar.gz) = 92741413
+SHA256 (openmodelica-1.22.0/OpenModelica-OMOptim-55102095970c73a4176820538d19aaf408515da9_GH0.tar.gz) = c972df0280e3abb689db11bfa34832f54ba81be65a7f9079150b8cbd8f515fe9
+SIZE (openmodelica-1.22.0/OpenModelica-OMOptim-55102095970c73a4176820538d19aaf408515da9_GH0.tar.gz) = 4022723
+SHA256 (openmodelica-1.22.0/OpenModelica-OMSimulator-634b0193a3eb14e75622a8e720bf0fb6dab77487_GH0.tar.gz) = fd063d0b7921a45d38cf0c63bbeb53f3f66206632fae4e1aadfb1b9f334b3492
+SIZE (openmodelica-1.22.0/OpenModelica-OMSimulator-634b0193a3eb14e75622a8e720bf0fb6dab77487_GH0.tar.gz) = 87881474
+SHA256 (openmodelica-1.22.0/OpenModelica-OMSimulator-3rdParty-b4c3aa4a16a5920e88096780498cc4af157f3c05_GH0.tar.gz) = a5dd5a4ea2494471db0ff5879a966666606685beb952ee50b06a362f0c5d841f
+SIZE (openmodelica-1.22.0/OpenModelica-OMSimulator-3rdParty-b4c3aa4a16a5920e88096780498cc4af157f3c05_GH0.tar.gz) = 7636640
+SHA256 (openmodelica-1.22.0/OpenModelica-OMCompiler-3rdParty-d19136844b49720ae3a8957f0fb1e137c7055b43_GH0.tar.gz) = d317b4ddd471b5e201e84fd7451499f270afbdc8ae5fd4dad921e2ad5ee778b8
+SIZE (openmodelica-1.22.0/OpenModelica-OMCompiler-3rdParty-d19136844b49720ae3a8957f0fb1e137c7055b43_GH0.tar.gz) = 50216864
+SHA256 (openmodelica-1.22.0/OpenModelica-OMSens-8216eaefbb4ea2ff0c7a17a3487dcc2a8a17667d_GH0.tar.gz) = db2171ae5603314edf05728a40f4df31ca4c9107a6fed0cd2208a080455696e2
+SIZE (openmodelica-1.22.0/OpenModelica-OMSens-8216eaefbb4ea2ff0c7a17a3487dcc2a8a17667d_GH0.tar.gz) = 8870122
+SHA256 (openmodelica-1.22.0/OpenModelica-OMSens_Qt-ff2ade18e7058f611ddfd575ccbd24f388615d3f_GH0.tar.gz) = 95eac1349089f887e47a02d818c5aa626f505255e0b7c2a31b94b95fc8cd2504
+SIZE (openmodelica-1.22.0/OpenModelica-OMSens_Qt-ff2ade18e7058f611ddfd575ccbd24f388615d3f_GH0.tar.gz) = 211270
+SHA256 (openmodelica-1.22.0/OpenModelica-OpenModelica-common-08a01802db5ba5edb540383c46718b89ff229ef2_GH0.tar.gz) = fdb5bb442da0375373ef221cf26195114bf149511c1c2be051caad6301c21c9a
+SIZE (openmodelica-1.22.0/OpenModelica-OpenModelica-common-08a01802db5ba5edb540383c46718b89ff229ef2_GH0.tar.gz) = 36148
+SHA256 (openmodelica-1.22.0/OpenModelica-OMBootstrapping-c289e97c41d00939a4a69fe504961b47283a6d8e_GH0.tar.gz) = 986be2c217f8afcded765c3c30d4a89ff5f397d23c0ccbc1c838699ff8692d4e
+SIZE (openmodelica-1.22.0/OpenModelica-OMBootstrapping-c289e97c41d00939a4a69fe504961b47283a6d8e_GH0.tar.gz) = 3329128
+SHA256 (openmodelica-1.22.0/0f4b4ce89dca64287dd4c7a19a6aa98114ea563c.patch) = 84c44e43756c2d05b535f6afcfc19abba68825e1ef7b0b3109df5a1352d45fe8
+SIZE (openmodelica-1.22.0/0f4b4ce89dca64287dd4c7a19a6aa98114ea563c.patch) = 84691