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
