| 1 |
commit: 1add15c165f0a79729e3f90797284b619ead8989 |
| 2 |
Author: Dennis Lamm <expeditioneer <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Oct 11 14:19:36 2020 +0000 |
| 4 |
Commit: Dennis Lamm <expeditioneer <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Oct 11 15:16:55 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1add15c1 |
| 7 |
|
| 8 |
media-gfx/slic3r: fixed .desktop file |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/712898 |
| 11 |
|
| 12 |
Signed-off-by: Dennis Lamm <expeditoneer <AT> gentoo.org> |
| 13 |
Closes: https://github.com/gentoo/gentoo/pull/17888 |
| 14 |
Signed-off-by: Dennis Lamm <expeditioneer <AT> gentoo.org> |
| 15 |
|
| 16 |
.../{slic3r-9999.ebuild => slic3r-1.3.0-r2.ebuild} | 24 +++++++++++++--------- |
| 17 |
media-gfx/slic3r/slic3r-9999.ebuild | 2 +- |
| 18 |
2 files changed, 15 insertions(+), 11 deletions(-) |
| 19 |
|
| 20 |
diff --git a/media-gfx/slic3r/slic3r-9999.ebuild b/media-gfx/slic3r/slic3r-1.3.0-r2.ebuild |
| 21 |
similarity index 82% |
| 22 |
copy from media-gfx/slic3r/slic3r-9999.ebuild |
| 23 |
copy to media-gfx/slic3r/slic3r-1.3.0-r2.ebuild |
| 24 |
index 61ef1b641af..60c8950aab4 100644 |
| 25 |
--- a/media-gfx/slic3r/slic3r-9999.ebuild |
| 26 |
+++ b/media-gfx/slic3r/slic3r-1.3.0-r2.ebuild |
| 27 |
@@ -3,16 +3,15 @@ |
| 28 |
|
| 29 |
EAPI=6 |
| 30 |
|
| 31 |
-inherit eutils git-r3 perl-module |
| 32 |
+inherit eutils flag-o-matic perl-module |
| 33 |
|
| 34 |
DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)" |
| 35 |
HOMEPAGE="https://slic3r.org" |
| 36 |
-SRC_URI="" |
| 37 |
-EGIT_REPO_URI="https://github.com/Slic3r/Slic3r.git" |
| 38 |
+SRC_URI="https://github.com/alexrj/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" |
| 39 |
|
| 40 |
LICENSE="AGPL-3 CC-BY-3.0" |
| 41 |
SLOT="0" |
| 42 |
-KEYWORDS="" |
| 43 |
+KEYWORDS="~amd64 ~x86" |
| 44 |
IUSE="+gui test" |
| 45 |
RESTRICT="!test? ( test )" |
| 46 |
|
| 47 |
@@ -65,19 +64,24 @@ DEPEND="${RDEPEND} |
| 48 |
test? ( virtual/perl-Test-Harness |
| 49 |
virtual/perl-Test-Simple )" |
| 50 |
|
| 51 |
-S="${WORKDIR}/slic3r-${PV}/xs" |
| 52 |
+S="${WORKDIR}/Slic3r-${PV}/xs" |
| 53 |
|
| 54 |
-src_unpack() { |
| 55 |
- git-r3_src_unpack |
| 56 |
+pkg_pretend() { |
| 57 |
+ einfo "Checking for -std=c++11 support in compiler" |
| 58 |
+ test-flags-CXX -std=c++11 > /dev/null || die |
| 59 |
} |
| 60 |
|
| 61 |
src_prepare() { |
| 62 |
- pushd "${WORKDIR}/slic3r-${PV}" || die |
| 63 |
+ pushd "${WORKDIR}/Slic3r-${PV}" || die |
| 64 |
sed -i lib/Slic3r.pm -e "s@FindBin::Bin@FindBin::RealBin@g" || die |
| 65 |
eapply "${FILESDIR}"/${P}-no-locallib.patch |
| 66 |
- eapply "${FILESDIR}"/${P}-boost-173.patch |
| 67 |
+ eapply "${FILESDIR}"/${P}-boost.patch |
| 68 |
eapply_user |
| 69 |
popd || die |
| 70 |
+ # drop std=c++11 to compiler defaults... |
| 71 |
+ sed \ |
| 72 |
+ -e '/c++11/d' \ |
| 73 |
+ -i Build.PL || die |
| 74 |
} |
| 75 |
|
| 76 |
src_configure() { |
| 77 |
@@ -106,7 +110,7 @@ src_install() { |
| 78 |
|
| 79 |
dosym "${VENDOR_LIB}"/Slic3r/slic3r.pl /usr/bin/slic3r.pl |
| 80 |
|
| 81 |
- make_desktop_entry slic3r.pl \ |
| 82 |
+ make_desktop_entry "slic3r.pl --gui %F" \ |
| 83 |
Slic3r \ |
| 84 |
"${VENDOR_LIB}/Slic3r/var/Slic3r_128px.png" \ |
| 85 |
"Graphics;3DGraphics;Engineering;Development" |
| 86 |
|
| 87 |
diff --git a/media-gfx/slic3r/slic3r-9999.ebuild b/media-gfx/slic3r/slic3r-9999.ebuild |
| 88 |
index 61ef1b641af..404994de740 100644 |
| 89 |
--- a/media-gfx/slic3r/slic3r-9999.ebuild |
| 90 |
+++ b/media-gfx/slic3r/slic3r-9999.ebuild |
| 91 |
@@ -106,7 +106,7 @@ src_install() { |
| 92 |
|
| 93 |
dosym "${VENDOR_LIB}"/Slic3r/slic3r.pl /usr/bin/slic3r.pl |
| 94 |
|
| 95 |
- make_desktop_entry slic3r.pl \ |
| 96 |
+ make_desktop_entry "slic3r.pl --gui %F" \ |
| 97 |
Slic3r \ |
| 98 |
"${VENDOR_LIB}/Slic3r/var/Slic3r_128px.png" \ |
| 99 |
"Graphics;3DGraphics;Engineering;Development" |
Archives