commit: 0cacec0c738a1f807acb582907a467579b349ae7 Author: Yahor Berdnikau <egorr.berd <AT> gmail <DOT> com> AuthorDate: Sun Feb 6 20:05:29 2022 +0000 Commit: Yahor Berdnikau <egorr.berd <AT> gmail <DOT> com> CommitDate: Sun Feb 6 20:05:29 2022 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=0cacec0c
media-gfx/superslicer: Fix app name for 2.3.57.7 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Yahor Berdnikau <egorr.berd <AT> gmail.com> media-gfx/superslicer/Manifest | 2 +- .../files/version-suffix-2.3.57.7.patch | 35 +++++++++++++++++----- ....57.7.ebuild => superslicer-2.3.57.7-r1.ebuild} | 13 ++++---- 3 files changed, 34 insertions(+), 16 deletions(-) diff --git a/media-gfx/superslicer/Manifest b/media-gfx/superslicer/Manifest index c71adf7b3..598043981 100644 --- a/media-gfx/superslicer/Manifest +++ b/media-gfx/superslicer/Manifest @@ -1,5 +1,5 @@ DIST superslicer-2.2.53.4.tar.gz 33791161 BLAKE2B c8454ac66a5d75f5bbcd1c29f600897c697f03ad581c97539033758942eac1d4ba0d2acbac43e75307a06e565d25a39b192e6cde522cce6b728afc04c42f82bb SHA512 f883cca3eb2575186c5077e2c1f9ca37e497ff6ed9aeae45a58c1db4de1c52db36fc0f14e7fdcd95aaf375b340932674014614cdab8c6995c56b9988fe5baa06 -DIST superslicer-2.3.57.7-profiles.tar.gz 12157428 BLAKE2B 2ce1a98987c601fc979f895e6902b7e43db336eb0d44bb1f38370969d9c514a29430d5db32fe2766f6887a20970f49aa74a573862eefeeaab63cfff482bdd729 SHA512 87fbd56a104d205f2d32f9e71e6c679fb63a48aa74387c87fd551dad47709e5491e7ce597d0b0f8bc448191674a8f9e71d240a8f7ade35cf359e3bf1d5059213 +DIST superslicer-2.3.57.7-profiles.zip 12193950 BLAKE2B c61be0190345bf886cbe60495f95266ec0b07824c803eaca7a29853a3465ab3d631d794899aebb9ef5f7660cb9341c70e9c38d6f8247a58655ed720deebbc584 SHA512 6beab170ae7e50e9880288673fd482f2903d5e9b87a0ddd6549098fa35f9b87e4891f015d0a26aedfac9736c3f55dcd1794d8abb3f9cc072bcdbb7e87f42a9fa DIST superslicer-2.3.57.7.tar.gz 32400355 BLAKE2B bcacf218ad18146327a9f7005d2c2217cf859d2793e8f74bfd453e2b8b12bf83d224f0325f6908b806735fb94c476b87c5dfe35c16026006bf5bd38de26e5f36 SHA512 d9a92366ed426dab77a5d49cddd7c7f37f2a0e026574bcbff342e579c555aefb19aaea8de7b5180bb87ab2749ba0cef96e870d808914fdbc58f3ddf04e1a4a65 DIST superslicer-2.3.57.9-profiles.zip 12193950 BLAKE2B c61be0190345bf886cbe60495f95266ec0b07824c803eaca7a29853a3465ab3d631d794899aebb9ef5f7660cb9341c70e9c38d6f8247a58655ed720deebbc584 SHA512 6beab170ae7e50e9880288673fd482f2903d5e9b87a0ddd6549098fa35f9b87e4891f015d0a26aedfac9736c3f55dcd1794d8abb3f9cc072bcdbb7e87f42a9fa DIST superslicer-2.3.57.9.tar.gz 32406027 BLAKE2B 66c6c5cfb044165dd8cce3030fc9e6c29df078aaca94dfecef4c5943a21667fc9dd12d88e821952382e7556775119daf221030b2bb25fc1e52071c4f367fe041 SHA512 bf421afa55ad7d1c3eafa8dc15efb20ab463e21b78f5e03d188f68d018a7b32cd24c2163974d90eff80e1ebb39a669b3e877a614e1040bc31c7160cca7ffc554 diff --git a/media-gfx/superslicer/files/version-suffix-2.3.57.7.patch b/media-gfx/superslicer/files/version-suffix-2.3.57.7.patch index 74e982cad..f140f8e18 100644 --- a/media-gfx/superslicer/files/version-suffix-2.3.57.7.patch +++ b/media-gfx/superslicer/files/version-suffix-2.3.57.7.patch @@ -1,11 +1,8 @@ --- a/version.inc +++ b/version.inc -@@ -2,11 +2,11 @@ - # (the version numbers are generated by the build script from the git current label) - +@@ -4,9 +4,9 @@ # name of the slicer --set(SLIC3R_APP_NAME "SuperSlicer") -+set(SLIC3R_APP_NAME "SuperSlicer2.3") + set(SLIC3R_APP_NAME "SuperSlicer") # Key fo the slicer, must only contains ascii chars and no spaces (be valid in all filesystems) -set(SLIC3R_APP_KEY "SuperSlicer") +set(SLIC3R_APP_KEY "SuperSlicer2.3") @@ -13,5 +10,29 @@ -set(SLIC3R_APP_CMD "superslicer") +set(SLIC3R_APP_CMD "superslicer-2.3") # versions - set(SLIC3R_VERSION "2.3.56") - set(SLIC3R_VERSION_FULL "2.3.56.7") + set(SLIC3R_VERSION "2.3.57") + set(SLIC3R_VERSION_FULL "2.3.57.7") +--- a/src/platform/unix/Gcodeviewer.desktop.in ++++ b/src/platform/unix/Gcodeviewer.desktop.in +@@ -1,5 +1,5 @@ + [Desktop Entry] +-Name=@GCODEVIEWER_APP_NAME@ ++Name=@GCODEVIEWER_APP_KEY@ + Comment=G-code viewer of Slic3r + Exec=@SLIC3R_APP_CMD@ --gcodeviewer %F + Icon=@GCODEVIEWER_APP_KEY@ +--- a/src/platform/unix/Slic3r.desktop.in ++++ b/src/platform/unix/Slic3r.desktop.in +@@ -1,5 +1,5 @@ + [Desktop Entry] +-Name=@SLIC3R_APP_NAME@ ++Name=@SLIC3R_APP_KEY@ + GenericName=3D Printing Software + Comment=G-code generator for 3D printers + Icon=@SLIC3R_APP_KEY@ +@@ -10,4 +10,4 @@ MimeType=model/stl;application/vnd.ms-3mfdocument;application/prs.wavefront-obj; + Categories=Graphics;3DGraphics;Engineering; + Keywords=3D;Printing;Slicer;slice;3D;printer;convert;gcode;stl;obj;amf;SLA + StartupNotify=false +-StartupWMClass=@SLIC3R_APP_KEY@ ++StartupWMClass=@SLIC3R_APP_NAME@ diff --git a/media-gfx/superslicer/superslicer-2.3.57.7.ebuild b/media-gfx/superslicer/superslicer-2.3.57.7-r1.ebuild similarity index 84% rename from media-gfx/superslicer/superslicer-2.3.57.7.ebuild rename to media-gfx/superslicer/superslicer-2.3.57.7-r1.ebuild index 9f44fab0c..b352df777 100644 --- a/media-gfx/superslicer/superslicer-2.3.57.7.ebuild +++ b/media-gfx/superslicer/superslicer-2.3.57.7-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021 Gentoo Authors +# Copyright 2021-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ MY_PN="SuperSlicer" DESCRIPTION="A mesh slicer to generated G-Code for fused-filament fabrication" HOMEPAGE="https://github.com/supermerill/SuperSlicer"; SRC_URI="https://github.com/supermerill/SuperSlicer/archive/${PV}.tar.gz -> ${P}.tar.gz - profiles? ( https://github.com/slic3r/slic3r-profiles/archive/118aa919c16837eb2ff6ba97e2934fa4144ef806.tar.gz -> ${P}-profiles.tar.gz )" + profiles? ( https://github.com/slic3r/slic3r-profiles/archive/118aa919c16837eb2ff6ba97e2934fa4144ef806.zip -> ${P}-profiles.zip )" S="${WORKDIR}/${MY_PN}-${PV}" LICENSE="AGPL-3" @@ -23,6 +23,7 @@ IUSE="gui test profiles" REQUIRED_USE="test? ( gui )" RESTRICT="!test? ( test )" +BDEPEND="profiles? ( app-arch/unzip )" RDEPEND=" dev-cpp/eigen:3 dev-cpp/tbb @@ -75,7 +76,7 @@ src_unpack() { mv "${S}/resources/icons/SuperSlicer-gcodeviewer_192px.png" "${S}/resources/icons/SuperSlicer2.3-gcodeviewer_192px.png" || die "Failed to rename icons" cp "${S}/resources/icons/SuperSlicer.png" "${S}/resources/icons/SuperSlicer2.3_logo.png" || die "Failed to make logo icon" - use profiles && unpack ${P}-profiles.tar.gz && + use profiles && unpack ${P}-profiles.zip && if use profiles ; then cp -r "${WORKDIR}/slic3r-profiles-118aa919c16837eb2ff6ba97e2934fa4144ef806/"* "${S}/resources/profiles" || die "Failed to copy profiles" fi @@ -102,11 +103,7 @@ src_install() { cmake_src_install if use gui; then - newicon -s 128 resources/icons/Slic3r_128px.png SuperSli3er_2.3.png + newicon -s 128 resources/icons/SuperSlicer2.3_128px.png SuperSlicer2.3.png dosym superslicer-2.3 /usr/bin/superslicer-2.3-gcodeviewer - make_desktop_entry superslicer "SuperSlicer 2.3" "SuperSli3er_2.3" "Graphics;3DGraphics;Engineering;" \ - "MimeType=model/stl;application/vnd.ms-3mfdocument;application/prs.wavefront-obj;application/x-amf;" \ - "GenericName=3D Printing Software" \ - "Keywords=3D;Printing;Slicer;slice;3D;printer;convert;gcode;stl;obj;amf;SLA" fi }
