commit: 9b2448191753120ea5c8ef145c481fad7978ab68 Author: Huang Rui <vowstar <AT> gmail <DOT> com> AuthorDate: Wed Jun 26 03:51:15 2024 +0000 Commit: David Roman <davidroman96 <AT> gmail <DOT> com> CommitDate: Wed Jun 26 03:51:15 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=9b244819
media-gfx/bambustudio-bin: improve ebuild Fix problem in https://github.com/gentoo/guru/commit/867a2c92d6ab65d16b191d17ff7a8af53eb83007 Signed-off-by: Huang Rui <vowstar <AT> gmail.com> media-gfx/bambustudio-bin/bambustudio-bin-01.09.03.50.ebuild | 12 ++++-------- media-gfx/bambustudio-bin/files/bambu-studio | 3 --- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/media-gfx/bambustudio-bin/bambustudio-bin-01.09.03.50.ebuild b/media-gfx/bambustudio-bin/bambustudio-bin-01.09.03.50.ebuild index 2d0b5b206..537cb66c3 100644 --- a/media-gfx/bambustudio-bin/bambustudio-bin-01.09.03.50.ebuild +++ b/media-gfx/bambustudio-bin/bambustudio-bin-01.09.03.50.ebuild @@ -6,7 +6,7 @@ EAPI=8 MY_PN="BambuStudio" WX_GTK_VER="3.0-gtk3" -inherit desktop unpacker xdg +inherit desktop wrapper xdg DESCRIPTION="Bambu Studio is a cutting-edge, feature-rich slicing software" HOMEPAGE="https://bambulab.com"; @@ -15,7 +15,6 @@ SRC_URI=" https://github.com/bambulab/${MY_PN}/releases/download/v${PV}/Bambu_Studio_linux_fedora-v${PV}.AppImage \ -> ${P}.AppImage " -S="${WORKDIR}/${P}" LICENSE="AGPL-3" SLOT="0" @@ -55,10 +54,7 @@ src_unpack() { } src_install() { - rm "${S}"/squashfs-root/*.AppImage || die - rm "${S}"/squashfs-root/*.desktop || die - rm "${S}"/squashfs-root/.DirIcon || die - rm -r "${S}"/squashfs-root/usr || die + rm -r squashfs-root/{*.{AppImage,desktop},.DirIcon,usr} || die patchelf --replace-needed libwebkit2gtk-4.0.so.37 libwebkit2gtk-4.1.so.0 \ "${S}"/squashfs-root/bin/bambu-studio || die patchelf --replace-needed libjavascriptcoregtk-4.0.so.18 libjavascriptcoregtk-4.1.so.0 \ @@ -69,8 +65,8 @@ src_install() { "${S}"/squashfs-root/bin/bambu-studio || die insinto /opt/"${PN}" doins -r "${S}"/squashfs-root/* - fperms +x "/opt/${PN}/AppRun" "/opt/${PN}/bin/bambu-studio" + fperms +x "/opt/${PN}/AppRun" doicon -s 192 "${S}"/squashfs-root/BambuStudio.png domenu "${FILESDIR}/bambu-studio.desktop" - dobin "${FILESDIR}/bambu-studio" + make_wrapper "${PN}" "/opt/${PN}/AppRun" } diff --git a/media-gfx/bambustudio-bin/files/bambu-studio b/media-gfx/bambustudio-bin/files/bambu-studio deleted file mode 100644 index 3a66948c4..000000000 --- a/media-gfx/bambustudio-bin/files/bambu-studio +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -exec "/opt/bambustudio-bin/AppRun" "$1" -
