[gentoo-commits] repo/gentoo:master commit in: media-gfx/slic3r/files/, media-gfx/slic3r/, profiles/
commit: f7501316fe613032045b79a6a47056b3620fe859 Author: Matthew Smith gentoo org> AuthorDate: Sun Apr 10 11:22:52 2022 + Commit: Matthew Smith gentoo org> CommitDate: Sun Apr 10 11:22:52 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7501316 media-gfx/slic3r: treeclean Signed-off-by: Matthew Smith gentoo.org> media-gfx/slic3r/Manifest | 2 - .../slic3r/files/slic3r-1.3.0-boost-1.73.patch | 146 - .../slic3r/files/slic3r-1.3.0-no-locallib.patch| 609 - .../files/slic3r-1.3.0-use-system-clipper.patch| 44 -- media-gfx/slic3r/files/slic3r-1.3.0-wayland.patch | 10 - .../slic3r-1.3.1_pre20200824-boost-1.73.patch | 133 - media-gfx/slic3r/metadata.xml | 21 - media-gfx/slic3r/slic3r-1.3.0-r4.ebuild| 114 .../slic3r/slic3r-1.3.1_pre20200824-r1.ebuild | 115 media-gfx/slic3r/slic3r-.ebuild| 123 - profiles/package.mask | 6 - 11 files changed, 1323 deletions(-) diff --git a/media-gfx/slic3r/Manifest b/media-gfx/slic3r/Manifest deleted file mode 100644 index f1a5e41dd20d.. --- a/media-gfx/slic3r/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST slic3r-1.3.0.tar.gz 2104094 BLAKE2B 74c58690cf196f89ecff5eec853215c87c648df5a504725fea9f14b0343bca105190de1d63e2e8e76d47fcaf8dbe7b6d26f61b304ce7336412effa1c9a3fba41 SHA512 ff0f7747e166826ff1c53220974ee9d3a217d0e19964dbe4a5fa3e81f262a6810a47632686b7f1b3128384ae05c6f98d8aab980524079bdf9811445fe23a0f0d -DIST slic3r-1.3.1_pre20200824.tar.gz 2432288 BLAKE2B 37e767b6cb12909ea3a6411532103ea30500903cf3d6a221c2fa3d3109fb733db5d0cb0e9d0eec5033dad9acec2f89258242cdab316ea26392a8386097d9dd38 SHA512 fd7198f7c4a60911b2009f617d37485bf73964a626a53d02bd13baae963d28e74dc2f8314888e7c0fcacb389e0b481f3357c6ea595ac8f92d99f7a228c5cc2b7 diff --git a/media-gfx/slic3r/files/slic3r-1.3.0-boost-1.73.patch b/media-gfx/slic3r/files/slic3r-1.3.0-boost-1.73.patch deleted file mode 100644 index 6b710a18f3af.. --- a/media-gfx/slic3r/files/slic3r-1.3.0-boost-1.73.patch +++ /dev/null @@ -1,146 +0,0 @@ a/xs/src/boost/nowide/cstdlib.hpp -+++ b/xs/src/boost/nowide/cstdlib.hpp -@@ -8,7 +8,7 @@ - #ifndef BOOST_NOWIDE_CSTDLIB_HPP_INCLUDED - #define BOOST_NOWIDE_CSTDLIB_HPP_INCLUDED - --#include -+#include - #include - - #endif a/xs/src/admesh/stl.h -+++ b/xs/src/admesh/stl.h -@@ -26,11 +26,6 @@ - #include - #include - #include --#include -- --#ifndef BOOST_LITTLE_ENDIAN --#error "admesh works correctly on little endian machines only!" --#endif - - #if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) - #include "windows.h" - a/xs/src/libslic3r/PrintObject.cpp -+++ b/xs/src/libslic3r/PrintObject.cpp -@@ -2,11 +2,14 @@ - #include "BoundingBox.hpp" - #include "ClipperUtils.hpp" - #include "Geometry.hpp" -+#include - #include - #include - - namespace Slic3r { - -+using boost::placeholders::_1; -+ - PrintObject::PrintObject(Print* print, ModelObject* model_object, const BoundingBoxf3 _bbox) - : layer_height_spline(model_object->layer_height_spline), - typed_slices(false), a/xs/src/libslic3r/GCodeSender.hpp -+++ b/xs/src/libslic3r/GCodeSender.hpp -@@ -7,13 +7,17 @@ - #include - #include - #include --#include -+#include -+#include - #include - - namespace Slic3r { - - namespace asio = boost::asio; - -+using boost::placeholders::_1; -+using boost::placeholders::_2; -+ - class GCodeSender : private boost::noncopyable { - public: - GCodeSender(); a/xs/src/libslic3r/TriangleMesh.cpp -+++ b/xs/src/libslic3r/TriangleMesh.cpp -@@ -14,6 +14,7 @@ - #include - #include - #include -+#include - - #ifdef SLIC3R_DEBUG - #include "SVG.hpp" -@@ -21,6 +22,8 @@ - - namespace Slic3r { - -+using boost::placeholders::_1; -+ - TriangleMesh::TriangleMesh() - : repaired(false) - { a/xs/src/libslic3r/Config.cpp -+++ b/xs/src/libslic3r/Config.cpp -@@ -14,6 +14,7 @@ - #include - #include - #include -+#include - #include - #include - #include a/xs/src/libslic3r/SLAPrint.cpp -+++ b/xs/src/libslic3r/SLAPrint.cpp -@@ -7,9 +7,12 @@ - #include - #include - #include -+#include - - namespace Slic3r { - -+using boost::placeholders::_1; -+ - void - SLAPrint::slice() - { a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -22,7 +22,7 @@ - set(Boost_USE_STATIC_LIBS ON) - set(Boost_USE_STATIC_RUNTIME ON) - set(CMAKE_FIND_LIBRARY_SUFFIXES ".a") --find_package(Boost COMPONENTS system thread filesystem) -+find_package(Boost MODULE REQUIRED) - - set(LIBDIR ${CMAKE_CURRENT_SOURCE_DIR}/../xs/src/) - a/xs/src/libslic3r/GCodeTimeEstimator.cpp -+++ b/xs/src/libslic3r/GCodeTimeEstimator.cpp -@@ -1,9 +1,12 @@ - #include "GCodeTimeEstimator.hpp" --#include -+#include - #include - - namespace Slic3r { - -+using boost::placeholders::_1; -+using boost::placeholders::_2; -+ - void -
[gentoo-commits] repo/gentoo:master commit in: media-gfx/slic3r/
commit: 2bb5ebdbd7adee7f680682ade2e9b78ed9751a0c Author: Dennis Eisele dennis-eisele de> AuthorDate: Tue Dec 28 22:07:44 2021 + Commit: Sam James gentoo org> CommitDate: Wed Dec 29 01:58:29 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2bb5ebdb media-gfx/slic3r: add Module:Build to BDEPEND Closes: https://bugs.gentoo.org/822768 Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Dennis Eisele dennis-eisele.de> Closes: https://github.com/gentoo/gentoo/pull/23554 Signed-off-by: Sam James gentoo.org> media-gfx/slic3r/slic3r-1.3.1_pre20200824-r1.ebuild | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/media-gfx/slic3r/slic3r-1.3.1_pre20200824-r1.ebuild b/media-gfx/slic3r/slic3r-1.3.1_pre20200824-r1.ebuild index a437470e7df1..9353f8c2f830 100644 --- a/media-gfx/slic3r/slic3r-1.3.1_pre20200824-r1.ebuild +++ b/media-gfx/slic3r/slic3r-1.3.1_pre20200824-r1.ebuild @@ -55,17 +55,18 @@ RDEPEND="!=dev-lang/perl-5.16* )" DEPEND="${RDEPEND} dev-libs/clipper - dev-perl/Devel-CheckLib >=dev-perl/ExtUtils-CppGuess-0.70.0 >=dev-perl/ExtUtils-Typemaps-Default-1.50.0 >=dev-perl/ExtUtils-XSpp-0.170.0 - >=dev-perl/Module-Build-0.380.0 - >=dev-perl/Module-Build-WithXSpp-0.140.0 >=virtual/perl-ExtUtils-MakeMaker-6.800.0 >=virtual/perl-ExtUtils-ParseXS-3.220.0 test? ( virtual/perl-Test-Harness virtual/perl-Test-Simple )" +BDEPEND=">=dev-perl/Module-Build-0.380.0 + >=dev-perl/Module-Build-WithXSpp-0.140.0 + dev-perl/Devel-CheckLib" + S="${WORKDIR}/Slic3r-92abbc42dfdd5385c1f9c3a450e2f3da835f8b8d" PERL_S="${S}/xs"
[gentoo-commits] repo/gentoo:master commit in: media-gfx/slic3r/
commit: 2726c069570ec3b123c107d201581652116c6ab8 Author: Andreas K. Hüttel gentoo org> AuthorDate: Sun Oct 17 19:34:18 2021 + Commit: Andreas K. Hüttel gentoo org> CommitDate: Sun Oct 17 20:03:54 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2726c069 media-gfx/slic3r: add Module-Build dependency Closes: https://bugs.gentoo.org/817944 Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Andreas K. Hüttel gentoo.org> media-gfx/slic3r/slic3r-.ebuild | 3 +++ 1 file changed, 3 insertions(+) diff --git a/media-gfx/slic3r/slic3r-.ebuild b/media-gfx/slic3r/slic3r-.ebuild index 16f8d66dac3..3d418fb61e1 100644 --- a/media-gfx/slic3r/slic3r-.ebuild +++ b/media-gfx/slic3r/slic3r-.ebuild @@ -69,6 +69,9 @@ DEPEND=" virtual/perl-Test-Simple ) " +BDEPEND="${DEPEND} + dev-perl/Module-Build +" PERL_S="${S}/xs"
[gentoo-commits] repo/gentoo:master commit in: media-gfx/slic3r/
commit: 9c418104f4556ad52980065977f1f15db693c7e4 Author: David Seifert gentoo org> AuthorDate: Fri Jun 18 19:16:56 2021 + Commit: David Seifert gentoo org> CommitDate: Fri Jun 18 19:16:56 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c418104 media-gfx/slic3r: Depend on dev-libs/boost:=[threads(+)] Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: David Seifert gentoo.org> media-gfx/slic3r/{slic3r-1.3.0-r3.ebuild => slic3r-1.3.0-r4.ebuild} | 2 +- ...ic3r-1.3.1_pre20200824.ebuild => slic3r-1.3.1_pre20200824-r1.ebuild} | 2 +- media-gfx/slic3r/slic3r-.ebuild | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/media-gfx/slic3r/slic3r-1.3.0-r3.ebuild b/media-gfx/slic3r/slic3r-1.3.0-r4.ebuild similarity index 98% rename from media-gfx/slic3r/slic3r-1.3.0-r3.ebuild rename to media-gfx/slic3r/slic3r-1.3.0-r4.ebuild index f0ea0fd4ed2..d11cc8ac32f 100644 --- a/media-gfx/slic3r/slic3r-1.3.0-r3.ebuild +++ b/media-gfx/slic3r/slic3r-1.3.0-r4.ebuild @@ -17,7 +17,7 @@ RESTRICT="!test? ( test )" # check Build.PL for dependencies RDEPEND="!=dev-lang/perl-5.16* - >=dev-libs/boost-1.73[threads] + >=dev-libs/boost-1.73[threads(+)] dev-perl/Class-XSAccessor dev-perl/Devel-CheckLib dev-perl/Devel-Size diff --git a/media-gfx/slic3r/slic3r-1.3.1_pre20200824.ebuild b/media-gfx/slic3r/slic3r-1.3.1_pre20200824-r1.ebuild similarity index 98% rename from media-gfx/slic3r/slic3r-1.3.1_pre20200824.ebuild rename to media-gfx/slic3r/slic3r-1.3.1_pre20200824-r1.ebuild index 3d5a2d5dbff..a437470e7df 100644 --- a/media-gfx/slic3r/slic3r-1.3.1_pre20200824.ebuild +++ b/media-gfx/slic3r/slic3r-1.3.1_pre20200824-r1.ebuild @@ -18,7 +18,7 @@ IUSE="+gui test" RESTRICT="!test? ( test )" RDEPEND="!=dev-lang/perl-5.16* - >=dev-libs/boost-1.55[threads] + >=dev-libs/boost-1.55[threads(+)] dev-perl/Class-XSAccessor dev-perl/Devel-CheckLib dev-perl/Devel-Size diff --git a/media-gfx/slic3r/slic3r-.ebuild b/media-gfx/slic3r/slic3r-.ebuild index c492bce9fc3..16f8d66dac3 100644 --- a/media-gfx/slic3r/slic3r-.ebuild +++ b/media-gfx/slic3r/slic3r-.ebuild @@ -18,7 +18,7 @@ RESTRICT="!test? ( test )" # check Build.PL for dependencies RDEPEND=" !=dev-lang/perl-5.16* - >=dev-libs/boost-1.55[threads] + >=dev-libs/boost-1.55[threads(+)] dev-perl/Class-XSAccessor dev-perl/Devel-CheckLib dev-perl/Devel-Size
[gentoo-commits] repo/gentoo:master commit in: media-gfx/slic3r/
commit: cdcff7ecc9b4a04498b97a759edf2b3616135b61 Author: Dennis Lamm gentoo org> AuthorDate: Mon Jun 7 03:23:06 2021 + Commit: Dennis Lamm gentoo org> CommitDate: Mon Jun 7 03:23:06 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdcff7ec media-gfx/slic3r: metadata added cpe entry Signed-off-by: Dennis Lamm gentoo.org> Package-Manager: Portage-3.0.18, Repoman-3.0.2 media-gfx/slic3r/metadata.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/media-gfx/slic3r/metadata.xml b/media-gfx/slic3r/metadata.xml index f2a29f739d2..45df234a6cd 100644 --- a/media-gfx/slic3r/metadata.xml +++ b/media-gfx/slic3r/metadata.xml @@ -15,6 +15,7 @@ https://github.com/slic3r/Slic3r/issues https://manual.slic3r.org/ +cpe:/a:slic3r:libslic3r slic3r/Slic3r
[gentoo-commits] repo/gentoo:master commit in: media-gfx/slic3r/
commit: 68ae8c886398f807a97dc053cbbc9d45ca0dfd9b Author: Sven Wegener gentoo org> AuthorDate: Sun Apr 4 19:20:51 2021 + Commit: Sven Wegener gentoo org> CommitDate: Sun Apr 4 19:33:42 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68ae8c88 media-gfx/slic3r: Remove boost-1.73 patch from live ebuild Upstream added a similar patch. Package-Manager: Portage-3.0.17, Repoman-3.0.2 Signed-off-by: Sven Wegener gentoo.org> media-gfx/slic3r/slic3r-.ebuild | 1 - 1 file changed, 1 deletion(-) diff --git a/media-gfx/slic3r/slic3r-.ebuild b/media-gfx/slic3r/slic3r-.ebuild index e93f63190e4..c492bce9fc3 100644 --- a/media-gfx/slic3r/slic3r-.ebuild +++ b/media-gfx/slic3r/slic3r-.ebuild @@ -73,7 +73,6 @@ DEPEND=" PERL_S="${S}/xs" PATCHES=( - "${FILESDIR}/${PN}-1.3.1_pre20200824-boost-1.73.patch" "${FILESDIR}/${PN}-1.3.0-no-locallib.patch" "${FILESDIR}/${PN}-1.3.0-use-system-clipper.patch" )
[gentoo-commits] repo/gentoo:master commit in: media-gfx/slic3r/
commit: d867b8adbff13807d615562c437a50dd9884d180 Author: Sam James gentoo org> AuthorDate: Thu Apr 1 02:52:54 2021 + Commit: Sam James gentoo org> CommitDate: Thu Apr 1 23:11:50 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d867b8ad media-gfx/slic3r: fix MissingInherits, IndirectInherits (desktop.eclass) Signed-off-by: Sam James gentoo.org> media-gfx/slic3r/slic3r-1.3.0-r3.ebuild | 4 ++-- media-gfx/slic3r/slic3r-1.3.1_pre20200824.ebuild | 4 ++-- media-gfx/slic3r/slic3r-.ebuild | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/media-gfx/slic3r/slic3r-1.3.0-r3.ebuild b/media-gfx/slic3r/slic3r-1.3.0-r3.ebuild index 5917a9210b8..f0ea0fd4ed2 100644 --- a/media-gfx/slic3r/slic3r-1.3.0-r3.ebuild +++ b/media-gfx/slic3r/slic3r-1.3.0-r3.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit desktop eutils perl-module +inherit desktop perl-module DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)" HOMEPAGE="https://slic3r.org; diff --git a/media-gfx/slic3r/slic3r-1.3.1_pre20200824.ebuild b/media-gfx/slic3r/slic3r-1.3.1_pre20200824.ebuild index c9c2ba374c5..3d5a2d5dbff 100644 --- a/media-gfx/slic3r/slic3r-1.3.1_pre20200824.ebuild +++ b/media-gfx/slic3r/slic3r-1.3.1_pre20200824.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit desktop eutils perl-module +inherit desktop perl-module COMMIT="92abbc42dfdd5385c1f9c3a450e2f3da835f8b8d" diff --git a/media-gfx/slic3r/slic3r-.ebuild b/media-gfx/slic3r/slic3r-.ebuild index 7e234aeb14a..9f6cb8de54b 100644 --- a/media-gfx/slic3r/slic3r-.ebuild +++ b/media-gfx/slic3r/slic3r-.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit git-r3 perl-module +inherit desktop git-r3 perl-module DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)" HOMEPAGE="https://slic3r.org;
[gentoo-commits] repo/gentoo:master commit in: media-gfx/slic3r/
commit: ef8e1f38e81a6a7cfc2470784044ed3a61c50664 Author: Sam James gentoo org> AuthorDate: Thu Apr 1 02:05:58 2021 + Commit: Sam James gentoo org> CommitDate: Thu Apr 1 22:08:33 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef8e1f38 media-gfx/slic3r: drop useless eutils Signed-off-by: Sam James gentoo.org> media-gfx/slic3r/slic3r-.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/media-gfx/slic3r/slic3r-.ebuild b/media-gfx/slic3r/slic3r-.ebuild index 6c8f1b5b6d9..7e234aeb14a 100644 --- a/media-gfx/slic3r/slic3r-.ebuild +++ b/media-gfx/slic3r/slic3r-.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit eutils git-r3 perl-module +inherit git-r3 perl-module DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)" HOMEPAGE="https://slic3r.org;
[gentoo-commits] repo/gentoo:master commit in: media-gfx/slic3r/
commit: 3da985395de8c3002fd642c17df0330658e8269b Author: Dennis Lamm gentoo org> AuthorDate: Sun Feb 7 21:08:35 2021 + Commit: Dennis Lamm gentoo org> CommitDate: Sun Feb 7 23:56:54 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3da98539 media-gfx/slic3r: metadata added doc Signed-off-by: Dennis Lamm gentoo.org> media-gfx/slic3r/metadata.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/media-gfx/slic3r/metadata.xml b/media-gfx/slic3r/metadata.xml index c3ce8641cb6..41ad86d64fa 100644 --- a/media-gfx/slic3r/metadata.xml +++ b/media-gfx/slic3r/metadata.xml @@ -14,6 +14,7 @@ https://github.com/slic3r/Slic3r/issues +https://manual.slic3r.org/ slic3r/Slic3r
[gentoo-commits] repo/gentoo:master commit in: media-gfx/slic3r/
commit: 79885ad844984f52692a3c08ad361fd10d213667 Author: Dennis Lamm gentoo org> AuthorDate: Mon Dec 28 22:24:50 2020 + Commit: Dennis Lamm gentoo org> CommitDate: Tue Dec 29 07:43:43 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79885ad8 media-gfx/slic3r: bug #761481 Closes: https://bugs.gentoo.org/761481 Signed-off-by: Dennis Lamm gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/18859 Signed-off-by: Dennis Lamm gentoo.org> media-gfx/slic3r/metadata.xml| 5 +++-- media-gfx/slic3r/slic3r-1.3.1_pre20200824.ebuild | 7 --- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/media-gfx/slic3r/metadata.xml b/media-gfx/slic3r/metadata.xml index 49968e9fe3d..c3ce8641cb6 100644 --- a/media-gfx/slic3r/metadata.xml +++ b/media-gfx/slic3r/metadata.xml @@ -12,7 +12,8 @@ Slic3r is the tool you need to convert a 3D model into printing instructions for your 3D printer. It cuts the model into horizontal slices (layers), generates toolpaths to fill them and calculates the amount of material to be extruded. - -alexrj/Slic3r + +https://github.com/slic3r/Slic3r/issues +slic3r/Slic3r diff --git a/media-gfx/slic3r/slic3r-1.3.1_pre20200824.ebuild b/media-gfx/slic3r/slic3r-1.3.1_pre20200824.ebuild index c8ca66784af..c9c2ba374c5 100644 --- a/media-gfx/slic3r/slic3r-1.3.1_pre20200824.ebuild +++ b/media-gfx/slic3r/slic3r-1.3.1_pre20200824.ebuild @@ -5,9 +5,11 @@ EAPI=7 inherit desktop eutils perl-module +COMMIT="92abbc42dfdd5385c1f9c3a450e2f3da835f8b8d" + DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)" HOMEPAGE="https://slic3r.org; -SRC_URI="https://github.com/alexrj/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI="https://github.com/slic3r/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" LICENSE="AGPL-3 CC-BY-3.0" SLOT="0" @@ -15,7 +17,6 @@ KEYWORDS="~amd64 ~x86" IUSE="+gui test" RESTRICT="!test? ( test )" -# check Build.PL for dependencies RDEPEND="!=dev-lang/perl-5.16* >=dev-libs/boost-1.55[threads] dev-perl/Class-XSAccessor @@ -103,7 +104,7 @@ src_install() { exeinto "${VENDOR_LIB}"/Slic3r doexe slic3r.pl - dosym "${VENDOR_LIB}/Slic3r/slic3r.pl" /usr/bin/slic3r.pl + dosym "${VENDOR_LIB}/Slic3r/slic3r.pl" "${EPREFIX}/usr/bin/slic3r.pl" make_desktop_entry "slic3r.pl --gui %F" \ Slic3r \
[gentoo-commits] repo/gentoo:master commit in: media-gfx/slic3r/, media-gfx/slic3r/files/
commit: 2af1afdd76734d65c950a5ead00e81674fb95cca Author: Dennis Lamm gentoo org> AuthorDate: Fri Dec 4 21:41:40 2020 + Commit: Dennis Lamm gentoo org> CommitDate: Sun Dec 6 12:32:36 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2af1afdd media-gfx/slic3r-1.3.0: fixed boost 1.73 build also use system clipper Bug: https://bugs.gentoo.org/722308 Signed-off-by: Dennis Lamm gentoo.org> .../slic3r/files/slic3r-1.3.0-boost-1.73.patch | 146 + .../files/slic3r-1.3.0-use-system-clipper.patch| 44 +++ media-gfx/slic3r/files/slic3r-1.3.0-wayland.patch | 10 ++ ...ic3r-1.3.0-r2.ebuild => slic3r-1.3.0-r3.ebuild} | 38 +++--- 4 files changed, 217 insertions(+), 21 deletions(-) diff --git a/media-gfx/slic3r/files/slic3r-1.3.0-boost-1.73.patch b/media-gfx/slic3r/files/slic3r-1.3.0-boost-1.73.patch new file mode 100644 index 000..6b710a18f3a --- /dev/null +++ b/media-gfx/slic3r/files/slic3r-1.3.0-boost-1.73.patch @@ -0,0 +1,146 @@ +--- a/xs/src/boost/nowide/cstdlib.hpp b/xs/src/boost/nowide/cstdlib.hpp +@@ -8,7 +8,7 @@ + #ifndef BOOST_NOWIDE_CSTDLIB_HPP_INCLUDED + #define BOOST_NOWIDE_CSTDLIB_HPP_INCLUDED + +-#include ++#include + #include + + #endif +--- a/xs/src/admesh/stl.h b/xs/src/admesh/stl.h +@@ -26,11 +26,6 @@ + #include + #include + #include +-#include +- +-#ifndef BOOST_LITTLE_ENDIAN +-#error "admesh works correctly on little endian machines only!" +-#endif + + #if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) + #include "windows.h" + +--- a/xs/src/libslic3r/PrintObject.cpp b/xs/src/libslic3r/PrintObject.cpp +@@ -2,11 +2,14 @@ + #include "BoundingBox.hpp" + #include "ClipperUtils.hpp" + #include "Geometry.hpp" ++#include + #include + #include + + namespace Slic3r { + ++using boost::placeholders::_1; ++ + PrintObject::PrintObject(Print* print, ModelObject* model_object, const BoundingBoxf3 _bbox) + : layer_height_spline(model_object->layer_height_spline), + typed_slices(false), +--- a/xs/src/libslic3r/GCodeSender.hpp b/xs/src/libslic3r/GCodeSender.hpp +@@ -7,13 +7,17 @@ + #include + #include + #include +-#include ++#include ++#include + #include + + namespace Slic3r { + + namespace asio = boost::asio; + ++using boost::placeholders::_1; ++using boost::placeholders::_2; ++ + class GCodeSender : private boost::noncopyable { + public: + GCodeSender(); +--- a/xs/src/libslic3r/TriangleMesh.cpp b/xs/src/libslic3r/TriangleMesh.cpp +@@ -14,6 +14,7 @@ + #include + #include + #include ++#include + + #ifdef SLIC3R_DEBUG + #include "SVG.hpp" +@@ -21,6 +22,8 @@ + + namespace Slic3r { + ++using boost::placeholders::_1; ++ + TriangleMesh::TriangleMesh() + : repaired(false) + { +--- a/xs/src/libslic3r/Config.cpp b/xs/src/libslic3r/Config.cpp +@@ -14,6 +14,7 @@ + #include + #include + #include ++#include + #include + #include + #include +--- a/xs/src/libslic3r/SLAPrint.cpp b/xs/src/libslic3r/SLAPrint.cpp +@@ -7,9 +7,12 @@ + #include + #include + #include ++#include + + namespace Slic3r { + ++using boost::placeholders::_1; ++ + void + SLAPrint::slice() + { +--- a/src/CMakeLists.txt b/src/CMakeLists.txt +@@ -22,7 +22,7 @@ + set(Boost_USE_STATIC_LIBS ON) + set(Boost_USE_STATIC_RUNTIME ON) + set(CMAKE_FIND_LIBRARY_SUFFIXES ".a") +-find_package(Boost COMPONENTS system thread filesystem) ++find_package(Boost MODULE REQUIRED) + + set(LIBDIR ${CMAKE_CURRENT_SOURCE_DIR}/../xs/src/) + +--- a/xs/src/libslic3r/GCodeTimeEstimator.cpp b/xs/src/libslic3r/GCodeTimeEstimator.cpp +@@ -1,9 +1,12 @@ + #include "GCodeTimeEstimator.hpp" +-#include ++#include + #include + + namespace Slic3r { + ++using boost::placeholders::_1; ++using boost::placeholders::_2; ++ + void + GCodeTimeEstimator::parse(const std::string ) + { +--- a/xs/Build.PL b/xs/Build.PL +@@ -142,7 +142,7 @@ + } + # In order to generate the -l switches we need to know how Boost libraries are named + my $have_boost = 0; +-my @boost_libraries = qw(system thread filesystem); # we need these ++my @boost_libraries = qw(system thread filesystem nowide); # we need these + # check without explicit lib path (works on Linux) + if (! $mswin) { + $have_boost = 1 diff --git a/media-gfx/slic3r/files/slic3r-1.3.0-use-system-clipper.patch b/media-gfx/slic3r/files/slic3r-1.3.0-use-system-clipper.patch new file mode 100644 index 000..9f9a5ef2fbd --- /dev/null +++ b/media-gfx/slic3r/files/slic3r-1.3.0-use-system-clipper.patch @@ -0,0 +1,44 @@ +--- a/xs/src/libslic3r/ClipperUtils.hpp b/xs/src/libslic3r/ClipperUtils.hpp +@@ -2,7 +2,7 @@ + #define slic3r_ClipperUtils_hpp_ + + #include +-#include "clipper.hpp" ++#include + #include "ExPolygon.hpp" + #include "Polygon.hpp" + #include "Surface.hpp" +--- a/xs/src/libslic3r/Geometry.cpp b/xs/src/libslic3r/Geometry.cpp +@@ -3,7 +3,7 @@ + #include "ExPolygon.hpp" + #include "Line.hpp" + #include "PolylineCollection.hpp"
[gentoo-commits] repo/gentoo:master commit in: media-gfx/slic3r/files/, media-gfx/slic3r/
commit: a53611ae3222a685a0d6cff8313ecbdb5d26019f Author: Dennis Lamm gentoo org> AuthorDate: Sat Dec 5 13:54:21 2020 + Commit: Dennis Lamm gentoo org> CommitDate: Sun Dec 6 12:32:37 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a53611ae media-gfx/slic3r: version bump Closes: https://bugs.gentoo.org/722308 Signed-off-by: Dennis Lamm gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/18517 Signed-off-by: Dennis Lamm gentoo.org> media-gfx/slic3r/Manifest | 1 + .../slic3r-1.3.1_pre20200824-boost-1.73.patch | 133 + media-gfx/slic3r/files/slic3r--boost-173.patch | 39 -- .../slic3r/files/slic3r--no-locallib.patch | 609 - ....ebuild => slic3r-1.3.1_pre20200824.ebuild} | 35 +- media-gfx/slic3r/slic3r-.ebuild| 30 +- 6 files changed, 168 insertions(+), 679 deletions(-) diff --git a/media-gfx/slic3r/Manifest b/media-gfx/slic3r/Manifest index 1a6d2e82c5b..f1a5e41dd20 100644 --- a/media-gfx/slic3r/Manifest +++ b/media-gfx/slic3r/Manifest @@ -1 +1,2 @@ DIST slic3r-1.3.0.tar.gz 2104094 BLAKE2B 74c58690cf196f89ecff5eec853215c87c648df5a504725fea9f14b0343bca105190de1d63e2e8e76d47fcaf8dbe7b6d26f61b304ce7336412effa1c9a3fba41 SHA512 ff0f7747e166826ff1c53220974ee9d3a217d0e19964dbe4a5fa3e81f262a6810a47632686b7f1b3128384ae05c6f98d8aab980524079bdf9811445fe23a0f0d +DIST slic3r-1.3.1_pre20200824.tar.gz 2432288 BLAKE2B 37e767b6cb12909ea3a6411532103ea30500903cf3d6a221c2fa3d3109fb733db5d0cb0e9d0eec5033dad9acec2f89258242cdab316ea26392a8386097d9dd38 SHA512 fd7198f7c4a60911b2009f617d37485bf73964a626a53d02bd13baae963d28e74dc2f8314888e7c0fcacb389e0b481f3357c6ea595ac8f92d99f7a228c5cc2b7 diff --git a/media-gfx/slic3r/files/slic3r-1.3.1_pre20200824-boost-1.73.patch b/media-gfx/slic3r/files/slic3r-1.3.1_pre20200824-boost-1.73.patch new file mode 100644 index 000..d2aafecdb1e --- /dev/null +++ b/media-gfx/slic3r/files/slic3r-1.3.1_pre20200824-boost-1.73.patch @@ -0,0 +1,133 @@ +--- a/xs/src/libslic3r/TriangleMesh.cpp(revision 92abbc42dfdd5385c1f9c3a450e2f3da835f8b8d) b/xs/src/libslic3r/TriangleMesh.cpp(date 1607117258000) +@@ -22,6 +22,8 @@ + + namespace Slic3r { + ++using boost::placeholders::_1; ++ + TriangleMesh::TriangleMesh() + : repaired(false) + { + +--- a/src/CMakeLists.txt (revision 92abbc42dfdd5385c1f9c3a450e2f3da835f8b8d) b/src/CMakeLists.txt (date 1607117046000) +@@ -115,7 +115,7 @@ + find_package(Threads REQUIRED) + + set(Boost_NO_BOOST_CMAKE ON) +-find_package(Boost REQUIRED COMPONENTS system thread filesystem) ++find_package(Boost REQUIRED COMPONENTS system thread filesystem nowide) + + set(LIBDIR ${CMAKE_CURRENT_SOURCE_DIR}/../xs/src/) + set(GUI_LIBDIR ${CMAKE_CURRENT_SOURCE_DIR}/GUI/) + +--- a/xs/src/libslic3r/PrintObject.cpp (revision 92abbc42dfdd5385c1f9c3a450e2f3da835f8b8d) b/xs/src/libslic3r/PrintObject.cpp (date 1607117227000) +@@ -4,12 +4,15 @@ + #include "Geometry.hpp" + #include "Log.hpp" + #include "TransformationMatrix.hpp" ++#include + #include + #include + #include + + namespace Slic3r { + ++using boost::placeholders::_1; ++ + PrintObject::PrintObject(Print* print, ModelObject* model_object, const BoundingBoxf3 _bbox) + : layer_height_spline(model_object->layer_height_spline), + typed_slices(false), + +--- a/xs/src/libslic3r/GCodeSender.hpp (revision 92abbc42dfdd5385c1f9c3a450e2f3da835f8b8d) b/xs/src/libslic3r/GCodeSender.hpp (date 1607117162000) +@@ -7,7 +7,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + +@@ -15,6 +15,9 @@ + + namespace asio = boost::asio; + ++using boost::placeholders::_1; ++using boost::placeholders::_2; ++ + class GCodeSender : private boost::noncopyable { + public: + GCodeSender(); + +--- a/xs/src/libslic3r/SLAPrint.cpp(revision 92abbc42dfdd5385c1f9c3a450e2f3da835f8b8d) b/xs/src/libslic3r/SLAPrint.cpp(date 1607117248000) +@@ -7,9 +7,12 @@ + #include + #include + #include ++#include + + namespace Slic3r { + ++using boost::placeholders::_1; ++ + void + SLAPrint::slice() + { + +--- a/xs/src/libslic3r/ConfigBase.cpp (revision 92abbc42dfdd5385c1f9c3a450e2f3da835f8b8d) b/xs/src/libslic3r/ConfigBase.cpp (date 1607117107000) +@@ -16,7 +16,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include + +--- a/xs/src/libslic3r/GCodeTimeEstimator.cpp (revision 92abbc42dfdd5385c1f9c3a450e2f3da835f8b8d) b/xs/src/libslic3r/GCodeTimeEstimator.cpp (date 1607117194000) +@@ -1,9 +1,12 @@ + #include "GCodeTimeEstimator.hpp" +-#include ++#include + #include + + namespace Slic3r { + ++using boost::placeholders::_1; ++using boost::placeholders::_2; ++ + void + GCodeTimeEstimator::parse(const std::string ) + { + +--- a/xs/Build.PL (revision 92abbc42dfdd5385c1f9c3a450e2f3da835f8b8d) b/xs/Build.PL (date 1607117077000) +@@ -151,7
[gentoo-commits] repo/gentoo:master commit in: media-gfx/slic3r/, media-gfx/slic3r/files/, profiles/
commit: 88d4115cf751dbf9f67ce2d64af9926207b7a3c9 Author: Dennis Lamm gentoo org> AuthorDate: Thu Dec 3 05:04:59 2020 + Commit: Dennis Lamm gentoo org> CommitDate: Sun Dec 6 12:32:36 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88d4115c media-gfx/slic3r: drop old Signed-off-by: Dennis Lamm gentoo.org> media-gfx/slic3r/Manifest | 1 - .../files/slic3r-1.1.7-adjust_var_path.patch | 11 -- media-gfx/slic3r/files/slic3r-1.3.0-boost.patch| 10 -- media-gfx/slic3r/slic3r-1.1.7.ebuild | 115 media-gfx/slic3r/slic3r-1.3.0-r1.ebuild| 118 - profiles/package.mask | 8 -- 6 files changed, 263 deletions(-) diff --git a/media-gfx/slic3r/Manifest b/media-gfx/slic3r/Manifest index 8cd8345ac18..1a6d2e82c5b 100644 --- a/media-gfx/slic3r/Manifest +++ b/media-gfx/slic3r/Manifest @@ -1,2 +1 @@ -DIST slic3r-1.1.7.tar.gz 2079200 BLAKE2B b3aa45741bb92a75dd09be783cb9a8cd551c7736f04022905d11587d8b2a533db85c1f88a9d0185b2b6414ba56d44e0feb104bcfcaf52a0a35a1db912c6976db SHA512 0c3a12890f57f422084b20152ede3467a8624db4ba8be774258df0af963c1f6f41fda7d96967f6355bd95727539e6aad51c30cf45284a7ee3fff294839acc650 DIST slic3r-1.3.0.tar.gz 2104094 BLAKE2B 74c58690cf196f89ecff5eec853215c87c648df5a504725fea9f14b0343bca105190de1d63e2e8e76d47fcaf8dbe7b6d26f61b304ce7336412effa1c9a3fba41 SHA512 ff0f7747e166826ff1c53220974ee9d3a217d0e19964dbe4a5fa3e81f262a6810a47632686b7f1b3128384ae05c6f98d8aab980524079bdf9811445fe23a0f0d diff --git a/media-gfx/slic3r/files/slic3r-1.1.7-adjust_var_path.patch b/media-gfx/slic3r/files/slic3r-1.1.7-adjust_var_path.patch deleted file mode 100644 index ee4d75d0122..000 --- a/media-gfx/slic3r/files/slic3r-1.1.7-adjust_var_path.patch +++ /dev/null @@ -1,11 +0,0 @@ a/lib/Slic3r.pm2016-03-31 13:27:59.431548980 +0200 -+++ b/lib/Slic3r.pm2016-03-31 13:28:21.658675137 +0200 -@@ -29,7 +29,7 @@ - if $^V >= v5.16; - - use FindBin; --our $var = "$FindBin::Bin/var"; -+our $var = "$FindBin::RealBin/var"; - - use Encode; - use Encode::Locale; diff --git a/media-gfx/slic3r/files/slic3r-1.3.0-boost.patch b/media-gfx/slic3r/files/slic3r-1.3.0-boost.patch deleted file mode 100644 index e77e50b3c99..000 --- a/media-gfx/slic3r/files/slic3r-1.3.0-boost.patch +++ /dev/null @@ -1,10 +0,0 @@ Slic3r-1.3.0/xs/src/libslic3r/GCodeSender.hpp.old 2019-11-04 19:31:05.714869400 -0800 -+++ Slic3r-1.3.0/xs/src/libslic3r/GCodeSender.hpp 2019-11-04 19:34:10.656330929 -0800 -@@ -9,6 +9,7 @@ - #include - #include - #include -+#include - - namespace Slic3r { - diff --git a/media-gfx/slic3r/slic3r-1.1.7.ebuild b/media-gfx/slic3r/slic3r-1.1.7.ebuild deleted file mode 100644 index f144a2980de..000 --- a/media-gfx/slic3r/slic3r-1.1.7.ebuild +++ /dev/null @@ -1,115 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils perl-module - -DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)" -HOMEPAGE="https://slic3r.org; -SRC_URI="https://github.com/alexrj/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="AGPL-3 CC-BY-3.0" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="+gui test" -RESTRICT="!test? ( test )" - -# check Build.PL for dependencies -RDEPEND="!=dev-lang/perl-5.16* - >=dev-libs/boost-1.55[threads] - dev-perl/Class-XSAccessor - dev-perl/Encode-Locale - dev-perl/IO-stringy - >=dev-perl/Math-PlanePath-53.0.0 - >=dev-perl/Moo-1.3.1 - dev-perl/XML-SAX-ExpatXS - virtual/perl-Carp - virtual/perl-File-Spec - virtual/perl-Getopt-Long - virtual/perl-parent - virtual/perl-Scalar-List-Utils - virtual/perl-Test-Simple - virtual/perl-Thread-Semaphore - >=virtual/perl-threads-1.960.0 - virtual/perl-Time-HiRes - virtual/perl-XSLoader - gui? ( dev-perl/Class-Accessor - dev-perl/Growl-GNTP - dev-perl/libwww-perl - dev-perl/Module-Pluggable - dev-perl/Net-Bonjour - dev-perl/Net-DBus - dev-perl/OpenGL - >=dev-perl/Wx-0.991.800 - dev-perl/Wx-GLCanvas - >=media-libs/freeglut-3 - virtual/perl-Math-Complex - >=virtual/perl-Socket-2.16.0 - x11-libs/libXmu - )" -DEPEND="${RDEPEND} - >=dev-perl/ExtUtils-CppGuess-0.70.0 - >=dev-perl/ExtUtils-Typemaps-Default-1.50.0 - >=dev-perl/ExtUtils-XSpp-0.170.0 - >=dev-perl/Module-Build-0.380.0 - >=dev-perl/Module-Build-WithXSpp-0.140.0 - >=virtual/perl-ExtUtils-MakeMaker-6.800.0 - >=virtual/perl-ExtUtils-ParseXS-3.220.0 - test? ( virtual/perl-Test-Harness - virtual/perl-Test-Simple )" - -DIST_TEST="do"
[gentoo-commits] repo/gentoo:master commit in: media-gfx/slic3r/
commit: 1add15c165f0a79729e3f90797284b619ead8989 Author: Dennis Lamm gentoo org> AuthorDate: Sun Oct 11 14:19:36 2020 + Commit: Dennis Lamm gentoo org> CommitDate: Sun Oct 11 15:16:55 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1add15c1 media-gfx/slic3r: fixed .desktop file Closes: https://bugs.gentoo.org/712898 Signed-off-by: Dennis Lamm gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/17888 Signed-off-by: Dennis Lamm gentoo.org> .../{slic3r-.ebuild => slic3r-1.3.0-r2.ebuild} | 24 +- media-gfx/slic3r/slic3r-.ebuild| 2 +- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/media-gfx/slic3r/slic3r-.ebuild b/media-gfx/slic3r/slic3r-1.3.0-r2.ebuild similarity index 82% copy from media-gfx/slic3r/slic3r-.ebuild copy to media-gfx/slic3r/slic3r-1.3.0-r2.ebuild index 61ef1b641af..60c8950aab4 100644 --- a/media-gfx/slic3r/slic3r-.ebuild +++ b/media-gfx/slic3r/slic3r-1.3.0-r2.ebuild @@ -3,16 +3,15 @@ EAPI=6 -inherit eutils git-r3 perl-module +inherit eutils flag-o-matic perl-module DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)" HOMEPAGE="https://slic3r.org; -SRC_URI="" -EGIT_REPO_URI="https://github.com/Slic3r/Slic3r.git; +SRC_URI="https://github.com/alexrj/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="AGPL-3 CC-BY-3.0" SLOT="0" -KEYWORDS="" +KEYWORDS="~amd64 ~x86" IUSE="+gui test" RESTRICT="!test? ( test )" @@ -65,19 +64,24 @@ DEPEND="${RDEPEND} test? ( virtual/perl-Test-Harness virtual/perl-Test-Simple )" -S="${WORKDIR}/slic3r-${PV}/xs" +S="${WORKDIR}/Slic3r-${PV}/xs" -src_unpack() { - git-r3_src_unpack +pkg_pretend() { + einfo "Checking for -std=c++11 support in compiler" + test-flags-CXX -std=c++11 > /dev/null || die } src_prepare() { - pushd "${WORKDIR}/slic3r-${PV}" || die + pushd "${WORKDIR}/Slic3r-${PV}" || die sed -i lib/Slic3r.pm -e "s@FindBin::Bin@FindBin::RealBin@g" || die eapply "${FILESDIR}"/${P}-no-locallib.patch - eapply "${FILESDIR}"/${P}-boost-173.patch + eapply "${FILESDIR}"/${P}-boost.patch eapply_user popd || die + # drop std=c++11 to compiler defaults... + sed \ + -e '/c++11/d' \ + -i Build.PL || die } src_configure() { @@ -106,7 +110,7 @@ src_install() { dosym "${VENDOR_LIB}"/Slic3r/slic3r.pl /usr/bin/slic3r.pl - make_desktop_entry slic3r.pl \ + make_desktop_entry "slic3r.pl --gui %F" \ Slic3r \ "${VENDOR_LIB}/Slic3r/var/Slic3r_128px.png" \ "Graphics;3DGraphics;Engineering;Development" diff --git a/media-gfx/slic3r/slic3r-.ebuild b/media-gfx/slic3r/slic3r-.ebuild index 61ef1b641af..404994de740 100644 --- a/media-gfx/slic3r/slic3r-.ebuild +++ b/media-gfx/slic3r/slic3r-.ebuild @@ -106,7 +106,7 @@ src_install() { dosym "${VENDOR_LIB}"/Slic3r/slic3r.pl /usr/bin/slic3r.pl - make_desktop_entry slic3r.pl \ + make_desktop_entry "slic3r.pl --gui %F" \ Slic3r \ "${VENDOR_LIB}/Slic3r/var/Slic3r_128px.png" \ "Graphics;3DGraphics;Engineering;Development"
[gentoo-commits] repo/gentoo:master commit in: media-gfx/slic3r/files/, media-gfx/slic3r/
commit: dd0cc9b3c115e218e3ecb7f54b233a83e4b28610 Author: Miroslav Šulc gentoo org> AuthorDate: Sat Aug 1 10:58:38 2020 + Commit: Miroslav Šulc gentoo org> CommitDate: Sat Aug 1 10:58:52 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd0cc9b3 media-gfx/slic3r: fixed compilation with boost 1.73 for Bug: https://bugs.gentoo.org/722308 Package-Manager: Portage-3.0.1, Repoman-2.3.23 Signed-off-by: Miroslav Šulc gentoo.org> media-gfx/slic3r/files/slic3r--boost-173.patch | 39 ++ media-gfx/slic3r/slic3r-.ebuild| 3 +- 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/media-gfx/slic3r/files/slic3r--boost-173.patch b/media-gfx/slic3r/files/slic3r--boost-173.patch new file mode 100644 index 000..ef7289afcd8 --- /dev/null +++ b/media-gfx/slic3r/files/slic3r--boost-173.patch @@ -0,0 +1,39 @@ +--- a/xs/src/libslic3r/SLAPrint.cpp2020-05-10 23:32:00.044962439 -0600 b/xs/src/libslic3r/SLAPrint.cpp2020-05-10 23:40:48.867348908 -0600 +@@ -7,6 +7,7 @@ + #include + #include + #include ++#include "boost/bind.hpp" + + namespace Slic3r { + +--- a/xs/src/libslic3r/PrintObject.cpp 2020-05-10 23:32:00.044962439 -0600 b/xs/src/libslic3r/PrintObject.cpp 2020-05-10 23:46:22.614152088 -0600 +@@ -7,6 +7,7 @@ + #include + #include + #include ++#include "boost/bind.hpp" + + namespace Slic3r { + +--- a/xs/src/libslic3r/SupportMaterial.cpp 2020-05-10 23:32:00.044962439 -0600 b/xs/src/libslic3r/SupportMaterial.cpp 2020-05-10 23:54:17.078033850 -0600 +@@ -1,5 +1,6 @@ + #include "SupportMaterial.hpp" + #include "Log.hpp" ++#include "boost/bind.hpp" + + namespace Slic3r + { +--- a/xs/src/libslic3r/TriangleMesh.cpp2020-05-10 23:32:00.045962432 -0600 b/xs/src/libslic3r/TriangleMesh.cpp2020-05-10 23:35:44.778426800 -0600 +@@ -15,6 +15,7 @@ + #include + #include + #include ++#include "boost/bind.hpp" + + #ifdef SLIC3R_DEBUG + #include "SVG.hpp" diff --git a/media-gfx/slic3r/slic3r-.ebuild b/media-gfx/slic3r/slic3r-.ebuild index d4bc4f6a67a..61ef1b641af 100644 --- a/media-gfx/slic3r/slic3r-.ebuild +++ b/media-gfx/slic3r/slic3r-.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -75,6 +75,7 @@ src_prepare() { pushd "${WORKDIR}/slic3r-${PV}" || die sed -i lib/Slic3r.pm -e "s@FindBin::Bin@FindBin::RealBin@g" || die eapply "${FILESDIR}"/${P}-no-locallib.patch + eapply "${FILESDIR}"/${P}-boost-173.patch eapply_user popd || die }
[gentoo-commits] repo/gentoo:master commit in: media-gfx/slic3r/
commit: d002227d15ab6a54234f6c6e621192c8fdcaf3db Author: David Seifert gentoo org> AuthorDate: Sun Jan 12 11:13:20 2020 + Commit: David Seifert gentoo org> CommitDate: Sun Jan 12 11:13:20 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d002227d media-gfx/slic3r: Remove local USE="gui" Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: David Seifert gentoo.org> media-gfx/slic3r/metadata.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/media-gfx/slic3r/metadata.xml b/media-gfx/slic3r/metadata.xml index a21a04deb38..49968e9fe3d 100644 --- a/media-gfx/slic3r/metadata.xml +++ b/media-gfx/slic3r/metadata.xml @@ -9,9 +9,6 @@ p...@gentoo.org Gentoo Perl Project - -Enable GUI - Slic3r is the tool you need to convert a 3D model into printing instructions for your 3D printer. It cuts the model into horizontal slices (layers), generates toolpaths to fill them and calculates the amount of material to be extruded.
[gentoo-commits] repo/gentoo:master commit in: media-gfx/slic3r/, media-gfx/slic3r/files/
commit: f614b0c825c26ee8e1900fa5e3cf8883d09cd274 Author: Andreas K. Hüttel gentoo org> AuthorDate: Thu Nov 7 22:11:26 2019 + Commit: Andreas K. Hüttel gentoo org> CommitDate: Thu Nov 7 22:11:52 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f614b0c8 media-gfx/slic3r: Add patch by Chris Mansfield for recent boost Closes: https://bugs.gentoo.org/689804 Package-Manager: Portage-2.3.78, Repoman-2.3.17 Signed-off-by: Andreas K. Hüttel gentoo.org> media-gfx/slic3r/files/slic3r-1.3.0-boost.patch | 10 ++ media-gfx/slic3r/slic3r-1.3.0-r1.ebuild | 1 + 2 files changed, 11 insertions(+) diff --git a/media-gfx/slic3r/files/slic3r-1.3.0-boost.patch b/media-gfx/slic3r/files/slic3r-1.3.0-boost.patch new file mode 100644 index 000..e77e50b3c99 --- /dev/null +++ b/media-gfx/slic3r/files/slic3r-1.3.0-boost.patch @@ -0,0 +1,10 @@ +--- Slic3r-1.3.0/xs/src/libslic3r/GCodeSender.hpp.old 2019-11-04 19:31:05.714869400 -0800 Slic3r-1.3.0/xs/src/libslic3r/GCodeSender.hpp 2019-11-04 19:34:10.656330929 -0800 +@@ -9,6 +9,7 @@ + #include + #include + #include ++#include + + namespace Slic3r { + diff --git a/media-gfx/slic3r/slic3r-1.3.0-r1.ebuild b/media-gfx/slic3r/slic3r-1.3.0-r1.ebuild index 64cc0c14bc9..556d06e6628 100644 --- a/media-gfx/slic3r/slic3r-1.3.0-r1.ebuild +++ b/media-gfx/slic3r/slic3r-1.3.0-r1.ebuild @@ -74,6 +74,7 @@ src_prepare() { pushd "${WORKDIR}/Slic3r-${PV}" || die sed -i lib/Slic3r.pm -e "s@FindBin::Bin@FindBin::RealBin@g" || die eapply "${FILESDIR}"/${P}-no-locallib.patch + eapply "${FILESDIR}"/${P}-boost.patch eapply_user popd || die # drop std=c++11 to compiler defaults...
[gentoo-commits] repo/gentoo:master commit in: media-gfx/slic3r/
commit: 735c00bef0d86648620823bc0f7909ac167a15f7 Author: Alexey Shvetsov gentoo org> AuthorDate: Sun Apr 21 11:15:31 2019 + Commit: Alexey Shvetsov gentoo org> CommitDate: Sun Apr 21 11:15:54 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=735c00be media-gfx/slic3r: Update repo uri Package-Manager: Portage-2.3.64, Repoman-2.3.12 Signed-off-by: Alexey Shvetsov gentoo.org> media-gfx/slic3r/slic3r-.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-gfx/slic3r/slic3r-.ebuild b/media-gfx/slic3r/slic3r-.ebuild index 7e99f7d1650..e5b72c09943 100644 --- a/media-gfx/slic3r/slic3r-.ebuild +++ b/media-gfx/slic3r/slic3r-.ebuild @@ -8,7 +8,7 @@ inherit eutils git-r3 perl-module DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)" HOMEPAGE="https://slic3r.org; SRC_URI="" -EGIT_REPO_URI="https://github.com/alexrj/Slic3r.git; +EGIT_REPO_URI="https://github.com/Slic3r/Slic3r.git; LICENSE="AGPL-3 CC-BY-3.0" SLOT="0"
[gentoo-commits] repo/gentoo:master commit in: media-gfx/slic3r/
commit: 603caebf45e3196e7dcacbcfc56101b3b44527a2 Author: Michael Mair-Keimberger gmail com> AuthorDate: Thu Mar 14 19:10:57 2019 + Commit: Patrice Clement gentoo org> CommitDate: Fri Mar 15 22:42:18 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=603caebf media-gfx/slic3r: use HTTPS. Signed-off-by: Michael Mair-Keimberger gmail.com> Closes: https://github.com/gentoo/gentoo/pull/11366 Signed-off-by: Patrice Clement gentoo.org> media-gfx/slic3r/slic3r-1.1.7.ebuild| 4 ++-- media-gfx/slic3r/slic3r-1.3.0-r1.ebuild | 4 ++-- media-gfx/slic3r/slic3r-.ebuild | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/media-gfx/slic3r/slic3r-1.1.7.ebuild b/media-gfx/slic3r/slic3r-1.1.7.ebuild index a01849e78a0..6750210520c 100644 --- a/media-gfx/slic3r/slic3r-1.1.7.ebuild +++ b/media-gfx/slic3r/slic3r-1.1.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -6,7 +6,7 @@ EAPI=6 inherit eutils perl-module DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)" -HOMEPAGE="http://slic3r.org; +HOMEPAGE="https://slic3r.org; SRC_URI="https://github.com/alexrj/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="AGPL-3 CC-BY-3.0" diff --git a/media-gfx/slic3r/slic3r-1.3.0-r1.ebuild b/media-gfx/slic3r/slic3r-1.3.0-r1.ebuild index a94b46f01a7..64cc0c14bc9 100644 --- a/media-gfx/slic3r/slic3r-1.3.0-r1.ebuild +++ b/media-gfx/slic3r/slic3r-1.3.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -6,7 +6,7 @@ EAPI=6 inherit eutils flag-o-matic perl-module DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)" -HOMEPAGE="http://slic3r.org; +HOMEPAGE="https://slic3r.org; SRC_URI="https://github.com/alexrj/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="AGPL-3 CC-BY-3.0" diff --git a/media-gfx/slic3r/slic3r-.ebuild b/media-gfx/slic3r/slic3r-.ebuild index db80a647e0e..7e99f7d1650 100644 --- a/media-gfx/slic3r/slic3r-.ebuild +++ b/media-gfx/slic3r/slic3r-.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -6,7 +6,7 @@ EAPI=6 inherit eutils git-r3 perl-module DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)" -HOMEPAGE="http://slic3r.org; +HOMEPAGE="https://slic3r.org; SRC_URI="" EGIT_REPO_URI="https://github.com/alexrj/Slic3r.git;
[gentoo-commits] repo/gentoo:master commit in: media-gfx/slic3r/files/
commit: 57422b4d9e26cec6d6976c5e573f7a72b636fd75 Author: Michael Mair-Keimberger gmail com> AuthorDate: Fri Mar 1 17:31:52 2019 + Commit: Aaron Bauman gentoo org> CommitDate: Mon Mar 4 03:13:17 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57422b4d media-gfx/slic3r: remove unused patches Signed-off-by: Michael Mair-Keimberger gmail.com> Signed-off-by: Aaron Bauman gentoo.org> .../files/slic3r-1.2.9-adjust_var_path.patch | 11 --- media-gfx/slic3r/files/slic3r-1.2.9-c++11.patch| 38 -- 2 files changed, 49 deletions(-) diff --git a/media-gfx/slic3r/files/slic3r-1.2.9-adjust_var_path.patch b/media-gfx/slic3r/files/slic3r-1.2.9-adjust_var_path.patch deleted file mode 100644 index 9dc93a52dde..000 --- a/media-gfx/slic3r/files/slic3r-1.2.9-adjust_var_path.patch +++ /dev/null @@ -1,11 +0,0 @@ a/lib/Slic3r.pm2015-06-17 04:38:28.0 -0400 -+++ b/lib/Slic3r.pm2015-06-19 11:56:07.005873299 -0400 -@@ -30,7 +30,7 @@ - if $^V == v5.16; - - use FindBin; --our $var = decode_path($FindBin::Bin) . "/var"; -+our $var = decode_path($FindBin::RealBin) . "/var"; - - use Moo 1.003001; - diff --git a/media-gfx/slic3r/files/slic3r-1.2.9-c++11.patch b/media-gfx/slic3r/files/slic3r-1.2.9-c++11.patch deleted file mode 100644 index f6b15d70a1a..000 --- a/media-gfx/slic3r/files/slic3r-1.2.9-c++11.patch +++ /dev/null @@ -1,38 +0,0 @@ a/xs/src/libslic3r/Config.hpp 2015-06-17 04:38:28.0 -0400 -+++ b/xs/src/libslic3r/Config.hpp 2017-09-27 10:59:26.527103728 -0400 -@@ -65,7 +65,7 @@ - - bool deserialize(std::string str) { - std::istringstream iss(str); --return iss >> this->value; -+return static_cast(iss >> this->value); - }; - }; - -@@ -124,7 +124,7 @@ - - bool deserialize(std::string str) { - std::istringstream iss(str); --return iss >> this->value; -+return static_cast(iss >> this->value); - }; - }; - -@@ -249,7 +249,7 @@ - bool deserialize(std::string str) { - // don't try to parse the trailing % since it's optional - std::istringstream iss(str); --return iss >> this->value; -+return static_cast(iss >> this->value); - }; - }; - -@@ -279,7 +279,7 @@ - bool deserialize(std::string str) { - this->percent = str.find_first_of("%") != std::string::npos; - std::istringstream iss(str); --return iss >> this->value; -+return static_cast(iss >> this->value); - }; - }; -
[gentoo-commits] repo/gentoo:master commit in: media-gfx/slic3r/
commit: 4fb7f88c31df9e5df1a1928a61143cbd96f94fdd Author: Alexey Shvetsov gentoo org> AuthorDate: Wed Nov 14 08:32:43 2018 + Commit: Alexey Shvetsov gentoo org> CommitDate: Wed Nov 14 08:32:43 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fb7f88c media-gfx/slic3r: Add missing eclass Package-Manager: Portage-2.3.51, Repoman-2.3.12 Signed-off-by: Alexey Shvetsov gentoo.org> media-gfx/slic3r/slic3r-1.3.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-gfx/slic3r/slic3r-1.3.0-r1.ebuild b/media-gfx/slic3r/slic3r-1.3.0-r1.ebuild index 99bb42f016a..a94b46f01a7 100644 --- a/media-gfx/slic3r/slic3r-1.3.0-r1.ebuild +++ b/media-gfx/slic3r/slic3r-1.3.0-r1.ebuild @@ -3,7 +3,7 @@ EAPI=6 -inherit eutils perl-module +inherit eutils flag-o-matic perl-module DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)" HOMEPAGE="http://slic3r.org;
[gentoo-commits] repo/gentoo:master commit in: media-gfx/slic3r/
commit: ee0c1189775ad6a1854fc90fa4a4b144a990c791 Author: Alexey Shvetsov gentoo org> AuthorDate: Mon Nov 12 15:38:27 2018 + Commit: Alexey Shvetsov gentoo org> CommitDate: Mon Nov 12 15:38:27 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee0c1189 media-gfx/slic3r: Fix abi mismatch when built with gcc8 Package-Manager: Portage-2.3.51, Repoman-2.3.12 Signed-off-by: Alexey Shvetsov gentoo.org> media-gfx/slic3r/Manifest | 1 - media-gfx/slic3r/slic3r-1.2.9-r2.ebuild| 103 - ...{slic3r-1.3.0.ebuild => slic3r-1.3.0-r1.ebuild} | 11 ++- 3 files changed, 10 insertions(+), 105 deletions(-) diff --git a/media-gfx/slic3r/Manifest b/media-gfx/slic3r/Manifest index bc22f8bc00b..8cd8345ac18 100644 --- a/media-gfx/slic3r/Manifest +++ b/media-gfx/slic3r/Manifest @@ -1,3 +1,2 @@ DIST slic3r-1.1.7.tar.gz 2079200 BLAKE2B b3aa45741bb92a75dd09be783cb9a8cd551c7736f04022905d11587d8b2a533db85c1f88a9d0185b2b6414ba56d44e0feb104bcfcaf52a0a35a1db912c6976db SHA512 0c3a12890f57f422084b20152ede3467a8624db4ba8be774258df0af963c1f6f41fda7d96967f6355bd95727539e6aad51c30cf45284a7ee3fff294839acc650 -DIST slic3r-1.2.9.tar.gz 2165322 BLAKE2B 49643284520e6c85ff0e32fada165c8d4c75c15e484555aac1004bc9527bacd552c6aa4916cbb56e304553a47ef6c2db703f6e9d705a585cfbac909c2e84bb79 SHA512 c0284f40de43c54e775baccdb2a67813a6ca4b69db78a788f2023b3f34127e780e6d0160144b9df1e17a2992b3255ef9a372b61a594f503b21efad7334387a51 DIST slic3r-1.3.0.tar.gz 2104094 BLAKE2B 74c58690cf196f89ecff5eec853215c87c648df5a504725fea9f14b0343bca105190de1d63e2e8e76d47fcaf8dbe7b6d26f61b304ce7336412effa1c9a3fba41 SHA512 ff0f7747e166826ff1c53220974ee9d3a217d0e19964dbe4a5fa3e81f262a6810a47632686b7f1b3128384ae05c6f98d8aab980524079bdf9811445fe23a0f0d diff --git a/media-gfx/slic3r/slic3r-1.2.9-r2.ebuild b/media-gfx/slic3r/slic3r-1.2.9-r2.ebuild deleted file mode 100644 index 21f22728472..000 --- a/media-gfx/slic3r/slic3r-1.2.9-r2.ebuild +++ /dev/null @@ -1,103 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils perl-module - -DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)" -HOMEPAGE="http://slic3r.org; -SRC_URI="https://github.com/alexrj/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="AGPL-3 CC-BY-3.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+gui test" - -RDEPEND="!=dev-lang/perl-5.16* - >=dev-libs/boost-1.55[threads] - dev-perl/Class-XSAccessor - >=dev-perl/Encode-Locale-1.50.0 - dev-perl/IO-stringy - >=dev-perl/Math-PlanePath-53.0.0 - >=dev-perl/Moo-1.3.1 - dev-perl/XML-SAX-ExpatXS - virtual/perl-Carp - virtual/perl-Encode - virtual/perl-File-Spec - virtual/perl-Getopt-Long - virtual/perl-parent - virtual/perl-Scalar-List-Utils - virtual/perl-Test-Simple - virtual/perl-Thread-Semaphore - >=virtual/perl-threads-1.960.0 - virtual/perl-Time-HiRes - virtual/perl-Unicode-Normalize - virtual/perl-XSLoader - gui? ( dev-perl/Class-Accessor - dev-perl/Growl-GNTP - dev-perl/libwww-perl - dev-perl/Module-Pluggable - dev-perl/Net-Bonjour - dev-perl/Net-DBus - dev-perl/OpenGL - >=dev-perl/Wx-0.991.800 - dev-perl/Wx-GLCanvas - >=media-libs/freeglut-3 - virtual/perl-Math-Complex - >=virtual/perl-Socket-2.16.0 - x11-libs/libXmu - )" -DEPEND="${RDEPEND} - >=dev-perl/ExtUtils-CppGuess-0.70.0 - >=dev-perl/ExtUtils-Typemaps-Default-1.50.0 - >=dev-perl/ExtUtils-XSpp-0.170.0 - >=dev-perl/Module-Build-0.380.0 - >=dev-perl/Module-Build-WithXSpp-0.140.0 - >=virtual/perl-ExtUtils-MakeMaker-6.800.0 - >=virtual/perl-ExtUtils-ParseXS-3.220.0 - test? ( virtual/perl-Test-Harness - virtual/perl-Test-Simple )" - -S="${WORKDIR}/Slic3r-${PV}/xs" - -src_prepare() { - pushd "${WORKDIR}/Slic3r-${PV}" || die - eapply "${FILESDIR}/${P}-adjust_var_path.patch" - eapply "${FILESDIR}/${P}-c++11.patch" - eapply_user - popd || die -} - -src_configure() { - SLIC3R_NO_AUTO=1 perl-module_src_configure -} - -src_test() { - perl-module_src_test - pushd .. || die - prove -Ixs/blib/arch -Ixs/blib/lib/ t/ || die "Tests failed" - popd || die -} - -src_install() { - perl-module_src_install - - pushd .. || die - insinto "${VENDOR_LIB}" - doins -r lib/Slic3r.pm lib/Slic3r - - insinto "${VENDOR_LIB}"/Slic3r - doins -r var - - exeinto "${VENDOR_LIB}"/Slic3r - doexe slic3r.pl - - dosym "${VENDOR_LIB}"/Slic3r/slic3r.pl /usr/bin/slic3r.pl - - make_desktop_entry slic3r.pl \ - Slic3r \ -
[gentoo-commits] repo/gentoo:master commit in: media-gfx/slic3r/, media-gfx/slic3r/files/
commit: 36d17be523b54b0baae627121f4b7b085f49eb61 Author: Alexey Shvetsov gentoo org> AuthorDate: Wed Jun 6 13:21:39 2018 + Commit: Alexey Shvetsov gentoo org> CommitDate: Wed Jun 6 13:22:01 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36d17be5 media-gfx/slic3r: Version bump New version of slic3r Closes: https://bugs.gentoo.org/617640 Package-Manager: Portage-2.3.40, Repoman-2.3.9 media-gfx/slic3r/Manifest | 1 + .../slic3r/files/slic3r-1.3.0-no-locallib.patch| 609 + media-gfx/slic3r/slic3r-1.3.0.ebuild | 107 3 files changed, 717 insertions(+) diff --git a/media-gfx/slic3r/Manifest b/media-gfx/slic3r/Manifest index b41d2036880..bc22f8bc00b 100644 --- a/media-gfx/slic3r/Manifest +++ b/media-gfx/slic3r/Manifest @@ -1,2 +1,3 @@ DIST slic3r-1.1.7.tar.gz 2079200 BLAKE2B b3aa45741bb92a75dd09be783cb9a8cd551c7736f04022905d11587d8b2a533db85c1f88a9d0185b2b6414ba56d44e0feb104bcfcaf52a0a35a1db912c6976db SHA512 0c3a12890f57f422084b20152ede3467a8624db4ba8be774258df0af963c1f6f41fda7d96967f6355bd95727539e6aad51c30cf45284a7ee3fff294839acc650 DIST slic3r-1.2.9.tar.gz 2165322 BLAKE2B 49643284520e6c85ff0e32fada165c8d4c75c15e484555aac1004bc9527bacd552c6aa4916cbb56e304553a47ef6c2db703f6e9d705a585cfbac909c2e84bb79 SHA512 c0284f40de43c54e775baccdb2a67813a6ca4b69db78a788f2023b3f34127e780e6d0160144b9df1e17a2992b3255ef9a372b61a594f503b21efad7334387a51 +DIST slic3r-1.3.0.tar.gz 2104094 BLAKE2B 74c58690cf196f89ecff5eec853215c87c648df5a504725fea9f14b0343bca105190de1d63e2e8e76d47fcaf8dbe7b6d26f61b304ce7336412effa1c9a3fba41 SHA512 ff0f7747e166826ff1c53220974ee9d3a217d0e19964dbe4a5fa3e81f262a6810a47632686b7f1b3128384ae05c6f98d8aab980524079bdf9811445fe23a0f0d diff --git a/media-gfx/slic3r/files/slic3r-1.3.0-no-locallib.patch b/media-gfx/slic3r/files/slic3r-1.3.0-no-locallib.patch new file mode 100644 index 000..8cb7fd6d16d --- /dev/null +++ b/media-gfx/slic3r/files/slic3r-1.3.0-no-locallib.patch @@ -0,0 +1,609 @@ +commit 6f7e42a4707788d079d865800d9fdb65ed7d5f1f +Author: Ian Stakenvicius +Date: Wed Sep 27 12:22:14 2017 -0400 + +Revert "Use --local-lib when calling cpanm" + +This reverts commit e5412b5d69dc4d5415c92a7daaa47fb4860ca4ea and others +that add local::lib dependency + +diff --git a/Build.PL b/Build.PL +index 2dd18435..18befbf8 100644 +--- a/Build.PL b/Build.PL +@@ -109,16 +109,7 @@ EOF + if !$cpanm; + my @cpanm_args = (); + push @cpanm_args, "--sudo" if $sudo; +- +-# install local::lib without --local-lib otherwise it's not usable afterwards +-if (!eval "use local::lib qw(local-lib); 1") { +-my $res = system $cpanm, @cpanm_args, 'local::lib'; +-warn "Warning: local::lib is required. You might need to run the `cpanm --sudo local::lib` command in order to install it.\n" +-if $res != 0; +-} +- +-push @cpanm_args, ('--local-lib', 'local-lib'); +- ++ + # make sure our cpanm is updated (old ones don't support the ~ syntax) + system $cpanm, @cpanm_args, 'App::cpanminus'; + +diff --git a/slic3r.pl b/slic3r.pl +index 11dc2fad..76885c90 100755 +--- a/slic3r.pl b/slic3r.pl +@@ -6,7 +6,6 @@ use warnings; + BEGIN { + use FindBin; + use lib "$FindBin::Bin/lib"; +-use local::lib '--no-create', "$FindBin::Bin/local-lib"; + } + + use File::Basename qw(basename); +diff --git a/t/adaptive_slicing.t b/t/adaptive_slicing.t +index 64c3769f..5ab631fe 100644 +--- a/t/adaptive_slicing.t b/t/adaptive_slicing.t +@@ -5,7 +5,6 @@ use warnings; + BEGIN { + use FindBin; + use lib "$FindBin::Bin/../lib"; +-use local::lib "$FindBin::Bin/../local-lib"; + } + + use List::Util qw(first sum); +diff --git a/t/adaptive_width.t b/t/adaptive_width.t +index 7a0baa75..c200f844 100644 +--- a/t/adaptive_width.t b/t/adaptive_width.t +@@ -7,7 +7,6 @@ plan tests => 32; + BEGIN { + use FindBin; + use lib "$FindBin::Bin/../lib"; +-use local::lib "$FindBin::Bin/../local-lib"; + } + + use List::Util qw(first); +diff --git a/t/angles.t b/t/angles.t +index 2ae00b4e..1e1a6c9c 100644 +--- a/t/angles.t b/t/angles.t +@@ -7,9 +7,6 @@ plan tests => 34; + BEGIN { + use FindBin; + use lib "$FindBin::Bin/../lib"; +-use lib "$FindBin::Bin/../lib"; +-use lib "$FindBin::Bin/../lib"; +-use local::lib "$FindBin::Bin/../local-lib"; + } + + use Slic3r; +diff --git a/t/arcs.t b/t/arcs.t +index ec85dfbc..65b83de4 100644 +--- a/t/arcs.t b/t/arcs.t +@@ -7,7 +7,6 @@ plan tests => 24; + BEGIN { + use FindBin; + use lib "$FindBin::Bin/../lib"; +-use local::lib "$FindBin::Bin/../local-lib"; + } + + use Slic3r; +diff --git a/t/avoid_crossing_perimeters.t b/t/avoid_crossing_perimeters.t +index 7cd04e50..dd6c3e7b 100644 +--- a/t/avoid_crossing_perimeters.t b/t/avoid_crossing_perimeters.t +@@ -5,7 +5,6 @@ use warnings; + BEGIN { + use FindBin; +
[gentoo-commits] repo/gentoo:master commit in: media-gfx/slic3r/
commit: 3ab711adb8087c53ad6379bb90e102e6fe232fb2 Author: Jonas Stein gentoo org> AuthorDate: Tue Apr 3 15:19:31 2018 + Commit: Jonas Stein gentoo org> CommitDate: Tue Apr 3 15:27:43 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ab711ad media-gfx/slic3r: Maintainer retired Proxied maintainer was retired due to inactivity. Bug: https://bugs.gentoo.org/632854 Package-Manager: Portage-2.3.28, Repoman-2.3.9 media-gfx/slic3r/metadata.xml | 8 1 file changed, 8 deletions(-) diff --git a/media-gfx/slic3r/metadata.xml b/media-gfx/slic3r/metadata.xml index c0f39d3c042..a21a04deb38 100644 --- a/media-gfx/slic3r/metadata.xml +++ b/media-gfx/slic3r/metadata.xml @@ -1,14 +1,6 @@ http://www.gentoo.org/dtd/metadata.dtd;> - -tombo...@sina.cn -Proxy-Maintainer; please assign him to bugs. - - -proxy-ma...@gentoo.org -Gentoo Proxy Maintainers Project - 3dpr...@gentoo.org Gentoo 3D Printer Project
[gentoo-commits] repo/gentoo:master commit in: media-gfx/slic3r/
commit: f5b84ccf44f983f2b9a4a081cac46c65c6730456 Author: Tobias Klausmann gentoo org> AuthorDate: Sat Dec 16 10:29:43 2017 + Commit: Tobias Klausmann gentoo org> CommitDate: Sat Dec 16 10:31:18 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5b84ccf media-gfx/slic3r-1.1.7-r0: amd64 stable Gentoo-Bug: http://bugs.gentoo.org/632664 media-gfx/slic3r/slic3r-1.1.7.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-gfx/slic3r/slic3r-1.1.7.ebuild b/media-gfx/slic3r/slic3r-1.1.7.ebuild index a4f86fd3ff8..a01849e78a0 100644 --- a/media-gfx/slic3r/slic3r-1.1.7.ebuild +++ b/media-gfx/slic3r/slic3r-1.1.7.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/alexrj/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="AGPL-3 CC-BY-3.0" SLOT="0" -KEYWORDS="~amd64 x86" +KEYWORDS="amd64 x86" IUSE="+gui test" # check Build.PL for dependencies
[gentoo-commits] repo/gentoo:master commit in: media-gfx/slic3r/
commit: f11e42045e5cfe5eae882512fe6ca938d87d2667 Author: Thomas Deutschmann gentoo org> AuthorDate: Thu Oct 26 20:16:16 2017 + Commit: Thomas Deutschmann gentoo org> CommitDate: Thu Oct 26 20:18:19 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f11e4204 media-gfx/slic3r: x86 stable (bug #632664) Package-Manager: Portage-2.3.11, Repoman-2.3.3 media-gfx/slic3r/slic3r-1.1.7.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/media-gfx/slic3r/slic3r-1.1.7.ebuild b/media-gfx/slic3r/slic3r-1.1.7.ebuild index cc961a803fe..a4f86fd3ff8 100644 --- a/media-gfx/slic3r/slic3r-1.1.7.ebuild +++ b/media-gfx/slic3r/slic3r-1.1.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/alexrj/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="AGPL-3 CC-BY-3.0" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 x86" IUSE="+gui test" # check Build.PL for dependencies
[gentoo-commits] repo/gentoo:master commit in: media-gfx/slic3r/, media-gfx/slic3r/files/
commit: b99d82cf2ca7b57d411e8008b85b731b03dc08c0 Author: Ian Stakenvicius gentoo org> AuthorDate: Wed Sep 27 17:17:14 2017 + Commit: Ian Stakenvicius gentoo org> CommitDate: Wed Sep 27 17:17:38 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b99d82cf media-gfx/slic3r-: add missing dep, strip local::lib local::lib is a workaround to help with the cpan-minus based build system the package comes with, which we are circumventing in order to perform a proper system installation. This commit includes a patch that reverts the upstream addition of local::lib. Also adds dev-perl/Devel-CheckLib to the dependency list Package-Manager: Portage-2.3.8, Repoman-2.3.1 .../slic3r/files/slic3r--no-locallib.patch | 609 + media-gfx/slic3r/slic3r-.ebuild| 2 + 2 files changed, 611 insertions(+) diff --git a/media-gfx/slic3r/files/slic3r--no-locallib.patch b/media-gfx/slic3r/files/slic3r--no-locallib.patch new file mode 100644 index 000..8cb7fd6d16d --- /dev/null +++ b/media-gfx/slic3r/files/slic3r--no-locallib.patch @@ -0,0 +1,609 @@ +commit 6f7e42a4707788d079d865800d9fdb65ed7d5f1f +Author: Ian Stakenvicius+Date: Wed Sep 27 12:22:14 2017 -0400 + +Revert "Use --local-lib when calling cpanm" + +This reverts commit e5412b5d69dc4d5415c92a7daaa47fb4860ca4ea and others +that add local::lib dependency + +diff --git a/Build.PL b/Build.PL +index 2dd18435..18befbf8 100644 +--- a/Build.PL b/Build.PL +@@ -109,16 +109,7 @@ EOF + if !$cpanm; + my @cpanm_args = (); + push @cpanm_args, "--sudo" if $sudo; +- +-# install local::lib without --local-lib otherwise it's not usable afterwards +-if (!eval "use local::lib qw(local-lib); 1") { +-my $res = system $cpanm, @cpanm_args, 'local::lib'; +-warn "Warning: local::lib is required. You might need to run the `cpanm --sudo local::lib` command in order to install it.\n" +-if $res != 0; +-} +- +-push @cpanm_args, ('--local-lib', 'local-lib'); +- ++ + # make sure our cpanm is updated (old ones don't support the ~ syntax) + system $cpanm, @cpanm_args, 'App::cpanminus'; + +diff --git a/slic3r.pl b/slic3r.pl +index 11dc2fad..76885c90 100755 +--- a/slic3r.pl b/slic3r.pl +@@ -6,7 +6,6 @@ use warnings; + BEGIN { + use FindBin; + use lib "$FindBin::Bin/lib"; +-use local::lib '--no-create', "$FindBin::Bin/local-lib"; + } + + use File::Basename qw(basename); +diff --git a/t/adaptive_slicing.t b/t/adaptive_slicing.t +index 64c3769f..5ab631fe 100644 +--- a/t/adaptive_slicing.t b/t/adaptive_slicing.t +@@ -5,7 +5,6 @@ use warnings; + BEGIN { + use FindBin; + use lib "$FindBin::Bin/../lib"; +-use local::lib "$FindBin::Bin/../local-lib"; + } + + use List::Util qw(first sum); +diff --git a/t/adaptive_width.t b/t/adaptive_width.t +index 7a0baa75..c200f844 100644 +--- a/t/adaptive_width.t b/t/adaptive_width.t +@@ -7,7 +7,6 @@ plan tests => 32; + BEGIN { + use FindBin; + use lib "$FindBin::Bin/../lib"; +-use local::lib "$FindBin::Bin/../local-lib"; + } + + use List::Util qw(first); +diff --git a/t/angles.t b/t/angles.t +index 2ae00b4e..1e1a6c9c 100644 +--- a/t/angles.t b/t/angles.t +@@ -7,9 +7,6 @@ plan tests => 34; + BEGIN { + use FindBin; + use lib "$FindBin::Bin/../lib"; +-use lib "$FindBin::Bin/../lib"; +-use lib "$FindBin::Bin/../lib"; +-use local::lib "$FindBin::Bin/../local-lib"; + } + + use Slic3r; +diff --git a/t/arcs.t b/t/arcs.t +index ec85dfbc..65b83de4 100644 +--- a/t/arcs.t b/t/arcs.t +@@ -7,7 +7,6 @@ plan tests => 24; + BEGIN { + use FindBin; + use lib "$FindBin::Bin/../lib"; +-use local::lib "$FindBin::Bin/../local-lib"; + } + + use Slic3r; +diff --git a/t/avoid_crossing_perimeters.t b/t/avoid_crossing_perimeters.t +index 7cd04e50..dd6c3e7b 100644 +--- a/t/avoid_crossing_perimeters.t b/t/avoid_crossing_perimeters.t +@@ -5,7 +5,6 @@ use warnings; + BEGIN { + use FindBin; + use lib "$FindBin::Bin/../lib"; +-use local::lib "$FindBin::Bin/../local-lib"; + } + + use List::Util qw(first sum); +diff --git a/t/bridges.t b/t/bridges.t +index 677115b8..3dc6b84a 100644 +--- a/t/bridges.t b/t/bridges.t +@@ -5,7 +5,6 @@ use warnings; + BEGIN { + use FindBin; + use lib "$FindBin::Bin/../lib"; +-use local::lib "$FindBin::Bin/../local-lib"; + } + + use List::Util qw(first sum); +diff --git a/t/clean_polylines.t b/t/clean_polylines.t +index 50c6f5bb..4526bd60 100644 +--- a/t/clean_polylines.t b/t/clean_polylines.t +@@ -7,7 +7,6 @@ plan tests => 6; + BEGIN { + use FindBin; + use lib "$FindBin::Bin/../lib"; +-use local::lib "$FindBin::Bin/../local-lib"; + } + + use Slic3r; +diff --git a/t/clipper.t b/t/clipper.t +index 3c983814..a898a53f 100644 +--- a/t/clipper.t b/t/clipper.t +@@ -7,7 +7,6 @@ plan tests => 6; +
[gentoo-commits] repo/gentoo:master commit in: media-gfx/slic3r/files/, media-gfx/slic3r/
commit: 583527c74d677920d06fdcbbd91931e090eed384 Author: Ian Stakenvicius gentoo org> AuthorDate: Wed Sep 27 15:46:18 2017 + Commit: Ian Stakenvicius gentoo org> CommitDate: Wed Sep 27 15:48:08 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=583527c7 media-gfx/slic3r: make v1.2.9 code c++11 compatible for gcc6+ Bug: http://bugs.gentoo.org/622338 Package-Manager: Portage-2.3.8, Repoman-2.3.1 media-gfx/slic3r/files/slic3r-1.2.9-c++11.patch | 38 + media-gfx/slic3r/slic3r-1.2.9-r2.ebuild | 3 +- 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/media-gfx/slic3r/files/slic3r-1.2.9-c++11.patch b/media-gfx/slic3r/files/slic3r-1.2.9-c++11.patch new file mode 100644 index 000..f6b15d70a1a --- /dev/null +++ b/media-gfx/slic3r/files/slic3r-1.2.9-c++11.patch @@ -0,0 +1,38 @@ +--- a/xs/src/libslic3r/Config.hpp 2015-06-17 04:38:28.0 -0400 b/xs/src/libslic3r/Config.hpp 2017-09-27 10:59:26.527103728 -0400 +@@ -65,7 +65,7 @@ + + bool deserialize(std::string str) { + std::istringstream iss(str); +-return iss >> this->value; ++return static_cast(iss >> this->value); + }; + }; + +@@ -124,7 +124,7 @@ + + bool deserialize(std::string str) { + std::istringstream iss(str); +-return iss >> this->value; ++return static_cast(iss >> this->value); + }; + }; + +@@ -249,7 +249,7 @@ + bool deserialize(std::string str) { + // don't try to parse the trailing % since it's optional + std::istringstream iss(str); +-return iss >> this->value; ++return static_cast(iss >> this->value); + }; + }; + +@@ -279,7 +279,7 @@ + bool deserialize(std::string str) { + this->percent = str.find_first_of("%") != std::string::npos; + std::istringstream iss(str); +-return iss >> this->value; ++return static_cast(iss >> this->value); + }; + }; + diff --git a/media-gfx/slic3r/slic3r-1.2.9-r2.ebuild b/media-gfx/slic3r/slic3r-1.2.9-r2.ebuild index 541c5bbd7b3..21f22728472 100644 --- a/media-gfx/slic3r/slic3r-1.2.9-r2.ebuild +++ b/media-gfx/slic3r/slic3r-1.2.9-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -64,6 +64,7 @@ S="${WORKDIR}/Slic3r-${PV}/xs" src_prepare() { pushd "${WORKDIR}/Slic3r-${PV}" || die eapply "${FILESDIR}/${P}-adjust_var_path.patch" + eapply "${FILESDIR}/${P}-c++11.patch" eapply_user popd || die }
[gentoo-commits] repo/gentoo:master commit in: media-gfx/slic3r/, media-gfx/slic3r/files/
commit: 6443f68173b24e1901d133757f5a369f821fc2eb Author: Amy Liffey gentoo org> AuthorDate: Sat May 6 14:42:37 2017 + Commit: Amy Liffey gentoo org> CommitDate: Sat May 6 15:11:03 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6443f681 media-gfx/slic3r: fix patching bug #617640 Submitted-by: Philipp PsurekPackage-Manager: portage-2.3.3 media-gfx/slic3r/files/slic3r--adjust_var_path.patch | 11 --- media-gfx/slic3r/slic3r-.ebuild | 4 ++-- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/media-gfx/slic3r/files/slic3r--adjust_var_path.patch b/media-gfx/slic3r/files/slic3r--adjust_var_path.patch deleted file mode 100644 index ff22b24e227..000 --- a/media-gfx/slic3r/files/slic3r--adjust_var_path.patch +++ /dev/null @@ -1,11 +0,0 @@ a/lib/Slic3r.pm2016-12-18 15:24:37.52000 +0100 -+++ b/lib/Slic3r.pm2016-12-18 15:25:23.43000 +0100 -@@ -42,7 +42,7 @@ - - use FindBin; - # Path to the images. --our $var = sub { decode_path($FindBin::Bin) . "/var/" . $_[0] }; -+our $var = sub { decode_path($FindBin::RealBin) . "/var/" . $_[0] }; - - use Moo 1.003001; - diff --git a/media-gfx/slic3r/slic3r-.ebuild b/media-gfx/slic3r/slic3r-.ebuild index 3d54436739e..4c89cffa525 100644 --- a/media-gfx/slic3r/slic3r-.ebuild +++ b/media-gfx/slic3r/slic3r-.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -71,7 +71,7 @@ src_unpack() { src_prepare() { pushd "${WORKDIR}/slic3r-${PV}" || die - eapply "${FILESDIR}/${P}-adjust_var_path.patch" + sed -i lib/Slic3r.pm -e "s@FindBin::Bin@FindBin::RealBin@g" || die eapply_user popd || die }
[gentoo-commits] repo/gentoo:master commit in: media-gfx/slic3r/files/
commit: 7c7de1b272fd57383359334b499b0a6352bb9b77 Author: Amy Winston gentoo org> AuthorDate: Sun Dec 18 14:32:18 2016 + Commit: Amy Winston gentoo org> CommitDate: Sun Dec 18 14:32:18 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c7de1b2 media-gfx/slic3r: fix patch lines bug #602976 Suggested-by: Philippe Trottier (tchiwam gmail.com) Package-Manager: portage-2.3.0 media-gfx/slic3r/files/slic3r--adjust_var_path.patch | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/media-gfx/slic3r/files/slic3r--adjust_var_path.patch b/media-gfx/slic3r/files/slic3r--adjust_var_path.patch index 4769cc6..ff22b24 100644 --- a/media-gfx/slic3r/files/slic3r--adjust_var_path.patch +++ b/media-gfx/slic3r/files/slic3r--adjust_var_path.patch @@ -1,9 +1,9 @@ a/lib/Slic3r.pm2016-07-22 11:52:51.423390877 -0400 -+++ b/lib/Slic3r.pm2016-07-22 12:00:57.272715174 -0400 -@@ -30,7 +30,7 @@ - if $^V == v5.16; +--- a/lib/Slic3r.pm2016-12-18 15:24:37.52000 +0100 b/lib/Slic3r.pm2016-12-18 15:25:23.43000 +0100 +@@ -42,7 +42,7 @@ use FindBin; + # Path to the images. -our $var = sub { decode_path($FindBin::Bin) . "/var/" . $_[0] }; +our $var = sub { decode_path($FindBin::RealBin) . "/var/" . $_[0] };
[gentoo-commits] repo/gentoo:master commit in: media-gfx/slic3r/files/
commit: a518be0477d307f35f0c21005062bede753e2b0a Author: Ian Stakenvicius gentoo org> AuthorDate: Mon Jul 25 14:38:35 2016 + Commit: Ian Stakenvicius gentoo org> CommitDate: Mon Jul 25 14:39:00 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a518be04 media-gfx/slic3r-: fix patch so it applies against git head Package-Manager: portage-2.2.28 media-gfx/slic3r/files/slic3r--adjust_var_path.patch | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/media-gfx/slic3r/files/slic3r--adjust_var_path.patch b/media-gfx/slic3r/files/slic3r--adjust_var_path.patch index 9dc93a5..4769cc6 100644 --- a/media-gfx/slic3r/files/slic3r--adjust_var_path.patch +++ b/media-gfx/slic3r/files/slic3r--adjust_var_path.patch @@ -1,11 +1,11 @@ a/lib/Slic3r.pm2015-06-17 04:38:28.0 -0400 -+++ b/lib/Slic3r.pm2015-06-19 11:56:07.005873299 -0400 +--- a/lib/Slic3r.pm2016-07-22 11:52:51.423390877 -0400 b/lib/Slic3r.pm2016-07-22 12:00:57.272715174 -0400 @@ -30,7 +30,7 @@ if $^V == v5.16; use FindBin; --our $var = decode_path($FindBin::Bin) . "/var"; -+our $var = decode_path($FindBin::RealBin) . "/var"; +-our $var = sub { decode_path($FindBin::Bin) . "/var/" . $_[0] }; ++our $var = sub { decode_path($FindBin::RealBin) . "/var/" . $_[0] }; use Moo 1.003001;
[gentoo-commits] repo/gentoo:master commit in: media-gfx/slic3r/
commit: 91fdee6efa5a28c056f36f83c24db2487ffa86c3 Author: Ian Stakenvicius gentoo org> AuthorDate: Tue May 3 15:42:11 2016 + Commit: Ian Stakenvicius gentoo org> CommitDate: Tue May 3 15:42:11 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91fdee6e media-gfx/slic3r: revbump to fix a couple of dependencies dev-perl/Encode-Locale had a typo in PV, fixed; also dropped the dependency of dev-lang/perl-5.22 since (A) it's not a real dependency and (B) it inhibits mixed-~arch installs if the user overlays perl-core/threads and perl-core/Socket to provide the necessary versions of those modules. Package-Manager: portage-2.2.26 .../slic3r/{slic3r-1.2.9-r1.ebuild => slic3r-1.2.9-r2.ebuild} | 7 ++- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/media-gfx/slic3r/slic3r-1.2.9-r1.ebuild b/media-gfx/slic3r/slic3r-1.2.9-r2.ebuild similarity index 93% rename from media-gfx/slic3r/slic3r-1.2.9-r1.ebuild rename to media-gfx/slic3r/slic3r-1.2.9-r2.ebuild index 244eb2e..f0ce2dd 100644 --- a/media-gfx/slic3r/slic3r-1.2.9-r1.ebuild +++ b/media-gfx/slic3r/slic3r-1.2.9-r2.ebuild @@ -15,13 +15,10 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="+gui test" -# Slic3r is a fragile application. -# In order to produce reasonably good results we require -# latest dependencies. -RDEPEND=">=dev-lang/perl-5.22 +RDEPEND="!=dev-lang/perl-5.16* >=dev-libs/boost-1.55[threads] dev-perl/Class-XSAccessor - >=dev-perl/Encode-Locale-0.50.0 + >=dev-perl/Encode-Locale-1.50.0 dev-perl/IO-stringy >=dev-perl/Math-PlanePath-53.0.0 >=dev-perl/Moo-1.3.1
[gentoo-commits] repo/gentoo:master commit in: media-gfx/slic3r/
commit: 24229344e21d5a386b18b140ef0843c394a68f1a Author: Marshall Brewer (Gentoo Key) sina cn> AuthorDate: Tue Apr 19 02:17:39 2016 + Commit: Ian Delaney gentoo org> CommitDate: Wed Apr 20 09:14:14 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24229344 media-gfx/slic3r: revbump, adjust dependencies depend on >=perl-5.22 to force users to latest deps Package-Manager: portage-2.2.28 RepoMan-Options: --ignore-arches Closes: https://github.com/gentoo/gentoo/pull/1300 Signed-off-by: Ian Delaney gentoo.org> media-gfx/slic3r/{slic3r-1.2.9.ebuild => slic3r-1.2.9-r1.ebuild} | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/media-gfx/slic3r/slic3r-1.2.9.ebuild b/media-gfx/slic3r/slic3r-1.2.9-r1.ebuild similarity index 94% rename from media-gfx/slic3r/slic3r-1.2.9.ebuild rename to media-gfx/slic3r/slic3r-1.2.9-r1.ebuild index 85be0f2..244eb2e 100644 --- a/media-gfx/slic3r/slic3r-1.2.9.ebuild +++ b/media-gfx/slic3r/slic3r-1.2.9-r1.ebuild @@ -15,8 +15,10 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="+gui test" -# check Build.PL for dependencies -RDEPEND="!=dev-lang/perl-5.16* +# Slic3r is a fragile application. +# In order to produce reasonably good results we require +# latest dependencies. +RDEPEND=">=dev-lang/perl-5.22 >=dev-libs/boost-1.55[threads] dev-perl/Class-XSAccessor >=dev-perl/Encode-Locale-0.50.0
[gentoo-commits] repo/gentoo:master commit in: media-gfx/slic3r/files/, media-gfx/slic3r/
commit: 0d28159a18a25c100b207b86056c604a75675bb2 Author: Matthew Brewer sina cn> AuthorDate: Fri Apr 1 18:38:26 2016 + Commit: Andreas Hüttel gentoo org> CommitDate: Sun Apr 3 21:23:43 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d28159a media-gfx/slic3r: Add git version Package-Manager: portage-2.2.28 RepoMan-Options: --ignore-arches .../slic3r/files/slic3r--adjust_var_path.patch | 11 ++ media-gfx/slic3r/slic3r-.ebuild| 111 + 2 files changed, 122 insertions(+) diff --git a/media-gfx/slic3r/files/slic3r--adjust_var_path.patch b/media-gfx/slic3r/files/slic3r--adjust_var_path.patch new file mode 100644 index 000..9dc93a5 --- /dev/null +++ b/media-gfx/slic3r/files/slic3r--adjust_var_path.patch @@ -0,0 +1,11 @@ +--- a/lib/Slic3r.pm2015-06-17 04:38:28.0 -0400 b/lib/Slic3r.pm2015-06-19 11:56:07.005873299 -0400 +@@ -30,7 +30,7 @@ + if $^V == v5.16; + + use FindBin; +-our $var = decode_path($FindBin::Bin) . "/var"; ++our $var = decode_path($FindBin::RealBin) . "/var"; + + use Moo 1.003001; + diff --git a/media-gfx/slic3r/slic3r-.ebuild b/media-gfx/slic3r/slic3r-.ebuild new file mode 100644 index 000..98aa4f9 --- /dev/null +++ b/media-gfx/slic3r/slic3r-.ebuild @@ -0,0 +1,111 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit eutils git-r3 perl-module + +DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)" +HOMEPAGE="http://slic3r.org; +SRC_URI="" +EGIT_REPO_URI="https://github.com/alexrj/Slic3r.git; + +LICENSE="AGPL-3 CC-BY-3.0" +SLOT="0" +KEYWORDS="" +IUSE="+gui test" + +# check Build.PL for dependencies +RDEPEND="!=dev-lang/perl-5.16* + >=dev-libs/boost-1.55[threads] + dev-perl/Class-XSAccessor + dev-perl/Devel-Size + >=dev-perl/Encode-Locale-1.50.0 + dev-perl/IO-stringy + >=dev-perl/Math-PlanePath-53.0.0 + >=dev-perl/Moo-1.3.1 + dev-perl/XML-SAX-ExpatXS + virtual/perl-Carp + virtual/perl-Encode + virtual/perl-File-Spec + virtual/perl-Getopt-Long + virtual/perl-parent + virtual/perl-Scalar-List-Utils + virtual/perl-Test-Simple + virtual/perl-Thread-Semaphore + >=virtual/perl-threads-1.960.0 + virtual/perl-Time-HiRes + virtual/perl-Unicode-Normalize + virtual/perl-XSLoader + gui? ( dev-perl/Class-Accessor + dev-perl/Growl-GNTP + dev-perl/libwww-perl + dev-perl/Module-Pluggable + dev-perl/Net-Bonjour + dev-perl/Net-DBus + dev-perl/OpenGL + >=dev-perl/Wx-0.991.800 + dev-perl/Wx-GLCanvas + >=media-libs/freeglut-3 + virtual/perl-Math-Complex + >=virtual/perl-Socket-2.16.0 + x11-libs/libXmu + )" +DEPEND="${RDEPEND} + dev-perl/Devel-CheckLib + >=dev-perl/ExtUtils-CppGuess-0.70.0 + >=dev-perl/ExtUtils-Typemaps-Default-1.50.0 + >=dev-perl/ExtUtils-XSpp-0.170.0 + >=dev-perl/Module-Build-0.380.0 + >=dev-perl/Module-Build-WithXSpp-0.140.0 + >=virtual/perl-ExtUtils-MakeMaker-6.800.0 + >=virtual/perl-ExtUtils-ParseXS-3.220.0 + test? ( virtual/perl-Test-Harness + virtual/perl-Test-Simple )" + +S="${WORKDIR}/slic3r-${PV}/xs" + +src_unpack() { + git-r3_src_unpack +} + +src_prepare() { + pushd "${WORKDIR}/slic3r-${PV}" || die + eapply "${FILESDIR}/${P}-adjust_var_path.patch" + eapply_user + popd || die +} + +src_configure() { + SLIC3R_NO_AUTO=1 perl-module_src_configure +} + +src_test() { + perl-module_src_test + pushd .. || die + prove -Ixs/blib/arch -Ixs/blib/lib/ t/ || die "Tests failed" + popd || die +} + +src_install() { + perl-module_src_install + + pushd .. || die + insinto "${VENDOR_LIB}" + doins -r lib/Slic3r.pm lib/Slic3r + + insinto "${VENDOR_LIB}"/Slic3r + doins -r var + + exeinto "${VENDOR_LIB}"/Slic3r + doexe slic3r.pl + + dosym "${VENDOR_LIB}"/Slic3r/slic3r.pl /usr/bin/slic3r.pl + + make_desktop_entry slic3r.pl \ + Slic3r \ + "${VENDOR_LIB}/Slic3r/var/Slic3r_128px.png" \ + "Graphics;3DGraphics;Engineering;Development" + popd || die +}
[gentoo-commits] repo/gentoo:master commit in: media-gfx/slic3r/, media-gfx/slic3r/files/
commit: 0ce6a1fe206c370b256d55b217a2c64783ecf9e5 Author: Matthew Brewer sina cn> AuthorDate: Fri Apr 1 18:38:26 2016 + Commit: Andreas Hüttel gentoo org> CommitDate: Sun Apr 3 21:23:43 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ce6a1fe media-gfx/slic3r: Add version 1.2.9 Package-Manager: portage-2.2.28 RepoMan-Options: --ignore-arches media-gfx/slic3r/Manifest | 1 + .../files/slic3r-1.2.9-adjust_var_path.patch | 11 +++ media-gfx/slic3r/slic3r-1.2.9.ebuild | 104 + 3 files changed, 116 insertions(+) diff --git a/media-gfx/slic3r/Manifest b/media-gfx/slic3r/Manifest index 4253099..e08cfb4 100644 --- a/media-gfx/slic3r/Manifest +++ b/media-gfx/slic3r/Manifest @@ -1 +1,2 @@ DIST slic3r-1.1.7.tar.gz 2079200 SHA256 8e1f68a71d78686cf6957ee7665757a4e7d14646bdee262cef76cba47b3f0d50 SHA512 0c3a12890f57f422084b20152ede3467a8624db4ba8be774258df0af963c1f6f41fda7d96967f6355bd95727539e6aad51c30cf45284a7ee3fff294839acc650 WHIRLPOOL 18c95a59acff51891251852d59d4bf33b9c1ad8721f581e3c9f55b56bb62e087d030ecb701d16b07cca4567f142ea3b0693c0ab436f1c25b28d02b4a1ce351cd +DIST slic3r-1.2.9.tar.gz 2165322 SHA256 f1c231ae56039ccd4ecf624e288c1362cab49b0f751a4663857b916b7fa51f2f SHA512 c0284f40de43c54e775baccdb2a67813a6ca4b69db78a788f2023b3f34127e780e6d0160144b9df1e17a2992b3255ef9a372b61a594f503b21efad7334387a51 WHIRLPOOL fc3bee0188ab7bd54ac19f3d874acb20dd8614594b79a8539001fd9a682f10c3436ef477d60458c49c7028c8b4bb7bf8585b4b53e73ac3a411d1a18720820eb0 diff --git a/media-gfx/slic3r/files/slic3r-1.2.9-adjust_var_path.patch b/media-gfx/slic3r/files/slic3r-1.2.9-adjust_var_path.patch new file mode 100644 index 000..9dc93a5 --- /dev/null +++ b/media-gfx/slic3r/files/slic3r-1.2.9-adjust_var_path.patch @@ -0,0 +1,11 @@ +--- a/lib/Slic3r.pm2015-06-17 04:38:28.0 -0400 b/lib/Slic3r.pm2015-06-19 11:56:07.005873299 -0400 +@@ -30,7 +30,7 @@ + if $^V == v5.16; + + use FindBin; +-our $var = decode_path($FindBin::Bin) . "/var"; ++our $var = decode_path($FindBin::RealBin) . "/var"; + + use Moo 1.003001; + diff --git a/media-gfx/slic3r/slic3r-1.2.9.ebuild b/media-gfx/slic3r/slic3r-1.2.9.ebuild new file mode 100644 index 000..85be0f2 --- /dev/null +++ b/media-gfx/slic3r/slic3r-1.2.9.ebuild @@ -0,0 +1,104 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit eutils perl-module + +DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)" +HOMEPAGE="http://slic3r.org; +SRC_URI="https://github.com/alexrj/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="AGPL-3 CC-BY-3.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+gui test" + +# check Build.PL for dependencies +RDEPEND="!=dev-lang/perl-5.16* + >=dev-libs/boost-1.55[threads] + dev-perl/Class-XSAccessor + >=dev-perl/Encode-Locale-0.50.0 + dev-perl/IO-stringy + >=dev-perl/Math-PlanePath-53.0.0 + >=dev-perl/Moo-1.3.1 + dev-perl/XML-SAX-ExpatXS + virtual/perl-Carp + virtual/perl-Encode + virtual/perl-File-Spec + virtual/perl-Getopt-Long + virtual/perl-parent + virtual/perl-Scalar-List-Utils + virtual/perl-Test-Simple + virtual/perl-Thread-Semaphore + >=virtual/perl-threads-1.960.0 + virtual/perl-Time-HiRes + virtual/perl-Unicode-Normalize + virtual/perl-XSLoader + gui? ( dev-perl/Class-Accessor + dev-perl/Growl-GNTP + dev-perl/libwww-perl + dev-perl/Module-Pluggable + dev-perl/Net-Bonjour + dev-perl/Net-DBus + dev-perl/OpenGL + >=dev-perl/Wx-0.991.800 + dev-perl/Wx-GLCanvas + >=media-libs/freeglut-3 + virtual/perl-Math-Complex + >=virtual/perl-Socket-2.16.0 + x11-libs/libXmu + )" +DEPEND="${RDEPEND} + >=dev-perl/ExtUtils-CppGuess-0.70.0 + >=dev-perl/ExtUtils-Typemaps-Default-1.50.0 + >=dev-perl/ExtUtils-XSpp-0.170.0 + >=dev-perl/Module-Build-0.380.0 + >=dev-perl/Module-Build-WithXSpp-0.140.0 + >=virtual/perl-ExtUtils-MakeMaker-6.800.0 + >=virtual/perl-ExtUtils-ParseXS-3.220.0 + test? ( virtual/perl-Test-Harness + virtual/perl-Test-Simple )" + +S="${WORKDIR}/Slic3r-${PV}/xs" + +src_prepare() { + pushd "${WORKDIR}/Slic3r-${PV}" || die + eapply "${FILESDIR}/${P}-adjust_var_path.patch" + eapply_user + popd || die +} + +src_configure() { + SLIC3R_NO_AUTO=1 perl-module_src_configure +} + +src_test() { + perl-module_src_test + pushd .. || die + prove -Ixs/blib/arch -Ixs/blib/lib/ t/ || die "Tests failed" + popd || die +} + +src_install() { + perl-module_src_install + + pushd .. || die + insinto
[gentoo-commits] repo/gentoo:master commit in: media-gfx/slic3r/, media-gfx/slic3r/files/, profiles/
commit: 345fdc3f776082a6fe4d5df6488ebd46427f20d9 Author: Matthew Brewer sina cn> AuthorDate: Fri Apr 1 18:39:36 2016 + Commit: Andreas Hüttel gentoo org> CommitDate: Sun Apr 3 21:23:43 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=345fdc3f media-gfx/slic3r: Initial addition to tree at 1.1.7 (package masked) Package-Manager: portage-2.2.28 RepoMan-Options: --ignore-arches media-gfx/slic3r/Manifest | 1 + .../files/slic3r-1.1.7-adjust_var_path.patch | 11 ++ media-gfx/slic3r/metadata.xml | 29 ++ media-gfx/slic3r/slic3r-1.1.7.ebuild | 115 + profiles/package.mask | 6 ++ 5 files changed, 162 insertions(+) diff --git a/media-gfx/slic3r/Manifest b/media-gfx/slic3r/Manifest new file mode 100644 index 000..4253099 --- /dev/null +++ b/media-gfx/slic3r/Manifest @@ -0,0 +1 @@ +DIST slic3r-1.1.7.tar.gz 2079200 SHA256 8e1f68a71d78686cf6957ee7665757a4e7d14646bdee262cef76cba47b3f0d50 SHA512 0c3a12890f57f422084b20152ede3467a8624db4ba8be774258df0af963c1f6f41fda7d96967f6355bd95727539e6aad51c30cf45284a7ee3fff294839acc650 WHIRLPOOL 18c95a59acff51891251852d59d4bf33b9c1ad8721f581e3c9f55b56bb62e087d030ecb701d16b07cca4567f142ea3b0693c0ab436f1c25b28d02b4a1ce351cd diff --git a/media-gfx/slic3r/files/slic3r-1.1.7-adjust_var_path.patch b/media-gfx/slic3r/files/slic3r-1.1.7-adjust_var_path.patch new file mode 100644 index 000..ee4d75d --- /dev/null +++ b/media-gfx/slic3r/files/slic3r-1.1.7-adjust_var_path.patch @@ -0,0 +1,11 @@ +--- a/lib/Slic3r.pm2016-03-31 13:27:59.431548980 +0200 b/lib/Slic3r.pm2016-03-31 13:28:21.658675137 +0200 +@@ -29,7 +29,7 @@ + if $^V >= v5.16; + + use FindBin; +-our $var = "$FindBin::Bin/var"; ++our $var = "$FindBin::RealBin/var"; + + use Encode; + use Encode::Locale; diff --git a/media-gfx/slic3r/metadata.xml b/media-gfx/slic3r/metadata.xml new file mode 100644 index 000..c0f39d3 --- /dev/null +++ b/media-gfx/slic3r/metadata.xml @@ -0,0 +1,29 @@ + +http://www.gentoo.org/dtd/metadata.dtd;> + + +tombo...@sina.cn +Proxy-Maintainer; please assign him to bugs. + + +proxy-ma...@gentoo.org +Gentoo Proxy Maintainers Project + + +3dpr...@gentoo.org +Gentoo 3D Printer Project + + +p...@gentoo.org +Gentoo Perl Project + + +Enable GUI + + +Slic3r is the tool you need to convert a 3D model into printing instructions for your 3D printer. It cuts the model into horizontal slices (layers), generates toolpaths to fill them and calculates the amount of material to be extruded. + + +alexrj/Slic3r + + diff --git a/media-gfx/slic3r/slic3r-1.1.7.ebuild b/media-gfx/slic3r/slic3r-1.1.7.ebuild new file mode 100644 index 000..81c710b --- /dev/null +++ b/media-gfx/slic3r/slic3r-1.1.7.ebuild @@ -0,0 +1,115 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit eutils perl-module + +DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)" +HOMEPAGE="http://slic3r.org; +SRC_URI="https://github.com/alexrj/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="AGPL-3 CC-BY-3.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+gui test" + +# check Build.PL for dependencies +RDEPEND="!=dev-lang/perl-5.16* + >=dev-libs/boost-1.55[threads] + dev-perl/Class-XSAccessor + dev-perl/Encode-Locale + dev-perl/IO-stringy + >=dev-perl/Math-PlanePath-53.0.0 + >=dev-perl/Moo-1.3.1 + dev-perl/XML-SAX-ExpatXS + virtual/perl-Carp + virtual/perl-File-Spec + virtual/perl-Getopt-Long + virtual/perl-parent + virtual/perl-Scalar-List-Utils + virtual/perl-Test-Simple + virtual/perl-Thread-Semaphore + >=virtual/perl-threads-1.960.0 + virtual/perl-Time-HiRes + virtual/perl-XSLoader + gui? ( dev-perl/Class-Accessor + dev-perl/Growl-GNTP + dev-perl/libwww-perl + dev-perl/Module-Pluggable + dev-perl/Net-Bonjour + dev-perl/Net-DBus + dev-perl/OpenGL + >=dev-perl/Wx-0.991.800 + dev-perl/Wx-GLCanvas + >=media-libs/freeglut-3 + virtual/perl-Math-Complex + >=virtual/perl-Socket-2.16.0 + x11-libs/libXmu + )" +DEPEND="${RDEPEND} + >=dev-perl/ExtUtils-CppGuess-0.70.0 + >=dev-perl/ExtUtils-Typemaps-Default-1.50.0 + >=dev-perl/ExtUtils-XSpp-0.170.0 + >=dev-perl/Module-Build-0.380.0 + >=dev-perl/Module-Build-WithXSpp-0.140.0 + >=virtual/perl-ExtUtils-MakeMaker-6.800.0 + >=virtual/perl-ExtUtils-ParseXS-3.220.0 + test? ( virtual/perl-Test-Harness +