* [gentoo-commits] repo/proj/guru:dev commit in: sci-physics/openmodelica/
@ 2024-07-28 22:49 Ivan Lloro
0 siblings, 0 replies; 25+ messages in thread
From: Ivan Lloro @ 2024-07-28 22:49 UTC (permalink / raw
To: gentoo-commits
commit: 5502de8503fa5aa1cd37724b3ee0634b078132fb
Author: Ivan Lloro <ivan.lloro.boada <AT> gmail <DOT> com>
AuthorDate: Sun Jul 28 22:49:34 2024 +0000
Commit: Ivan Lloro <ivan.lloro.boada <AT> gmail <DOT> com>
CommitDate: Sun Jul 28 22:49:34 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=5502de85
sci-physics/openmodelica: Remove trailing space
Signed-off-by: Ivan Lloro <ivan.lloro.boada <AT> gmail.com>
sci-physics/openmodelica/openmodelica-1.23.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-physics/openmodelica/openmodelica-1.23.1.ebuild b/sci-physics/openmodelica/openmodelica-1.23.1.ebuild
index 23907e2fb..7757a0abe 100644
--- a/sci-physics/openmodelica/openmodelica-1.23.1.ebuild
+++ b/sci-physics/openmodelica/openmodelica-1.23.1.ebuild
@@ -154,7 +154,7 @@ src_install() {
cmake_src_install
# [2024-07-15]
- # OMSens is disabled in "${WORKDIR}/${P}/CMakeLists.txt" (## omc_add_subdirectory(OMSens)) due to lack of a
+ # OMSens is disabled in "${WORKDIR}/${P}/CMakeLists.txt" (## omc_add_subdirectory(OMSens)) due to lack of a
# working "${WORKDIR}/${P}/OMSens/CMakeLists.txt". So, we install it manually.
cp -a "${WORKDIR}"/"${P}"/OMSens "${ED}"/usr/share/
rm -fr "${ED}"/usr/share//OMSens/{old,.git,.gitignore,CMakeLists.txt,.jenkins,Jenkinsfile,Makefile.omdev.mingw,Makefile.unix,README.md,setup.py,testing}
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sci-physics/openmodelica/
@ 2024-07-28 23:01 Ivan Lloro
0 siblings, 0 replies; 25+ messages in thread
From: Ivan Lloro @ 2024-07-28 23:01 UTC (permalink / raw
To: gentoo-commits
commit: 1ca000dcb3baba2e54e2ee3ef847c83f8ef23307
Author: Ivan Lloro <ivan.lloro.boada <AT> gmail <DOT> com>
AuthorDate: Sun Jul 28 23:01:47 2024 +0000
Commit: Ivan Lloro <ivan.lloro.boada <AT> gmail <DOT> com>
CommitDate: Sun Jul 28 23:01:47 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1ca000dc
sci-physics/openmodelica: Remove OMOptim icon installation
Signed-off-by: Ivan Lloro <ivan.lloro.boada <AT> gmail.com>
sci-physics/openmodelica/openmodelica-1.23.1.ebuild | 1 -
1 file changed, 1 deletion(-)
diff --git a/sci-physics/openmodelica/openmodelica-1.23.1.ebuild b/sci-physics/openmodelica/openmodelica-1.23.1.ebuild
index 7757a0abe..052b3e2cf 100644
--- a/sci-physics/openmodelica/openmodelica-1.23.1.ebuild
+++ b/sci-physics/openmodelica/openmodelica-1.23.1.ebuild
@@ -163,7 +163,6 @@ src_install() {
newicon -s scalable OMNotebook/OMNotebook/OMNotebookGUI/Resources/OMNotebook_icon.svg OMNotebook.svg
# No proper icon for Linux available from upstream
doicon -s 256 "${FILESDIR}"/omedit.png
- doicon -s 256 "${FILESDIR}"/omoptim.png
make_desktop_entry "OMEdit %F" OMedit omedit "Physics;" "MimeType=text/x-modelica;"
make_desktop_entry OMShell OMShell omshell "Physics;"
make_desktop_entry "OMNotebook %f" OMNotebook OMNotebook "Physics;"
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sci-physics/openmodelica/
@ 2024-07-29 3:19 Ivan Lloro
0 siblings, 0 replies; 25+ messages in thread
From: Ivan Lloro @ 2024-07-29 3:19 UTC (permalink / raw
To: gentoo-commits
commit: 4c0f47562eab4dbc9e780a1f3a44941e987661d5
Author: Ivan Lloro <ivan.lloro.boada <AT> gmail <DOT> com>
AuthorDate: Mon Jul 29 03:19:25 2024 +0000
Commit: Ivan Lloro <ivan.lloro.boada <AT> gmail <DOT> com>
CommitDate: Mon Jul 29 03:19:36 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=4c0f4756
sci-physics/openmodelica: Remove double slash and comments cleanup.
Signed-off-by: Ivan Lloro <ivan.lloro.boada <AT> gmail.com>
sci-physics/openmodelica/openmodelica-1.23.1.ebuild | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/sci-physics/openmodelica/openmodelica-1.23.1.ebuild b/sci-physics/openmodelica/openmodelica-1.23.1.ebuild
index 052b3e2cf..f60a0d9f5 100644
--- a/sci-physics/openmodelica/openmodelica-1.23.1.ebuild
+++ b/sci-physics/openmodelica/openmodelica-1.23.1.ebuild
@@ -112,9 +112,6 @@ src_prepare() {
}
src_configure() {
- #local CMAKE_BUILD_TYPE=Debug
- # TODO: potential USE flags.
- # BUG: CORBA ON required for OMOptim (but compilation fails)
local mycmakeargs=(
-DOM_OMEDIT_ENABLE_QTWEBENGINE=ON
-DBUILD_SHARED_LIBS=OFF
@@ -157,7 +154,7 @@ src_install() {
# OMSens is disabled in "${WORKDIR}/${P}/CMakeLists.txt" (## omc_add_subdirectory(OMSens)) due to lack of a
# working "${WORKDIR}/${P}/OMSens/CMakeLists.txt". So, we install it manually.
cp -a "${WORKDIR}"/"${P}"/OMSens "${ED}"/usr/share/
- rm -fr "${ED}"/usr/share//OMSens/{old,.git,.gitignore,CMakeLists.txt,.jenkins,Jenkinsfile,Makefile.omdev.mingw,Makefile.unix,README.md,setup.py,testing}
+ rm -fr "${ED}"/usr/share/OMSens/{old,.git,.gitignore,CMakeLists.txt,.jenkins,Jenkinsfile,Makefile.omdev.mingw,Makefile.unix,README.md,setup.py,testing}
newicon -s scalable OMShell/OMShell/OMShellGUI/Resources/omshell-large.svg omshell.svg
newicon -s scalable OMNotebook/OMNotebook/OMNotebookGUI/Resources/OMNotebook_icon.svg OMNotebook.svg
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sci-physics/openmodelica/
@ 2024-07-30 16:00 Takuya Wakazono
0 siblings, 0 replies; 25+ messages in thread
From: Takuya Wakazono @ 2024-07-30 16:00 UTC (permalink / raw
To: gentoo-commits
commit: c541608386df973ad5151f089a9482c5fdeff33b
Author: Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
AuthorDate: Tue Jul 30 15:58:31 2024 +0000
Commit: Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
CommitDate: Tue Jul 30 15:59:50 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=c5416083
sci-physics/openmodelica: unkeyword 1.23.1 for ~amd64
https://github.com/gentoo/guru/commit/27eb38d18856f0e508b046fcb46db6737e557fb5#r144754174
Signed-off-by: Takuya Wakazono <pastalian46 <AT> gmail.com>
sci-physics/openmodelica/openmodelica-1.23.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-physics/openmodelica/openmodelica-1.23.1.ebuild b/sci-physics/openmodelica/openmodelica-1.23.1.ebuild
index f60a0d9f5..a4fd589e6 100644
--- a/sci-physics/openmodelica/openmodelica-1.23.1.ebuild
+++ b/sci-physics/openmodelica/openmodelica-1.23.1.ebuild
@@ -12,7 +12,7 @@ EGIT_COMMIT="v1.23.1"
LICENSE="OSMC-PL GPL-3 AGPL-3 BSD EPL-1.0 public-domain BSD-with-attribution LGPL-2.1+ LGPL-2 Apache-2.0 Boost-1.0 Modelica-1.1 Modelica-2 MIT WTFPL-2"
SLOT="0"
-KEYWORDS="~amd64"
+# KEYWORDS="~amd64"
RDEPEND="
>=virtual/lapack-3.10
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sci-physics/openmodelica/
@ 2024-07-30 18:42 Ivan Lloro
0 siblings, 0 replies; 25+ messages in thread
From: Ivan Lloro @ 2024-07-30 18:42 UTC (permalink / raw
To: gentoo-commits
commit: 43538be55e359cf7ead3228291562933fd66ad55
Author: Ivan Lloro <ivan.lloro.boada <AT> gmail <DOT> com>
AuthorDate: Tue Jul 30 18:42:12 2024 +0000
Commit: Ivan Lloro <ivan.lloro.boada <AT> gmail <DOT> com>
CommitDate: Tue Jul 30 18:42:12 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=43538be5
sci-physics/openmodelica: Unkeyword 1.23.1 for ~amd64
Signed-off-by: Ivan Lloro <ivan.lloro.boada <AT> gmail.com>
sci-physics/openmodelica/openmodelica-1.23.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-physics/openmodelica/openmodelica-1.23.1.ebuild b/sci-physics/openmodelica/openmodelica-1.23.1.ebuild
index 9760edb9c..225275791 100644
--- a/sci-physics/openmodelica/openmodelica-1.23.1.ebuild
+++ b/sci-physics/openmodelica/openmodelica-1.23.1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
LICENSE="OSMC-PL GPL-3 AGPL-3 BSD EPL-1.0 public-domain BSD-with-attribution LGPL-2.1+ LGPL-2 Apache-2.0 Boost-1.0 Modelica-1.1 Modelica-2 MIT WTFPL-2"
SLOT="0"
-# KEYWORDS="~amd64"
+KEYWORDS="~amd64"
RDEPEND="
>=virtual/lapack-3.10
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sci-physics/openmodelica/
@ 2024-07-31 23:31 Ivan Lloro
0 siblings, 0 replies; 25+ messages in thread
From: Ivan Lloro @ 2024-07-31 23:31 UTC (permalink / raw
To: gentoo-commits
commit: 45a98f9f8d75c2920491a12c3b4b07c6aad9a0be
Author: Ivan Lloro <ivan.lloro.boada <AT> gmail <DOT> com>
AuthorDate: Wed Jul 31 23:12:26 2024 +0000
Commit: Ivan Lloro <ivan.lloro.boada <AT> gmail <DOT> com>
CommitDate: Wed Jul 31 23:31:33 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=45a98f9f
sci-physics/openmodelica: Code cleanup with pushd/popd
Signed-off-by: Ivan Lloro <ivan.lloro.boada <AT> gmail.com>
sci-physics/openmodelica/openmodelica-1.23.1.ebuild | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/sci-physics/openmodelica/openmodelica-1.23.1.ebuild b/sci-physics/openmodelica/openmodelica-1.23.1.ebuild
index a4bbc0e6b..e533cf990 100644
--- a/sci-physics/openmodelica/openmodelica-1.23.1.ebuild
+++ b/sci-physics/openmodelica/openmodelica-1.23.1.ebuild
@@ -132,8 +132,7 @@ src_compile() {
# [2024-07-15]
# OMSens is disabled in "${WORKDIR}/${P}/CMakeLists.txt" (## omc_add_subdirectory(OMSens)) due to lack of a
# working "${WORKDIR}/${P}/OMSens/CMakeLists.txt". So, we compile it manually.
- PWD=$(pwd)
- cd "${WORKDIR}"/"${P}"/OMSens/fortran_interface
+ pushd OMSens/fortran_interface > /dev/null || die
gfortran -fPIC -c Rutf.for Rut.for Curvif.for || die
# BUG: Undefined symbol curvif_ in
# ${WORKDIR}/${P}/OMSens/fortran_interface/curvif_simplified.cpython-312-x86_64-linux-gnu.so
@@ -141,7 +140,7 @@ src_compile() {
# ${WORKDIR}/${P}/OMSens/fortran_interface/curvif_simplified.cpython-312-x86_64-linux-gnu.so
# This bug causes "Vectorial Parameter Based Sensitivity Analysis" in OMSens to fail.
f2py --verbose -c -I. Curvif.o Rutf.o Rut.o -m curvif_simplified curvif_simplified.pyf Curvif_simplified.f90 || die
- cd "${PWD}"
+ popd || die
cmake_src_compile
}
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sci-physics/openmodelica/
@ 2024-07-31 23:31 Ivan Lloro
0 siblings, 0 replies; 25+ messages in thread
From: Ivan Lloro @ 2024-07-31 23:31 UTC (permalink / raw
To: gentoo-commits
commit: cc72ffd0d43c22ed1dea9bf5786073846b823c59
Author: Ivan Lloro <ivan.lloro.boada <AT> gmail <DOT> com>
AuthorDate: Wed Jul 31 23:10:39 2024 +0000
Commit: Ivan Lloro <ivan.lloro.boada <AT> gmail <DOT> com>
CommitDate: Wed Jul 31 23:31:33 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=cc72ffd0
sci-physics/openmodelica: Ensure graceful abort in case of any system command failure.
Signed-off-by: Ivan Lloro <ivan.lloro.boada <AT> gmail.com>
.../openmodelica/openmodelica-1.23.1.ebuild | 46 +++++++++++-----------
1 file changed, 23 insertions(+), 23 deletions(-)
diff --git a/sci-physics/openmodelica/openmodelica-1.23.1.ebuild b/sci-physics/openmodelica/openmodelica-1.23.1.ebuild
index 225275791..a4bbc0e6b 100644
--- a/sci-physics/openmodelica/openmodelica-1.23.1.ebuild
+++ b/sci-physics/openmodelica/openmodelica-1.23.1.ebuild
@@ -91,21 +91,21 @@ PATCHES=(
src_unpack() {
default
- mv "${WORKDIR}/OpenModelica-332e81aa6442c4cc4761251407332f86f80e834b" "${WORKDIR}/${P}"
- rmdir "${WORKDIR}/${P}/OMCompiler/3rdParty"
- mv "${WORKDIR}/OMCompiler-3rdParty-b826af1c1c15acf48627ad32cc0545ffc7e58bca" "${WORKDIR}/${P}/OMCompiler/3rdParty"
- rmdir "${WORKDIR}/${P}/OMSens"
- mv "${WORKDIR}/OMSens-0d804d597bc385686856d453cc830fad4923fa3e" "${WORKDIR}/${P}/OMSens"
- rmdir "${WORKDIR}/${P}/OMSens_Qt"
- mv "${WORKDIR}/OMSens_Qt-68b1b8697ac9f8e37ebe4de13c0c1d4e6e2e56fb" "${WORKDIR}/${P}/OMSens_Qt"
- rmdir "${WORKDIR}/${P}/OMSens_Qt/common"
- mv "${WORKDIR}/OpenModelica-common-08a01802db5ba5edb540383c46718b89ff229ef2" "${WORKDIR}/${P}/OMSens_Qt/common"
- rmdir "${WORKDIR}/${P}/OMSimulator"
- mv "${WORKDIR}/OMSimulator-1eb92ef35793b73e75d0cfed0c7b0311497d6278" "${WORKDIR}/${P}/OMSimulator"
- rmdir "${WORKDIR}/${P}/OMSimulator/3rdParty"
- mv "${WORKDIR}/OMSimulator-3rdParty-ca418d7768c036ac15e9894d7f00d2118b3399a6" "${WORKDIR}/${P}/OMSimulator/3rdParty"
- mv "OMBootstrapping-c289e97c41d00939a4a69fe504961b47283a6d8e" "${WORKDIR}/${P}/OMCompiler/Compiler/boot/bomc"
- touch "${WORKDIR}/${P}/OMCompiler/Compiler/boot/bomc/sources.tar.gz"
+ mv "${WORKDIR}/OpenModelica-332e81aa6442c4cc4761251407332f86f80e834b" "${WORKDIR}/${P}" || die
+ rmdir "${WORKDIR}/${P}/OMCompiler/3rdParty" || die
+ mv "${WORKDIR}/OMCompiler-3rdParty-b826af1c1c15acf48627ad32cc0545ffc7e58bca" "${WORKDIR}/${P}/OMCompiler/3rdParty" || die
+ rmdir "${WORKDIR}/${P}/OMSens" || die
+ mv "${WORKDIR}/OMSens-0d804d597bc385686856d453cc830fad4923fa3e" "${WORKDIR}/${P}/OMSens" || die
+ rmdir "${WORKDIR}/${P}/OMSens_Qt" || die
+ mv "${WORKDIR}/OMSens_Qt-68b1b8697ac9f8e37ebe4de13c0c1d4e6e2e56fb" "${WORKDIR}/${P}/OMSens_Qt" || die
+ rmdir "${WORKDIR}/${P}/OMSens_Qt/common" || die
+ mv "${WORKDIR}/OpenModelica-common-08a01802db5ba5edb540383c46718b89ff229ef2" "${WORKDIR}/${P}/OMSens_Qt/common" || die
+ rmdir "${WORKDIR}/${P}/OMSimulator" || die
+ mv "${WORKDIR}/OMSimulator-1eb92ef35793b73e75d0cfed0c7b0311497d6278" "${WORKDIR}/${P}/OMSimulator" || die
+ rmdir "${WORKDIR}/${P}/OMSimulator/3rdParty" || die
+ mv "${WORKDIR}/OMSimulator-3rdParty-ca418d7768c036ac15e9894d7f00d2118b3399a6" "${WORKDIR}/${P}/OMSimulator/3rdParty" || die
+ mv "OMBootstrapping-c289e97c41d00939a4a69fe504961b47283a6d8e" "${WORKDIR}/${P}/OMCompiler/Compiler/boot/bomc" || die
+ touch "${WORKDIR}/${P}/OMCompiler/Compiler/boot/bomc/sources.tar.gz" || die
}
src_configure() {
@@ -134,13 +134,13 @@ src_compile() {
# working "${WORKDIR}/${P}/OMSens/CMakeLists.txt". So, we compile it manually.
PWD=$(pwd)
cd "${WORKDIR}"/"${P}"/OMSens/fortran_interface
- gfortran -fPIC -c Rutf.for Rut.for Curvif.for
+ gfortran -fPIC -c Rutf.for Rut.for Curvif.for || die
# BUG: Undefined symbol curvif_ in
# ${WORKDIR}/${P}/OMSens/fortran_interface/curvif_simplified.cpython-312-x86_64-linux-gnu.so
# See with nm or objdump -tT
# ${WORKDIR}/${P}/OMSens/fortran_interface/curvif_simplified.cpython-312-x86_64-linux-gnu.so
# This bug causes "Vectorial Parameter Based Sensitivity Analysis" in OMSens to fail.
- f2py --verbose -c -I. Curvif.o Rutf.o Rut.o -m curvif_simplified curvif_simplified.pyf Curvif_simplified.f90
+ f2py --verbose -c -I. Curvif.o Rutf.o Rut.o -m curvif_simplified curvif_simplified.pyf Curvif_simplified.f90 || die
cd "${PWD}"
cmake_src_compile
@@ -152,8 +152,8 @@ src_install() {
# [2024-07-15]
# OMSens is disabled in "${WORKDIR}/${P}/CMakeLists.txt" (## omc_add_subdirectory(OMSens)) due to lack of a
# working "${WORKDIR}/${P}/OMSens/CMakeLists.txt". So, we install it manually.
- cp -a "${WORKDIR}"/"${P}"/OMSens "${ED}"/usr/share/
- rm -fr "${ED}"/usr/share/OMSens/{old,.git,.gitignore,CMakeLists.txt,.jenkins,Jenkinsfile,Makefile.omdev.mingw,Makefile.unix,README.md,setup.py,testing}
+ cp -a "${WORKDIR}"/"${P}"/OMSens "${ED}"/usr/share/ || die
+ rm -fr "${ED}"/usr/share/OMSens/{old,.git,.gitignore,CMakeLists.txt,.jenkins,Jenkinsfile,Makefile.omdev.mingw,Makefile.unix,README.md,setup.py,testing} || die
newicon -s scalable OMShell/OMShell/OMShellGUI/Resources/omshell-large.svg omshell.svg
newicon -s scalable OMNotebook/OMNotebook/OMNotebookGUI/Resources/OMNotebook_icon.svg OMNotebook.svg
@@ -164,15 +164,15 @@ src_install() {
# Fix libraries
if [[ $(get_libdir) != "lib" ]]; then
- mv "${ED}"/usr/lib/omc/* "${ED}"/usr/$(get_libdir)/omc/
- rmdir "${ED}"/usr/lib/omc/
+ mv "${ED}"/usr/lib/omc/* "${ED}"/usr/$(get_libdir)/omc/ || die
+ rmdir "${ED}"/usr/lib/omc/ || die
dosym -r /usr/$(get_libdir)/omc /usr/lib/omc
fi
dosym -r /usr/include/omc/ParModelica /usr/include/ParModelica
# Documentation housekeeping & QA
- mv "${ED}"/usr/share/doc/omc "${ED}"/usr/share/doc/"${P}"
- rm -fr "${ED}"/usr/doc
+ mv "${ED}"/usr/share/doc/omc "${ED}"/usr/share/doc/"${P}" || die
+ rm -fr "${ED}"/usr/doc || die
ewarn "Upstream has deprecated OMTLMSimuulator and, therefore, it has not been installed. Use OMSimulator/SSP instead."
}
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sci-physics/openmodelica/
@ 2024-07-31 23:31 Ivan Lloro
0 siblings, 0 replies; 25+ messages in thread
From: Ivan Lloro @ 2024-07-31 23:31 UTC (permalink / raw
To: gentoo-commits
commit: f684f881351e0555bae157ba86fe922f3d48d879
Author: Ivan Lloro <ivan.lloro.boada <AT> gmail <DOT> com>
AuthorDate: Wed Jul 31 23:31:08 2024 +0000
Commit: Ivan Lloro <ivan.lloro.boada <AT> gmail <DOT> com>
CommitDate: Wed Jul 31 23:31:33 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f684f881
QA: follow Gentoo guidelines for documentation path installation. Not having a revision number, this patch has no effect on this particular ebuild.
Signed-off-by: Ivan Lloro <ivan.lloro.boada <AT> gmail.com>
sci-physics/openmodelica/openmodelica-1.23.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-physics/openmodelica/openmodelica-1.23.1.ebuild b/sci-physics/openmodelica/openmodelica-1.23.1.ebuild
index e533cf990..b543d3fe2 100644
--- a/sci-physics/openmodelica/openmodelica-1.23.1.ebuild
+++ b/sci-physics/openmodelica/openmodelica-1.23.1.ebuild
@@ -170,7 +170,7 @@ src_install() {
dosym -r /usr/include/omc/ParModelica /usr/include/ParModelica
# Documentation housekeeping & QA
- mv "${ED}"/usr/share/doc/omc "${ED}"/usr/share/doc/"${P}" || die
+ mv "${ED}"/usr/share/doc/omc "${ED}"/usr/share/doc/"${PF}" || die
rm -fr "${ED}"/usr/doc || die
ewarn "Upstream has deprecated OMTLMSimuulator and, therefore, it has not been installed. Use OMSimulator/SSP instead."
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sci-physics/openmodelica/
@ 2024-08-04 18:24 Ivan Lloro
0 siblings, 0 replies; 25+ messages in thread
From: Ivan Lloro @ 2024-08-04 18:24 UTC (permalink / raw
To: gentoo-commits
commit: 90899fbaa0ca329fbdfc4a43c627e4ed4c5fb470
Author: Ivan Lloro <ivan.lloro.boada <AT> gmail <DOT> com>
AuthorDate: Sun Aug 4 18:23:17 2024 +0000
Commit: Ivan Lloro <ivan.lloro.boada <AT> gmail <DOT> com>
CommitDate: Sun Aug 4 18:23:17 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=90899fba
sci-physics/openmodelica: gfortran -> $(tc-getFC)
Closes: https://bugs.gentoo.org/937041
Signed-off-by: Ivan Lloro <ivan.lloro.boada <AT> gmail.com>
sci-physics/openmodelica/openmodelica-1.23.1.ebuild | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/sci-physics/openmodelica/openmodelica-1.23.1.ebuild b/sci-physics/openmodelica/openmodelica-1.23.1.ebuild
index b543d3fe2..d0550e91a 100644
--- a/sci-physics/openmodelica/openmodelica-1.23.1.ebuild
+++ b/sci-physics/openmodelica/openmodelica-1.23.1.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-inherit cmake desktop xdg
+inherit cmake desktop xdg toolchain-funcs fortran-2
DESCRIPTION="Open-source Modelica-based modeling and simulation environment"
HOMEPAGE="https://openmodelica.org/"
@@ -79,7 +79,6 @@ RDEPEND+="
BDEPEND="
dev-util/ccache
app-arch/tar
- virtual/fortran
"
DEPEND="${RDEPEND}"
@@ -133,7 +132,7 @@ src_compile() {
# OMSens is disabled in "${WORKDIR}/${P}/CMakeLists.txt" (## omc_add_subdirectory(OMSens)) due to lack of a
# working "${WORKDIR}/${P}/OMSens/CMakeLists.txt". So, we compile it manually.
pushd OMSens/fortran_interface > /dev/null || die
- gfortran -fPIC -c Rutf.for Rut.for Curvif.for || die
+ $(tc-getFC) -fPIC -c Rutf.for Rut.for Curvif.for || die
# BUG: Undefined symbol curvif_ in
# ${WORKDIR}/${P}/OMSens/fortran_interface/curvif_simplified.cpython-312-x86_64-linux-gnu.so
# See with nm or objdump -tT
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sci-physics/openmodelica/
@ 2024-08-04 18:24 Ivan Lloro
0 siblings, 0 replies; 25+ messages in thread
From: Ivan Lloro @ 2024-08-04 18:24 UTC (permalink / raw
To: gentoo-commits
commit: df5af1a86c001c493c4a409f0bb020099567c74c
Author: Ivan Lloro <ivan.lloro.boada <AT> gmail <DOT> com>
AuthorDate: Sun Aug 4 18:24:10 2024 +0000
Commit: Ivan Lloro <ivan.lloro.boada <AT> gmail <DOT> com>
CommitDate: Sun Aug 4 18:24:10 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=df5af1a8
sci-physics/openmodelica: Silence popd output
Signed-off-by: Ivan Lloro <ivan.lloro.boada <AT> gmail.com>
sci-physics/openmodelica/openmodelica-1.23.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-physics/openmodelica/openmodelica-1.23.1.ebuild b/sci-physics/openmodelica/openmodelica-1.23.1.ebuild
index d0550e91a..2b40845d6 100644
--- a/sci-physics/openmodelica/openmodelica-1.23.1.ebuild
+++ b/sci-physics/openmodelica/openmodelica-1.23.1.ebuild
@@ -139,7 +139,7 @@ src_compile() {
# ${WORKDIR}/${P}/OMSens/fortran_interface/curvif_simplified.cpython-312-x86_64-linux-gnu.so
# This bug causes "Vectorial Parameter Based Sensitivity Analysis" in OMSens to fail.
f2py --verbose -c -I. Curvif.o Rutf.o Rut.o -m curvif_simplified curvif_simplified.pyf Curvif_simplified.f90 || die
- popd || die
+ popd > /dev/null || die
cmake_src_compile
}
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sci-physics/openmodelica/
@ 2024-08-04 19:51 Ivan Lloro
0 siblings, 0 replies; 25+ messages in thread
From: Ivan Lloro @ 2024-08-04 19:51 UTC (permalink / raw
To: gentoo-commits
commit: dddee384e3b565220f190073acce350c770b4196
Author: Ivan Lloro <ivan.lloro.boada <AT> gmail <DOT> com>
AuthorDate: Sun Aug 4 19:50:48 2024 +0000
Commit: Ivan Lloro <ivan.lloro.boada <AT> gmail <DOT> com>
CommitDate: Sun Aug 4 19:51:34 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=dddee384
sci-physics/openmodelica: Update third party Minizip library to solve compilation error with GCC 14
Closes: https://bugs.gentoo.org/937038
Signed-off-by: Ivan Lloro <ivan.lloro.boada <AT> gmail.com>
sci-physics/openmodelica/openmodelica-1.23.1.ebuild | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/sci-physics/openmodelica/openmodelica-1.23.1.ebuild b/sci-physics/openmodelica/openmodelica-1.23.1.ebuild
index 2b40845d6..619aeb6ea 100644
--- a/sci-physics/openmodelica/openmodelica-1.23.1.ebuild
+++ b/sci-physics/openmodelica/openmodelica-1.23.1.ebuild
@@ -105,6 +105,10 @@ src_unpack() {
mv "${WORKDIR}/OMSimulator-3rdParty-ca418d7768c036ac15e9894d7f00d2118b3399a6" "${WORKDIR}/${P}/OMSimulator/3rdParty" || die
mv "OMBootstrapping-c289e97c41d00939a4a69fe504961b47283a6d8e" "${WORKDIR}/${P}/OMCompiler/Compiler/boot/bomc" || die
touch "${WORKDIR}/${P}/OMCompiler/Compiler/boot/bomc/sources.tar.gz" || die
+
+ # Solve https://bugs.gentoo.org/937038
+ rm -fr "${WORKDIR}/${P}/OMCompiler/3rdParty/FMIL/ThirdParty/Minizip/minizip" || die
+ cp -a "${WORKDIR}/${P}/OMSimulator/3rdParty/fmi4c/3rdparty/minizip" "${WORKDIR}/${P}/OMCompiler/3rdParty/FMIL/ThirdParty/Minizip/minizip" || die
}
src_configure() {
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sci-physics/openmodelica/
@ 2024-08-05 9:36 Ivan Lloro
0 siblings, 0 replies; 25+ messages in thread
From: Ivan Lloro @ 2024-08-05 9:36 UTC (permalink / raw
To: gentoo-commits
commit: 5a92a4cfd037f6f19abf70ecabaf06c130cecdd3
Author: Ivan Lloro <ivan.lloro.boada <AT> gmail <DOT> com>
AuthorDate: Mon Aug 5 09:35:47 2024 +0000
Commit: Ivan Lloro <ivan.lloro.boada <AT> gmail <DOT> com>
CommitDate: Mon Aug 5 09:36:35 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=5a92a4cf
sci-physics/openmodelica: Remove implicit dependency app-arch/tar
Signed-off-by: Ivan Lloro <ivan.lloro.boada <AT> gmail.com>
sci-physics/openmodelica/openmodelica-1.23.1.ebuild | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/sci-physics/openmodelica/openmodelica-1.23.1.ebuild b/sci-physics/openmodelica/openmodelica-1.23.1.ebuild
index 1a2490930..76909a339 100644
--- a/sci-physics/openmodelica/openmodelica-1.23.1.ebuild
+++ b/sci-physics/openmodelica/openmodelica-1.23.1.ebuild
@@ -76,10 +76,7 @@ RDEPEND+="
>=sys-libs/ncurses-6.4_p20240414
"
-BDEPEND="
- dev-util/ccache
- app-arch/tar
-"
+BDEPEND="dev-util/ccache"
DEPEND="${RDEPEND}"
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sci-physics/openmodelica/
@ 2024-08-05 13:44 Ivan Lloro
0 siblings, 0 replies; 25+ messages in thread
From: Ivan Lloro @ 2024-08-05 13:44 UTC (permalink / raw
To: gentoo-commits
commit: 781e21d96bddccfb405e20321940f220d6d6b2bd
Author: Ivan Lloro <ivan.lloro.boada <AT> gmail <DOT> com>
AuthorDate: Mon Aug 5 12:21:06 2024 +0000
Commit: Ivan Lloro <ivan.lloro.boada <AT> gmail <DOT> com>
CommitDate: Mon Aug 5 13:44:09 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=781e21d9
sci-physics/openmodelica: Dependencies in alphabetical order as mandated by Gentoo's style guide
Signed-off-by: Ivan Lloro <ivan.lloro.boada <AT> gmail.com>
.../openmodelica/openmodelica-1.23.1.ebuild | 79 ++++++++++------------
1 file changed, 37 insertions(+), 42 deletions(-)
diff --git a/sci-physics/openmodelica/openmodelica-1.23.1.ebuild b/sci-physics/openmodelica/openmodelica-1.23.1.ebuild
index 76909a339..5852a1535 100644
--- a/sci-physics/openmodelica/openmodelica-1.23.1.ebuild
+++ b/sci-physics/openmodelica/openmodelica-1.23.1.ebuild
@@ -22,58 +22,53 @@ SLOT="0"
KEYWORDS="~amd64"
RDEPEND="
- >=virtual/lapack-3.10
- >=dev-libs/boost-1.84.0-r3
- >=virtual/opencl-3-r3
- >=net-misc/curl-8.7.1-r4
- >=sys-libs/readline-8.2_p10
>=app-text/asciidoc-10.2.0
- >=virtual/libintl-0-r2
- >=virtual/libiconv-0-r2
- >=virtual/blas-3.8
- >=virtual/lapack-3.10
- >=virtual/jdk-17
- >=virtual/pkgconfig-3
+ >=app-text/doxygen-1.9.8
+ >=dev-libs/boost-1.84.0-r3
+ >=dev-games/openscenegraph-3.6.5-r114
+ dev-lang/python:3.12
+ >=dev-libs/expat-2.5.0
+ >=dev-libs/icu-74.2
+ >=dev-libs/libxml2-2.12.7
+ >=dev-python/kiwisolver-1.3.2
+ >=dev-python/matplotlib-3.3
+ >=dev-python/numpy-1.26.4
+ >=dev-python/pandas-1.1.3
+ >=dev-python/pillow-9.0.1
+ >=dev-python/pytest-8.2.2
+ >=dev-python/six-1.16.0-r1
+ >=dev-python/sphinx-7.3.7-r2
dev-qt/qtconcurrent:5
- dev-qt/qtprintsupport:5
- dev-qt/qtxml:5
- dev-qt/qtopengl:5
- dev-qt/qtnetwork:5
- dev-qt/qtsvg:5
- dev-qt/qtwebengine:5[widgets]
- dev-qt/qtxmlpatterns:5
dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
dev-qt/qtdeclarative:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtopengl:5
+ dev-qt/qtpositioning:5[qml]
+ dev-qt/qtprintsupport:5
dev-qt/qtquickcontrols:5
dev-qt/qtquickcontrols2:5
+ dev-qt/qtsvg:5
+ dev-qt/qtwebengine:5[widgets]
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+ dev-qt/qtxmlpatterns:5
dev-qt/qtwebchannel:5[qml]
- dev-qt/qtpositioning:5[qml]
- >=dev-games/openscenegraph-3.6.5-r114
- >=virtual/opengl-7.0-r2
- >=dev-libs/expat-2.5.0
+ >=net-misc/curl-8.7.1-r4
>=net-misc/omniORB-4.3.0
- >=dev-python/six-1.16.0-r1
- >=dev-python/pytest-8.2.2
- >=dev-python/numpy-1.26.4
- >=dev-python/matplotlib-3.3
- >=dev-python/kiwisolver-1.3.2
- >=dev-python/pillow-9.0.1
- >=dev-python/pandas-1.1.3
- dev-lang/python:3.12
-"
-
-# dev-libs/libxml2 only needed if compiled with -DOM_OMEDIT_ENABLE_LIBXML2=ON
-RDEPEND+="
- >=dev-libs/libxml2-2.12.7
- >=dev-libs/icu-74.2
- >=app-text/doxygen-1.9.8
- >=dev-python/sphinx-7.3.7-r2
- >=sys-devel/flex-2.6.4-r6
- >=sys-apps/hwloc-2.9.2
>=sci-libs/hdf5-1.14.3-r1
+ >=sys-apps/hwloc-2.9.2
+ >=sys-devel/flex-2.6.4-r6
>=sys-libs/ncurses-6.4_p20240414
+ >=sys-libs/readline-8.2_p10
+ >=virtual/blas-3.8
+ >=virtual/jdk-17
+ >=virtual/lapack-3.10
+ >=virtual/libiconv-0-r2
+ >=virtual/libintl-0-r2
+ >=virtual/opencl-3-r3
+ >=virtual/opengl-7.0-r2
+ >=virtual/pkgconfig-3
"
BDEPEND="dev-util/ccache"
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sci-physics/openmodelica/
@ 2024-08-05 14:18 Ivan Lloro
0 siblings, 0 replies; 25+ messages in thread
From: Ivan Lloro @ 2024-08-05 14:18 UTC (permalink / raw
To: gentoo-commits
commit: 20694fb96d42175d401fcbac407189bf88c86a1f
Author: Ivan Lloro <ivan.lloro.boada <AT> gmail <DOT> com>
AuthorDate: Mon Aug 5 14:18:12 2024 +0000
Commit: Ivan Lloro <ivan.lloro.boada <AT> gmail <DOT> com>
CommitDate: Mon Aug 5 14:18:12 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=20694fb9
sci-physics/openmodelica: Removed CORBA dependency (interface not used, so far)
Signed-off-by: Ivan Lloro <ivan.lloro.boada <AT> gmail.com>
sci-physics/openmodelica/openmodelica-1.23.1.ebuild | 1 -
1 file changed, 1 deletion(-)
diff --git a/sci-physics/openmodelica/openmodelica-1.23.1.ebuild b/sci-physics/openmodelica/openmodelica-1.23.1.ebuild
index 5852a1535..b14cc60dd 100644
--- a/sci-physics/openmodelica/openmodelica-1.23.1.ebuild
+++ b/sci-physics/openmodelica/openmodelica-1.23.1.ebuild
@@ -55,7 +55,6 @@ RDEPEND="
dev-qt/qtxmlpatterns:5
dev-qt/qtwebchannel:5[qml]
>=net-misc/curl-8.7.1-r4
- >=net-misc/omniORB-4.3.0
>=sci-libs/hdf5-1.14.3-r1
>=sys-apps/hwloc-2.9.2
>=sys-devel/flex-2.6.4-r6
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sci-physics/openmodelica/
@ 2024-08-05 17:21 Ivan Lloro
0 siblings, 0 replies; 25+ messages in thread
From: Ivan Lloro @ 2024-08-05 17:21 UTC (permalink / raw
To: gentoo-commits
commit: 3c6b3b7b9215e0003bc6abbdeee49a080dadef4c
Author: Ivan Lloro <ivan.lloro.boada <AT> gmail <DOT> com>
AuthorDate: Mon Aug 5 17:20:41 2024 +0000
Commit: Ivan Lloro <ivan.lloro.boada <AT> gmail <DOT> com>
CommitDate: Mon Aug 5 17:21:12 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=3c6b3b7b
sci-physics/openmodelica: Refactor direct fortran compilation approach
Signed-off-by: Ivan Lloro <ivan.lloro.boada <AT> gmail.com>
sci-physics/openmodelica/openmodelica-1.23.1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sci-physics/openmodelica/openmodelica-1.23.1.ebuild b/sci-physics/openmodelica/openmodelica-1.23.1.ebuild
index b14cc60dd..20d67e22b 100644
--- a/sci-physics/openmodelica/openmodelica-1.23.1.ebuild
+++ b/sci-physics/openmodelica/openmodelica-1.23.1.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-inherit cmake desktop xdg toolchain-funcs fortran-2
+inherit cmake desktop xdg fortran-2
DESCRIPTION="Open-source Modelica-based modeling and simulation environment"
HOMEPAGE="https://openmodelica.org/"
@@ -128,7 +128,7 @@ src_compile() {
# OMSens is disabled in "${WORKDIR}/${P}/CMakeLists.txt" (## omc_add_subdirectory(OMSens)) due to lack of a
# working "${WORKDIR}/${P}/OMSens/CMakeLists.txt". So, we compile it manually.
pushd OMSens/fortran_interface > /dev/null || die
- $(tc-getFC) -fPIC -c Rutf.for Rut.for Curvif.for || die
+ ${FC} -fPIC -c Rutf.for Rut.for Curvif.for || die
# BUG: Undefined symbol curvif_ in
# ${WORKDIR}/${P}/OMSens/fortran_interface/curvif_simplified.cpython-312-x86_64-linux-gnu.so
# See with nm or objdump -tT
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sci-physics/openmodelica/
@ 2024-08-05 17:37 Ivan Lloro
0 siblings, 0 replies; 25+ messages in thread
From: Ivan Lloro @ 2024-08-05 17:37 UTC (permalink / raw
To: gentoo-commits
commit: 4c1b0e5236e4378ce39a4a28a329dc9129b5076e
Author: Ivan Lloro <ivan.lloro.boada <AT> gmail <DOT> com>
AuthorDate: Mon Aug 5 17:30:22 2024 +0000
Commit: Ivan Lloro <ivan.lloro.boada <AT> gmail <DOT> com>
CommitDate: Mon Aug 5 17:30:22 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=4c1b0e52
sci-physics/openmodelica: Install OMEdit icon
Signed-off-by: Ivan Lloro <ivan.lloro.boada <AT> gmail.com>
sci-physics/openmodelica/openmodelica-1.23.1.ebuild | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/sci-physics/openmodelica/openmodelica-1.23.1.ebuild b/sci-physics/openmodelica/openmodelica-1.23.1.ebuild
index 20d67e22b..61a3c4e7c 100644
--- a/sci-physics/openmodelica/openmodelica-1.23.1.ebuild
+++ b/sci-physics/openmodelica/openmodelica-1.23.1.ebuild
@@ -70,7 +70,10 @@ RDEPEND="
>=virtual/pkgconfig-3
"
-BDEPEND="dev-util/ccache"
+BDEPEND="
+ dev-util/ccache
+ media-gfx/imagemagick
+"
DEPEND="${RDEPEND}"
@@ -151,7 +154,9 @@ src_install() {
newicon -s scalable OMShell/OMShell/OMShellGUI/Resources/omshell-large.svg omshell.svg
newicon -s scalable OMNotebook/OMNotebook/OMNotebookGUI/Resources/OMNotebook_icon.svg OMNotebook.svg
- # No proper icon for Linux available from upstream for OMEdit
+ mogrify OMEdit/OMEditLIB/Resources/icons/omedit.ico[0] -thumbnail 256x256 -flatten || die
+ newicon -s 256 OMEdit/OMEditLIB/Resources/icons/omedit.ico omedit.png
+
make_desktop_entry "OMEdit %F" OMedit "" "Physics;" "MimeType=text/x-modelica;"
make_desktop_entry OMShell OMShell omshell "Physics;"
make_desktop_entry "OMNotebook %f" OMNotebook OMNotebook "Physics;"
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sci-physics/openmodelica/
@ 2024-08-05 17:48 Ivan Lloro
0 siblings, 0 replies; 25+ messages in thread
From: Ivan Lloro @ 2024-08-05 17:48 UTC (permalink / raw
To: gentoo-commits
commit: 2970dc9b878e70d984ec58f553ebe34010d7fece
Author: Ivan Lloro <ivan.lloro.boada <AT> gmail <DOT> com>
AuthorDate: Mon Aug 5 17:47:59 2024 +0000
Commit: Ivan Lloro <ivan.lloro.boada <AT> gmail <DOT> com>
CommitDate: Mon Aug 5 17:47:59 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=2970dc9b
sci-physics/openmodelica: Install OMEdit icon
Signed-off-by: Ivan Lloro <ivan.lloro.boada <AT> gmail.com>
sci-physics/openmodelica/openmodelica-1.23.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-physics/openmodelica/openmodelica-1.23.1.ebuild b/sci-physics/openmodelica/openmodelica-1.23.1.ebuild
index 61a3c4e7c..f429801b4 100644
--- a/sci-physics/openmodelica/openmodelica-1.23.1.ebuild
+++ b/sci-physics/openmodelica/openmodelica-1.23.1.ebuild
@@ -157,7 +157,7 @@ src_install() {
mogrify OMEdit/OMEditLIB/Resources/icons/omedit.ico[0] -thumbnail 256x256 -flatten || die
newicon -s 256 OMEdit/OMEditLIB/Resources/icons/omedit.ico omedit.png
- make_desktop_entry "OMEdit %F" OMedit "" "Physics;" "MimeType=text/x-modelica;"
+ make_desktop_entry "OMEdit %F" OMedit omedit "Physics;" "MimeType=text/x-modelica;"
make_desktop_entry OMShell OMShell omshell "Physics;"
make_desktop_entry "OMNotebook %f" OMNotebook OMNotebook "Physics;"
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sci-physics/openmodelica/
@ 2024-08-05 18:46 Ivan Lloro
0 siblings, 0 replies; 25+ messages in thread
From: Ivan Lloro @ 2024-08-05 18:46 UTC (permalink / raw
To: gentoo-commits
commit: 073b2395231012888682775d70576338dffca174
Author: Ivan Lloro <ivan.lloro.boada <AT> gmail <DOT> com>
AuthorDate: Mon Aug 5 18:26:37 2024 +0000
Commit: Ivan Lloro <ivan.lloro.boada <AT> gmail <DOT> com>
CommitDate: Mon Aug 5 18:46:37 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=073b2395
sci-physics/openmodelica: Fix Microsoft ICO to PNG conversion
Signed-off-by: Ivan Lloro <ivan.lloro.boada <AT> gmail.com>
sci-physics/openmodelica/openmodelica-1.23.1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sci-physics/openmodelica/openmodelica-1.23.1.ebuild b/sci-physics/openmodelica/openmodelica-1.23.1.ebuild
index f429801b4..07b041354 100644
--- a/sci-physics/openmodelica/openmodelica-1.23.1.ebuild
+++ b/sci-physics/openmodelica/openmodelica-1.23.1.ebuild
@@ -154,8 +154,8 @@ src_install() {
newicon -s scalable OMShell/OMShell/OMShellGUI/Resources/omshell-large.svg omshell.svg
newicon -s scalable OMNotebook/OMNotebook/OMNotebookGUI/Resources/OMNotebook_icon.svg OMNotebook.svg
- mogrify OMEdit/OMEditLIB/Resources/icons/omedit.ico[0] -thumbnail 256x256 -flatten || die
- newicon -s 256 OMEdit/OMEditLIB/Resources/icons/omedit.ico omedit.png
+ convert OMEdit/OMEditLIB/Resources/icons/omedit.ico[0] -thumbnail 256x256 -flatten OMEdit/OMEditLIB/Resources/icons/omedit_icon.png || die
+ newicon -s 256 OMEdit/OMEditLIB/Resources/icons/omedit_icon.png omedit.png
make_desktop_entry "OMEdit %F" OMedit omedit "Physics;" "MimeType=text/x-modelica;"
make_desktop_entry OMShell OMShell omshell "Physics;"
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sci-physics/openmodelica/
@ 2024-08-05 18:54 Ivan Lloro
0 siblings, 0 replies; 25+ messages in thread
From: Ivan Lloro @ 2024-08-05 18:54 UTC (permalink / raw
To: gentoo-commits
commit: dfcc982b98b921dd9d0818b09875d524c9aea65f
Author: Ivan Lloro <ivan.lloro.boada <AT> gmail <DOT> com>
AuthorDate: Mon Aug 5 18:54:22 2024 +0000
Commit: Ivan Lloro <ivan.lloro.boada <AT> gmail <DOT> com>
CommitDate: Mon Aug 5 18:54:29 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=dfcc982b
sci-physics/openmodelica: Ensure PNG format is supported by icon format converter (imagemagick)
Signed-off-by: Ivan Lloro <ivan.lloro.boada <AT> gmail.com>
sci-physics/openmodelica/openmodelica-1.23.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-physics/openmodelica/openmodelica-1.23.1.ebuild b/sci-physics/openmodelica/openmodelica-1.23.1.ebuild
index 07b041354..0fbe16b12 100644
--- a/sci-physics/openmodelica/openmodelica-1.23.1.ebuild
+++ b/sci-physics/openmodelica/openmodelica-1.23.1.ebuild
@@ -72,7 +72,7 @@ RDEPEND="
BDEPEND="
dev-util/ccache
- media-gfx/imagemagick
+ media-gfx/imagemagick[png]
"
DEPEND="${RDEPEND}"
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sci-physics/openmodelica/
@ 2024-08-06 17:43 Ivan Lloro
0 siblings, 0 replies; 25+ messages in thread
From: Ivan Lloro @ 2024-08-06 17:43 UTC (permalink / raw
To: gentoo-commits
commit: 7a1baa3e1f1cc01cf528a6728dd40de00f2f1566
Author: Ivan Lloro <ivan.lloro.boada <AT> gmail <DOT> com>
AuthorDate: Tue Aug 6 17:41:54 2024 +0000
Commit: Ivan Lloro <ivan.lloro.boada <AT> gmail <DOT> com>
CommitDate: Tue Aug 6 17:42:58 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=7a1baa3e
sci-physics/openmodelica: Fix dependency incompatibility with dev-libs/icu:0/75
Closes: https://bugs.gentoo.org/937430
Signed-off-by: Ivan Lloro <ivan.lloro.boada <AT> gmail.com>
sci-physics/openmodelica/openmodelica-1.23.1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sci-physics/openmodelica/openmodelica-1.23.1.ebuild b/sci-physics/openmodelica/openmodelica-1.23.1.ebuild
index 0fbe16b12..1f041c303 100644
--- a/sci-physics/openmodelica/openmodelica-1.23.1.ebuild
+++ b/sci-physics/openmodelica/openmodelica-1.23.1.ebuild
@@ -28,7 +28,7 @@ RDEPEND="
>=dev-games/openscenegraph-3.6.5-r114
dev-lang/python:3.12
>=dev-libs/expat-2.5.0
- >=dev-libs/icu-74.2
+ dev-libs/icu:0/74.1
>=dev-libs/libxml2-2.12.7
>=dev-python/kiwisolver-1.3.2
>=dev-python/matplotlib-3.3
@@ -134,7 +134,7 @@ src_compile() {
${FC} -fPIC -c Rutf.for Rut.for Curvif.for || die
# BUG: Undefined symbol curvif_ in
# ${WORKDIR}/${P}/OMSens/fortran_interface/curvif_simplified.cpython-312-x86_64-linux-gnu.so
- # See with nm or objdump -tT
+ # See with nm -D or objdump -tT
# ${WORKDIR}/${P}/OMSens/fortran_interface/curvif_simplified.cpython-312-x86_64-linux-gnu.so
# This bug causes "Vectorial Parameter Based Sensitivity Analysis" in OMSens to fail.
f2py --verbose -c -I. Curvif.o Rutf.o Rut.o -m curvif_simplified curvif_simplified.pyf Curvif_simplified.f90 || die
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sci-physics/openmodelica/
@ 2024-08-11 14:43 Ivan Lloro
0 siblings, 0 replies; 25+ messages in thread
From: Ivan Lloro @ 2024-08-11 14:43 UTC (permalink / raw
To: gentoo-commits
commit: 81079216bb1eac38e291add9b25ad84e301dad72
Author: Ivan Lloro <ivan.lloro.boada <AT> gmail <DOT> com>
AuthorDate: Sun Aug 11 14:43:13 2024 +0000
Commit: Ivan Lloro <ivan.lloro.boada <AT> gmail <DOT> com>
CommitDate: Sun Aug 11 14:43:13 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=81079216
sci-physics/openmodelica: Remove 3rd party packages stray system files
Signed-off-by: Ivan Lloro <ivan.lloro.boada <AT> gmail.com>
.../{openmodelica-1.23.1.ebuild => openmodelica-1.23.1-r1.ebuild} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-physics/openmodelica/openmodelica-1.23.1.ebuild b/sci-physics/openmodelica/openmodelica-1.23.1-r1.ebuild
similarity index 98%
rename from sci-physics/openmodelica/openmodelica-1.23.1.ebuild
rename to sci-physics/openmodelica/openmodelica-1.23.1-r1.ebuild
index 1f041c303..57a1a6ea7 100644
--- a/sci-physics/openmodelica/openmodelica-1.23.1.ebuild
+++ b/sci-physics/openmodelica/openmodelica-1.23.1-r1.ebuild
@@ -171,7 +171,7 @@ src_install() {
# Documentation housekeeping & QA
mv "${ED}"/usr/share/doc/omc "${ED}"/usr/share/doc/"${PF}" || die
- rm -fr "${ED}"/usr/doc || die
+ rm -fr "${ED}"/usr/doc "${ED}"/usr/share/zmq "${ED}"/usr/share/cmake || die
ewarn "Upstream has deprecated OMTLMSimuulator and, therefore, it has not been installed. Use OMSimulator/SSP instead."
}
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sci-physics/openmodelica/
@ 2024-08-12 17:03 Ivan Lloro
0 siblings, 0 replies; 25+ messages in thread
From: Ivan Lloro @ 2024-08-12 17:03 UTC (permalink / raw
To: gentoo-commits
commit: 9abd34372ea6ad498f1d5f138349df00a7d6c228
Author: Ivan Lloro <ivan.lloro.boada <AT> gmail <DOT> com>
AuthorDate: Mon Aug 12 17:01:38 2024 +0000
Commit: Ivan Lloro <ivan.lloro.boada <AT> gmail <DOT> com>
CommitDate: Mon Aug 12 17:03:12 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=9abd3437
Cleanup: ${WORKDIR}/${P} -> ${S}
Signed-off-by: Ivan Lloro <ivan.lloro.boada <AT> gmail.com>
.../openmodelica/openmodelica-1.23.1-r1.ebuild | 50 +++++++++++-----------
1 file changed, 25 insertions(+), 25 deletions(-)
diff --git a/sci-physics/openmodelica/openmodelica-1.23.1-r1.ebuild b/sci-physics/openmodelica/openmodelica-1.23.1-r1.ebuild
index 57a1a6ea7..435fd11ac 100644
--- a/sci-physics/openmodelica/openmodelica-1.23.1-r1.ebuild
+++ b/sci-physics/openmodelica/openmodelica-1.23.1-r1.ebuild
@@ -85,25 +85,25 @@ PATCHES=(
src_unpack() {
default
- mv "${WORKDIR}/OpenModelica-332e81aa6442c4cc4761251407332f86f80e834b" "${WORKDIR}/${P}" || die
- rmdir "${WORKDIR}/${P}/OMCompiler/3rdParty" || die
- mv "${WORKDIR}/OMCompiler-3rdParty-b826af1c1c15acf48627ad32cc0545ffc7e58bca" "${WORKDIR}/${P}/OMCompiler/3rdParty" || die
- rmdir "${WORKDIR}/${P}/OMSens" || die
- mv "${WORKDIR}/OMSens-0d804d597bc385686856d453cc830fad4923fa3e" "${WORKDIR}/${P}/OMSens" || die
- rmdir "${WORKDIR}/${P}/OMSens_Qt" || die
- mv "${WORKDIR}/OMSens_Qt-68b1b8697ac9f8e37ebe4de13c0c1d4e6e2e56fb" "${WORKDIR}/${P}/OMSens_Qt" || die
- rmdir "${WORKDIR}/${P}/OMSens_Qt/common" || die
- mv "${WORKDIR}/OpenModelica-common-08a01802db5ba5edb540383c46718b89ff229ef2" "${WORKDIR}/${P}/OMSens_Qt/common" || die
- rmdir "${WORKDIR}/${P}/OMSimulator" || die
- mv "${WORKDIR}/OMSimulator-1eb92ef35793b73e75d0cfed0c7b0311497d6278" "${WORKDIR}/${P}/OMSimulator" || die
- rmdir "${WORKDIR}/${P}/OMSimulator/3rdParty" || die
- mv "${WORKDIR}/OMSimulator-3rdParty-ca418d7768c036ac15e9894d7f00d2118b3399a6" "${WORKDIR}/${P}/OMSimulator/3rdParty" || die
- mv "OMBootstrapping-c289e97c41d00939a4a69fe504961b47283a6d8e" "${WORKDIR}/${P}/OMCompiler/Compiler/boot/bomc" || die
- touch "${WORKDIR}/${P}/OMCompiler/Compiler/boot/bomc/sources.tar.gz" || die
+ mv "${WORKDIR}/OpenModelica-332e81aa6442c4cc4761251407332f86f80e834b" "${S}" || die
+ rmdir "${S}/OMCompiler/3rdParty" || die
+ mv "${WORKDIR}/OMCompiler-3rdParty-b826af1c1c15acf48627ad32cc0545ffc7e58bca" "${S}/OMCompiler/3rdParty" || die
+ rmdir "${S}/OMSens" || die
+ mv "${WORKDIR}/OMSens-0d804d597bc385686856d453cc830fad4923fa3e" "${S}/OMSens" || die
+ rmdir "${S}/OMSens_Qt" || die
+ mv "${WORKDIR}/OMSens_Qt-68b1b8697ac9f8e37ebe4de13c0c1d4e6e2e56fb" "${S}/OMSens_Qt" || die
+ rmdir "${S}/OMSens_Qt/common" || die
+ mv "${WORKDIR}/OpenModelica-common-08a01802db5ba5edb540383c46718b89ff229ef2" "${S}/OMSens_Qt/common" || die
+ rmdir "${S}/OMSimulator" || die
+ mv "${WORKDIR}/OMSimulator-1eb92ef35793b73e75d0cfed0c7b0311497d6278" "${S}/OMSimulator" || die
+ rmdir "${S}/OMSimulator/3rdParty" || die
+ mv "${WORKDIR}/OMSimulator-3rdParty-ca418d7768c036ac15e9894d7f00d2118b3399a6" "${S}/OMSimulator/3rdParty" || die
+ mv "OMBootstrapping-c289e97c41d00939a4a69fe504961b47283a6d8e" "${S}/OMCompiler/Compiler/boot/bomc" || die
+ touch "${S}/OMCompiler/Compiler/boot/bomc/sources.tar.gz" || die
# Solve https://bugs.gentoo.org/937038
- rm -fr "${WORKDIR}/${P}/OMCompiler/3rdParty/FMIL/ThirdParty/Minizip/minizip" || die
- cp -a "${WORKDIR}/${P}/OMSimulator/3rdParty/fmi4c/3rdparty/minizip" "${WORKDIR}/${P}/OMCompiler/3rdParty/FMIL/ThirdParty/Minizip/minizip" || die
+ rm -fr "${S}/OMCompiler/3rdParty/FMIL/ThirdParty/Minizip/minizip" || die
+ cp -a "${S}/OMSimulator/3rdParty/fmi4c/3rdparty/minizip" "${S}/OMCompiler/3rdParty/FMIL/ThirdParty/Minizip/minizip" || die
}
src_configure() {
@@ -128,14 +128,14 @@ src_configure() {
src_compile() {
# [2024-07-15]
- # OMSens is disabled in "${WORKDIR}/${P}/CMakeLists.txt" (## omc_add_subdirectory(OMSens)) due to lack of a
- # working "${WORKDIR}/${P}/OMSens/CMakeLists.txt". So, we compile it manually.
+ # OMSens is disabled in "${S}/CMakeLists.txt" (## omc_add_subdirectory(OMSens)) due to lack of a
+ # working "${S}/OMSens/CMakeLists.txt". So, we compile it manually.
pushd OMSens/fortran_interface > /dev/null || die
${FC} -fPIC -c Rutf.for Rut.for Curvif.for || die
# BUG: Undefined symbol curvif_ in
- # ${WORKDIR}/${P}/OMSens/fortran_interface/curvif_simplified.cpython-312-x86_64-linux-gnu.so
+ # ${S}/OMSens/fortran_interface/curvif_simplified.cpython-312-x86_64-linux-gnu.so
# See with nm -D or objdump -tT
- # ${WORKDIR}/${P}/OMSens/fortran_interface/curvif_simplified.cpython-312-x86_64-linux-gnu.so
+ # ${S}/OMSens/fortran_interface/curvif_simplified.cpython-312-x86_64-linux-gnu.so
# This bug causes "Vectorial Parameter Based Sensitivity Analysis" in OMSens to fail.
f2py --verbose -c -I. Curvif.o Rutf.o Rut.o -m curvif_simplified curvif_simplified.pyf Curvif_simplified.f90 || die
popd > /dev/null || die
@@ -147,8 +147,8 @@ src_install() {
cmake_src_install
# [2024-07-15]
- # OMSens is disabled in "${WORKDIR}/${P}/CMakeLists.txt" (## omc_add_subdirectory(OMSens)) due to lack of a
- # working "${WORKDIR}/${P}/OMSens/CMakeLists.txt". So, we install it manually.
+ # OMSens is disabled in "${S}/CMakeLists.txt" (## omc_add_subdirectory(OMSens)) due to lack of a
+ # working "${S}/OMSens/CMakeLists.txt". So, we install it manually.
cp -a "${WORKDIR}"/"${P}"/OMSens "${ED}"/usr/share/ || die
rm -fr "${ED}"/usr/share/OMSens/{old,.git,.gitignore,CMakeLists.txt,.jenkins,Jenkinsfile,Makefile.omdev.mingw,Makefile.unix,README.md,setup.py,testing} || die
@@ -171,7 +171,7 @@ src_install() {
# Documentation housekeeping & QA
mv "${ED}"/usr/share/doc/omc "${ED}"/usr/share/doc/"${PF}" || die
- rm -fr "${ED}"/usr/doc "${ED}"/usr/share/zmq "${ED}"/usr/share/cmake || die
+ rm -fr "${ED}"/usr/doc "${ED}"/usr/share/{zmq,cmake} || die
- ewarn "Upstream has deprecated OMTLMSimuulator and, therefore, it has not been installed. Use OMSimulator/SSP instead."
+ ewarn "Upstream has deprecated OMTLMSimulator and, therefore, it has not been installed. Use OMSimulator/SSP instead."
}
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sci-physics/openmodelica/
@ 2024-08-13 17:04 Ivan Lloro
0 siblings, 0 replies; 25+ messages in thread
From: Ivan Lloro @ 2024-08-13 17:04 UTC (permalink / raw
To: gentoo-commits
commit: 49406953f577c25a2bb2fe38035988f693e04c2c
Author: Ivan Lloro <ivan.lloro.boada <AT> gmail <DOT> com>
AuthorDate: Tue Aug 13 17:04:45 2024 +0000
Commit: Ivan Lloro <ivan.lloro.boada <AT> gmail <DOT> com>
CommitDate: Tue Aug 13 17:04:46 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=49406953
sci-physics/openmodelica: Fix QA issues (long lines and indentation)
Signed-off-by: Ivan Lloro <ivan.lloro.boada <AT> gmail.com>
.../openmodelica/openmodelica-1.23.1-r1.ebuild | 33 ++++++++++++++--------
1 file changed, 22 insertions(+), 11 deletions(-)
diff --git a/sci-physics/openmodelica/openmodelica-1.23.1-r1.ebuild b/sci-physics/openmodelica/openmodelica-1.23.1-r1.ebuild
index 435fd11ac..546d6daf0 100644
--- a/sci-physics/openmodelica/openmodelica-1.23.1-r1.ebuild
+++ b/sci-physics/openmodelica/openmodelica-1.23.1-r1.ebuild
@@ -7,14 +7,22 @@ inherit cmake desktop xdg fortran-2
DESCRIPTION="Open-source Modelica-based modeling and simulation environment"
HOMEPAGE="https://openmodelica.org/"
SRC_URI="
- https://github.com/OpenModelica/OpenModelica/archive/332e81aa6442c4cc4761251407332f86f80e834b.tar.gz -> ${P}.tar.gz
- https://github.com/OpenModelica/OMCompiler-3rdParty/archive/b826af1c1c15acf48627ad32cc0545ffc7e58bca.tar.gz -> OMCompiler-3rdParty_${P}.tar.gz
- https://github.com/OpenModelica/OMBootstrapping/archive/c289e97c41d00939a4a69fe504961b47283a6d8e.tar.gz -> OMBootstrapping_${P}.tar.gz
- https://github.com/OpenModelica/OMSens/archive/0d804d597bc385686856d453cc830fad4923fa3e.tar.gz -> OMSens_${P}.tar.gz
- https://github.com/OpenModelica/OMSens_Qt/archive/68b1b8697ac9f8e37ebe4de13c0c1d4e6e2e56fb.tar.gz -> OMSens_Qt_${P}.tar.gz
- https://github.com/OpenModelica/OpenModelica-common/archive/08a01802db5ba5edb540383c46718b89ff229ef2.tar.gz -> OpenModelica-common_${P}.tar.gz
- https://github.com/OpenModelica/OMSimulator/archive/1eb92ef35793b73e75d0cfed0c7b0311497d6278.tar.gz -> OMSimulator_${P}.tar.gz
- https://github.com/OpenModelica/OMSimulator-3rdParty/archive/ca418d7768c036ac15e9894d7f00d2118b3399a6.tar.gz -> OMSimulator-3rdParty_${P}.tar.gz
+ https://github.com/OpenModelica/OpenModelica/archive/332e81aa6442c4cc4761251407332f86f80e834b.tar.gz
+ -> ${P}.tar.gz
+ https://github.com/OpenModelica/OMCompiler-3rdParty/archive/b826af1c1c15acf48627ad32cc0545ffc7e58bca.tar.gz
+ -> OMCompiler-3rdParty_${P}.tar.gz
+ https://github.com/OpenModelica/OMBootstrapping/archive/c289e97c41d00939a4a69fe504961b47283a6d8e.tar.gz
+ -> OMBootstrapping_${P}.tar.gz
+ https://github.com/OpenModelica/OMSens/archive/0d804d597bc385686856d453cc830fad4923fa3e.tar.gz
+ -> OMSens_${P}.tar.gz
+ https://github.com/OpenModelica/OMSens_Qt/archive/68b1b8697ac9f8e37ebe4de13c0c1d4e6e2e56fb.tar.gz
+ -> OMSens_Qt_${P}.tar.gz
+ https://github.com/OpenModelica/OpenModelica-common/archive/08a01802db5ba5edb540383c46718b89ff229ef2.tar.gz
+ -> OpenModelica-common_${P}.tar.gz
+ https://github.com/OpenModelica/OMSimulator/archive/1eb92ef35793b73e75d0cfed0c7b0311497d6278.tar.gz
+ -> OMSimulator_${P}.tar.gz
+ https://github.com/OpenModelica/OMSimulator-3rdParty/archive/ca418d7768c036ac15e9894d7f00d2118b3399a6.tar.gz
+ -> OMSimulator-3rdParty_${P}.tar.gz
"
LICENSE="OSMC-PL GPL-3 AGPL-3 BSD EPL-1.0 public-domain BSD-with-attribution LGPL-2.1+ LGPL-2 Apache-2.0 Boost-1.0 Modelica-1.1 Modelica-2 MIT WTFPL-2"
@@ -103,7 +111,8 @@ src_unpack() {
# Solve https://bugs.gentoo.org/937038
rm -fr "${S}/OMCompiler/3rdParty/FMIL/ThirdParty/Minizip/minizip" || die
- cp -a "${S}/OMSimulator/3rdParty/fmi4c/3rdparty/minizip" "${S}/OMCompiler/3rdParty/FMIL/ThirdParty/Minizip/minizip" || die
+ cp -a "${S}/OMSimulator/3rdParty/fmi4c/3rdparty/minizip" \
+ "${S}/OMCompiler/3rdParty/FMIL/ThirdParty/Minizip/minizip" || die
}
src_configure() {
@@ -150,11 +159,13 @@ src_install() {
# OMSens is disabled in "${S}/CMakeLists.txt" (## omc_add_subdirectory(OMSens)) due to lack of a
# working "${S}/OMSens/CMakeLists.txt". So, we install it manually.
cp -a "${WORKDIR}"/"${P}"/OMSens "${ED}"/usr/share/ || die
- rm -fr "${ED}"/usr/share/OMSens/{old,.git,.gitignore,CMakeLists.txt,.jenkins,Jenkinsfile,Makefile.omdev.mingw,Makefile.unix,README.md,setup.py,testing} || die
+ rm -fr "${ED}"/usr/share/OMSens/{old,.git,.gitignore,CMakeLists.txt,.jenkins,Jenkinsfile,Makefile.omdev.mingw,Makefile.unix} || die
+ rm -fr "${ED}"/usr/share/OMSens/{README.md,setup.py,testing} || die
newicon -s scalable OMShell/OMShell/OMShellGUI/Resources/omshell-large.svg omshell.svg
newicon -s scalable OMNotebook/OMNotebook/OMNotebookGUI/Resources/OMNotebook_icon.svg OMNotebook.svg
- convert OMEdit/OMEditLIB/Resources/icons/omedit.ico[0] -thumbnail 256x256 -flatten OMEdit/OMEditLIB/Resources/icons/omedit_icon.png || die
+ convert OMEdit/OMEditLIB/Resources/icons/omedit.ico[0] -thumbnail 256x256 -flatten \
+ OMEdit/OMEditLIB/Resources/icons/omedit_icon.png || die
newicon -s 256 OMEdit/OMEditLIB/Resources/icons/omedit_icon.png omedit.png
make_desktop_entry "OMEdit %F" OMedit omedit "Physics;" "MimeType=text/x-modelica;"
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sci-physics/openmodelica/
@ 2024-10-25 15:24 Ivan Lloro
0 siblings, 0 replies; 25+ messages in thread
From: Ivan Lloro @ 2024-10-25 15:24 UTC (permalink / raw
To: gentoo-commits
commit: 6f67f65f5dee05d9dbcd332fa96adb44b3425421
Author: Ivan Lloro <ivan.lloro.boada <AT> gmail <DOT> com>
AuthorDate: Fri Oct 25 15:24:15 2024 +0000
Commit: Ivan Lloro <ivan.lloro.boada <AT> gmail <DOT> com>
CommitDate: Fri Oct 25 15:24:28 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=6f67f65f
Upgrade ImageMagick dependency to version 7
Signed-off-by: Ivan Lloro <ivan.lloro.boada <AT> gmail.com>
sci-physics/openmodelica/openmodelica-1.23.1-r1.ebuild | 4 ++--
sci-physics/openmodelica/openmodelica-1.24.0.ebuild | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/sci-physics/openmodelica/openmodelica-1.23.1-r1.ebuild b/sci-physics/openmodelica/openmodelica-1.23.1-r1.ebuild
index 546d6daf0..dc3408fbe 100644
--- a/sci-physics/openmodelica/openmodelica-1.23.1-r1.ebuild
+++ b/sci-physics/openmodelica/openmodelica-1.23.1-r1.ebuild
@@ -80,7 +80,7 @@ RDEPEND="
BDEPEND="
dev-util/ccache
- media-gfx/imagemagick[png]
+ >=media-gfx/imagemagick[png]-7.1.1.25-r1
"
DEPEND="${RDEPEND}"
@@ -164,7 +164,7 @@ src_install() {
newicon -s scalable OMShell/OMShell/OMShellGUI/Resources/omshell-large.svg omshell.svg
newicon -s scalable OMNotebook/OMNotebook/OMNotebookGUI/Resources/OMNotebook_icon.svg OMNotebook.svg
- convert OMEdit/OMEditLIB/Resources/icons/omedit.ico[0] -thumbnail 256x256 -flatten \
+ magick convert OMEdit/OMEditLIB/Resources/icons/omedit.ico[0] -thumbnail 256x256 -flatten \
OMEdit/OMEditLIB/Resources/icons/omedit_icon.png || die
newicon -s 256 OMEdit/OMEditLIB/Resources/icons/omedit_icon.png omedit.png
diff --git a/sci-physics/openmodelica/openmodelica-1.24.0.ebuild b/sci-physics/openmodelica/openmodelica-1.24.0.ebuild
index df6bca50a..4f9f0d6e9 100644
--- a/sci-physics/openmodelica/openmodelica-1.24.0.ebuild
+++ b/sci-physics/openmodelica/openmodelica-1.24.0.ebuild
@@ -84,7 +84,7 @@ RDEPEND="
BDEPEND="
dev-util/ccache
- media-gfx/imagemagick[png]
+ >=media-gfx/imagemagick[png]-7.1.1.25-r1
"
DEPEND="${RDEPEND}"
@@ -104,7 +104,7 @@ src_unpack() {
# OMOptim depends on a working CORBA interface (which fails to compile) supplied by OmniORB.
# For compilation trials remember setting -DOM_OMC_USE_CORBA=ON.
#rmdir "${S}/OMOptim" || die
- #mv "${WORKDIR}/OMOptim-e4fb998f99e3fefc63c661715dbc06cbea1f0134" "${S}/OMOptim" || die
+ #mv "${WORKDIR}/OMOptim-f1036f43db18c5015da259771004cfb80e08a110" "${S}/OMOptim" || die
#rmdir "${S}/OMOptim/common" || die
#cp -a "${WORKDIR}/OpenModelica-common-08a01802db5ba5edb540383c46718b89ff229ef2" "${S}/OMOptim/common" || die
@@ -177,7 +177,7 @@ src_install() {
newicon -s scalable OMShell/OMShell/OMShellGUI/Resources/omshell-large.svg omshell.svg
newicon -s scalable OMNotebook/OMNotebook/OMNotebookGUI/Resources/OMNotebook_icon.svg OMNotebook.svg
- convert OMEdit/OMEditLIB/Resources/icons/omedit.ico[0] -thumbnail 256x256 -flatten \
+ magick convert OMEdit/OMEditLIB/Resources/icons/omedit.ico[0] -thumbnail 256x256 -flatten \
OMEdit/OMEditLIB/Resources/icons/omedit_icon.png || die
newicon -s 256 OMEdit/OMEditLIB/Resources/icons/omedit_icon.png omedit.png
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sci-physics/openmodelica/
@ 2024-10-25 15:31 Ivan Lloro
0 siblings, 0 replies; 25+ messages in thread
From: Ivan Lloro @ 2024-10-25 15:31 UTC (permalink / raw
To: gentoo-commits
commit: ef05c7fed0eb72d95d3620b5c8cfd70f09911a11
Author: Ivan Lloro <ivan.lloro.boada <AT> gmail <DOT> com>
AuthorDate: Fri Oct 25 15:31:27 2024 +0000
Commit: Ivan Lloro <ivan.lloro.boada <AT> gmail <DOT> com>
CommitDate: Fri Oct 25 15:31:27 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ef05c7fe
Fix dependency format error
Signed-off-by: Ivan Lloro <ivan.lloro.boada <AT> gmail.com>
sci-physics/openmodelica/openmodelica-1.23.1-r1.ebuild | 2 +-
sci-physics/openmodelica/openmodelica-1.24.0.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sci-physics/openmodelica/openmodelica-1.23.1-r1.ebuild b/sci-physics/openmodelica/openmodelica-1.23.1-r1.ebuild
index dc3408fbe..381a1c61c 100644
--- a/sci-physics/openmodelica/openmodelica-1.23.1-r1.ebuild
+++ b/sci-physics/openmodelica/openmodelica-1.23.1-r1.ebuild
@@ -80,7 +80,7 @@ RDEPEND="
BDEPEND="
dev-util/ccache
- >=media-gfx/imagemagick[png]-7.1.1.25-r1
+ >=media-gfx/imagemagick-7.1.1.25-r1[png]
"
DEPEND="${RDEPEND}"
diff --git a/sci-physics/openmodelica/openmodelica-1.24.0.ebuild b/sci-physics/openmodelica/openmodelica-1.24.0.ebuild
index 4f9f0d6e9..2928dc8c4 100644
--- a/sci-physics/openmodelica/openmodelica-1.24.0.ebuild
+++ b/sci-physics/openmodelica/openmodelica-1.24.0.ebuild
@@ -84,7 +84,7 @@ RDEPEND="
BDEPEND="
dev-util/ccache
- >=media-gfx/imagemagick[png]-7.1.1.25-r1
+ >=media-gfx/imagemagick-7.1.1.25-r1[png]
"
DEPEND="${RDEPEND}"
^ permalink raw reply related [flat|nested] 25+ messages in thread
end of thread, other threads:[~2024-10-25 15:31 UTC | newest]
Thread overview: 25+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-08-11 14:43 [gentoo-commits] repo/proj/guru:dev commit in: sci-physics/openmodelica/ Ivan Lloro
-- strict thread matches above, loose matches on Subject: below --
2024-10-25 15:31 Ivan Lloro
2024-10-25 15:24 Ivan Lloro
2024-08-13 17:04 Ivan Lloro
2024-08-12 17:03 Ivan Lloro
2024-08-06 17:43 Ivan Lloro
2024-08-05 18:54 Ivan Lloro
2024-08-05 18:46 Ivan Lloro
2024-08-05 17:48 Ivan Lloro
2024-08-05 17:37 Ivan Lloro
2024-08-05 17:21 Ivan Lloro
2024-08-05 14:18 Ivan Lloro
2024-08-05 13:44 Ivan Lloro
2024-08-05 9:36 Ivan Lloro
2024-08-04 19:51 Ivan Lloro
2024-08-04 18:24 Ivan Lloro
2024-08-04 18:24 Ivan Lloro
2024-07-31 23:31 Ivan Lloro
2024-07-31 23:31 Ivan Lloro
2024-07-31 23:31 Ivan Lloro
2024-07-30 18:42 Ivan Lloro
2024-07-30 16:00 Takuya Wakazono
2024-07-29 3:19 Ivan Lloro
2024-07-28 23:01 Ivan Lloro
2024-07-28 22:49 Ivan Lloro
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox