commit: 1add15c165f0a79729e3f90797284b619ead8989 Author: Dennis Lamm <expeditioneer <AT> gentoo <DOT> org> AuthorDate: Sun Oct 11 14:19:36 2020 +0000 Commit: Dennis Lamm <expeditioneer <AT> gentoo <DOT> org> CommitDate: Sun Oct 11 15:16:55 2020 +0000 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 <expeditoneer <AT> gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/17888 Signed-off-by: Dennis Lamm <expeditioneer <AT> gentoo.org> .../{slic3r-9999.ebuild => slic3r-1.3.0-r2.ebuild} | 24 +++++++++++++--------- media-gfx/slic3r/slic3r-9999.ebuild | 2 +- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/media-gfx/slic3r/slic3r-9999.ebuild b/media-gfx/slic3r/slic3r-1.3.0-r2.ebuild similarity index 82% copy from media-gfx/slic3r/slic3r-9999.ebuild copy to media-gfx/slic3r/slic3r-1.3.0-r2.ebuild index 61ef1b641af..60c8950aab4 100644 --- a/media-gfx/slic3r/slic3r-9999.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-9999.ebuild b/media-gfx/slic3r/slic3r-9999.ebuild index 61ef1b641af..404994de740 100644 --- a/media-gfx/slic3r/slic3r-9999.ebuild +++ b/media-gfx/slic3r/slic3r-9999.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"
