From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1402401-garchives=archives.gentoo.org@lists.gentoo.org> 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 (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id CDEC5158090 for <garchives@archives.gentoo.org>; Sun, 29 May 2022 20:39:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 94E1AE08F2; Sun, 29 May 2022 20:39:06 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 75DAFE08F2 for <gentoo-commits@lists.gentoo.org>; Sun, 29 May 2022 20:39:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5A6DA34148F for <gentoo-commits@lists.gentoo.org>; Sun, 29 May 2022 20:39:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3CD974D4 for <gentoo-commits@lists.gentoo.org>; Sun, 29 May 2022 20:39:03 +0000 (UTC) From: "Yahor Berdnikau" <egorr.berd@gmail.com> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Yahor Berdnikau" <egorr.berd@gmail.com> Message-ID: <1653856646.5b22aaf01ab109a5e0dd1fd7d86a58f261d39b00.egorr.berd@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: media-gfx/superslicer/files/, media-gfx/superslicer/ X-VCS-Repository: repo/proj/guru X-VCS-Files: media-gfx/superslicer/Manifest media-gfx/superslicer/files/missing-imports-2.3.57.10.patch media-gfx/superslicer/files/version-suffix-2.3.57.10.patch media-gfx/superslicer/superslicer-2.3.57.10.ebuild X-VCS-Directories: media-gfx/superslicer/ media-gfx/superslicer/files/ X-VCS-Committer: egorr.berd X-VCS-Committer-Name: Yahor Berdnikau X-VCS-Revision: 5b22aaf01ab109a5e0dd1fd7d86a58f261d39b00 X-VCS-Branch: dev Date: Sun, 29 May 2022 20:39:03 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f3672306-4ff3-4619-abb2-0841ee9e9983 X-Archives-Hash: d4de1af408e98f424e645451d596cc17 commit: 5b22aaf01ab109a5e0dd1fd7d86a58f261d39b00 Author: Yahor Berdnikau <egorr.berd <AT> gmail <DOT> com> AuthorDate: Sun May 29 20:37:26 2022 +0000 Commit: Yahor Berdnikau <egorr.berd <AT> gmail <DOT> com> CommitDate: Sun May 29 20:37:26 2022 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=5b22aaf0 media-gfx/superslicer: drop 2.3.57.10 Signed-off-by: Yahor Berdnikau <egorr.berd <AT> gmail.com> media-gfx/superslicer/Manifest | 2 - .../files/missing-imports-2.3.57.10.patch | 10 -- .../files/version-suffix-2.3.57.10.patch | 38 -------- media-gfx/superslicer/superslicer-2.3.57.10.ebuild | 108 --------------------- 4 files changed, 158 deletions(-) diff --git a/media-gfx/superslicer/Manifest b/media-gfx/superslicer/Manifest index ea9073fee..d607392fb 100644 --- a/media-gfx/superslicer/Manifest +++ b/media-gfx/superslicer/Manifest @@ -1,6 +1,4 @@ DIST superslicer-2.2.53.4.tar.gz 33791161 BLAKE2B c8454ac66a5d75f5bbcd1c29f600897c697f03ad581c97539033758942eac1d4ba0d2acbac43e75307a06e565d25a39b192e6cde522cce6b728afc04c42f82bb SHA512 f883cca3eb2575186c5077e2c1f9ca37e497ff6ed9aeae45a58c1db4de1c52db36fc0f14e7fdcd95aaf375b340932674014614cdab8c6995c56b9988fe5baa06 -DIST superslicer-2.3.57.10-profiles.zip 12193950 BLAKE2B c61be0190345bf886cbe60495f95266ec0b07824c803eaca7a29853a3465ab3d631d794899aebb9ef5f7660cb9341c70e9c38d6f8247a58655ed720deebbc584 SHA512 6beab170ae7e50e9880288673fd482f2903d5e9b87a0ddd6549098fa35f9b87e4891f015d0a26aedfac9736c3f55dcd1794d8abb3f9cc072bcdbb7e87f42a9fa -DIST superslicer-2.3.57.10.tar.gz 32466957 BLAKE2B 7c5fff6ba8139a9bf66d931e6e48e6a9201e7911e90ce2e822ded7ae713f0b8fdf86b9cd317ded4802146c24758148ec989c213b5992c323a2fd442e17a4e228 SHA512 4d20078e11f5f99993220409bee54ca0a3f2a6fff04febfc09b5f1bc445ceaabc3a359f8f7f478127aa1504e8ba8a121a682c991adf2c45cb2ff1598ed2e3445 DIST superslicer-2.3.57.11-profiles.zip 14382021 BLAKE2B f1908f3bdaebd742dcfa9d2a84dd94502b76261bccd5f924254d3ba10efa32f19923b3861f09c9e346092b77aeb7057830b0428462660967379d74b566744fd0 SHA512 af7c3843bfc1e7962b386ab1c6a20007e692abdb4d70e3129edf00739a082fe92193ab72e7746575b52aff4fd684c9c17b7f7698d7831aad8017310293895371 DIST superslicer-2.3.57.11.tar.gz 32469197 BLAKE2B 8406717396acfa0c2cfe381587693d3961bdb4933f0d0821ed814e89f7597b4d90a56e877e3dd7e45fe4b14ee13f143e1cff241d59ce1798c39631dd7ffa706f SHA512 978eb5004d788e93ea58b788fbf8fe7a7c1c515b0a138e20662c3c1973b5c72373cd14c76d25ee180095c030416b5b4429b61bb73432910fe9288897a5d7cb4d DIST superslicer-2.3.57.12-profiles.zip 14382021 BLAKE2B f1908f3bdaebd742dcfa9d2a84dd94502b76261bccd5f924254d3ba10efa32f19923b3861f09c9e346092b77aeb7057830b0428462660967379d74b566744fd0 SHA512 af7c3843bfc1e7962b386ab1c6a20007e692abdb4d70e3129edf00739a082fe92193ab72e7746575b52aff4fd684c9c17b7f7698d7831aad8017310293895371 diff --git a/media-gfx/superslicer/files/missing-imports-2.3.57.10.patch b/media-gfx/superslicer/files/missing-imports-2.3.57.10.patch deleted file mode 100644 index 009a4892a..000000000 --- a/media-gfx/superslicer/files/missing-imports-2.3.57.10.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/src/slic3r/Utils/PresetUpdater.cpp -+++ b/src/slic3r/Utils/PresetUpdater.cpp -@@ -6,6 +6,7 @@ - #include <ostream> - #include <utility> - #include <stdexcept> -+#include <regex> - - #include <boost/algorithm/string.hpp> - #include <boost/filesystem.hpp> diff --git a/media-gfx/superslicer/files/version-suffix-2.3.57.10.patch b/media-gfx/superslicer/files/version-suffix-2.3.57.10.patch deleted file mode 100644 index ddbda92ac..000000000 --- a/media-gfx/superslicer/files/version-suffix-2.3.57.10.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- a/version.inc -+++ b/version.inc -@@ -4,9 +4,9 @@ - # name of the slicer - 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") - # exe name of the slicer, should be lowercase and valid in all os --set(SLIC3R_APP_CMD "superslicer") -+set(SLIC3R_APP_CMD "superslicer-2.3") - # versions - set(SLIC3R_VERSION "2.3.57") - set(SLIC3R_VERSION_FULL "2.3.57.10") ---- 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@ ---- 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@ diff --git a/media-gfx/superslicer/superslicer-2.3.57.10.ebuild b/media-gfx/superslicer/superslicer-2.3.57.10.ebuild deleted file mode 100644 index f7182ba82..000000000 --- a/media-gfx/superslicer/superslicer-2.3.57.10.ebuild +++ /dev/null @@ -1,108 +0,0 @@ -# Copyright 2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -WX_GTK_VER="3.0-gtk3" - -inherit xdg cmake desktop wxwidgets - -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.zip -> ${P}-profiles.zip )" -S="${WORKDIR}/${MY_PN}-${PV}" - -LICENSE="AGPL-3" -SLOT="23" -KEYWORDS="~amd64" -IUSE="gui test profiles" - -# tests fail to link with USE=-gui, bug #760096 -REQUIRED_USE="test? ( gui )" -RESTRICT="!test? ( test )" - -BDEPEND="profiles? ( app-arch/unzip )" -RDEPEND=" - dev-cpp/eigen:3 - dev-cpp/tbb - >=dev-libs/boost-1.73.0:=[nls,threads(+)] - dev-libs/cereal - dev-libs/expat - dev-libs/c-blosc - dev-libs/gmp:= - >=dev-libs/miniz-2.1.0-r2 - dev-libs/mpfr:= - >=media-gfx/openvdb-5.0.0 - media-libs/ilmbase:= - media-libs/libpng:0= - media-libs/openexr:0= - media-libs/qhull:= - sci-libs/libigl - sci-libs/nlopt - >=sci-mathematics/cgal-5.0:= - sys-apps/dbus - sys-libs/zlib:= - gui? ( - dev-libs/glib:2 - media-libs/glew:0= - net-misc/curl - virtual/glu - virtual/opengl - x11-libs/gtk+:3 - >=x11-libs/wxGTK-3.0.5.1:=[X,opengl] - ) -" -DEPEND="${RDEPEND} - media-libs/qhull[static-libs] - test? ( dev-cpp/gtest ) -" - -PATCHES=( - "${FILESDIR}/miniz-zip-header-2.2.53.4.patch" - "${FILESDIR}/freecad-dialog-2.2.53.4.patch" - "${FILESDIR}/missing-imports-${PV}.patch" - "${FILESDIR}/version-suffix-${PV}.patch" -) - -src_unpack() { - unpack ${P}.tar.gz - mv "${S}/resources/icons/SuperSlicer_192px.png" "${S}/resources/icons/SuperSlicer2.3_192px.png" || die "Failed to rename icons" - mv "${S}/resources/icons/SuperSlicer_192px_transparent.png" "${S}/resources/icons/SuperSlicer2.3_192px_transparent.png" || die "Failed to rename icons" - mv "${S}/resources/icons/SuperSlicer_128px.png" "${S}/resources/icons/SuperSlicer2.3_128px.png" || die "Failed to rename icons" - mv "${S}/resources/icons/SuperSlicer-gcodeviewer_128px.png" "${S}/resources/icons/SuperSlicer2.3-gcodeviewer_128px.png" || die "Failed to rename icons" - 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.zip && - if use profiles ; then - cp -r "${WORKDIR}/slic3r-profiles-118aa919c16837eb2ff6ba97e2934fa4144ef806/"* "${S}/resources/profiles" || die "Failed to copy profiles" - fi -} - -src_configure() { - use gui && setup-wxwidgets - - CMAKE_BUILD_TYPE=Release - local mycmakeargs=( - -DSLIC3R_BUILD_TESTS=$(usex test) - -DSLIC3R_FHS=ON - -DSLIC3R_GTK=3 - -DSLIC3R_GUI=$(usex gui) - -DSLIC3R_PCH=OFF - -DSLIC3R_WX_STABLE=ON - -Wno-dev - ) - - cmake_src_configure -} - -src_install() { - cmake_src_install - - if use gui; then - newicon -s 128 resources/icons/SuperSlicer2.3_128px.png SuperSlicer2.3.png - dosym superslicer-2.3 /usr/bin/superslicer-2.3-gcodeviewer - fi -}