From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6FC59158042 for ; Tue, 29 Oct 2024 10:53:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C8AA4E0844; Tue, 29 Oct 2024 10:53:35 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AF593E0844 for ; Tue, 29 Oct 2024 10:53:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7EC90343136 for ; Tue, 29 Oct 2024 10:53:34 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id ADA8A1F64 for ; Tue, 29 Oct 2024 10:53:31 +0000 (UTC) From: "David Roman" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Roman" Message-ID: <1729869868.6f67f65f5dee05d9dbcd332fa96adb44b3425421.davidroman@gentoo> Subject: [gentoo-commits] repo/proj/guru:master commit in: sci-physics/openmodelica/ X-VCS-Repository: repo/proj/guru X-VCS-Files: sci-physics/openmodelica/openmodelica-1.23.1-r1.ebuild sci-physics/openmodelica/openmodelica-1.24.0.ebuild X-VCS-Directories: sci-physics/openmodelica/ X-VCS-Committer: davidroman X-VCS-Committer-Name: David Roman X-VCS-Revision: 6f67f65f5dee05d9dbcd332fa96adb44b3425421 X-VCS-Branch: master Date: Tue, 29 Oct 2024 10:53:31 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: bb8b18dc-73f5-44a9-b2e0-311afe102e70 X-Archives-Hash: 062764319c4448545555c9ddfc7f0cc2 commit: 6f67f65f5dee05d9dbcd332fa96adb44b3425421 Author: Ivan Lloro gmail com> AuthorDate: Fri Oct 25 15:24:15 2024 +0000 Commit: David Roman gmail 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 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