some small fixes

This commit is contained in:
Dominic 2020-04-04 17:21:34 +02:00
parent 98bfd21922
commit afc63c7efe
Signed by: msrd0
GPG key ID: DCC8C247452E98F9
2 changed files with 5 additions and 4 deletions

View file

@ -1,7 +1,7 @@
pkgbase = slic3r++ pkgbase = slic3r++
pkgdesc = G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.) pkgdesc = G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)
pkgver = 2.2.47.1 pkgver = 2.2.47.1
pkgrel = 1 pkgrel = 2
url = https://github.com/supermerill/Slic3r url = https://github.com/supermerill/Slic3r
arch = x86_64 arch = x86_64
license = AGPL3 license = AGPL3
@ -14,6 +14,7 @@ pkgbase = slic3r++
makedepends = wxgtk2 makedepends = wxgtk2
depends = boost-libs depends = boost-libs
depends = glew depends = glew
depends = intel-tbb
depends = nlopt depends = nlopt
depends = qhull depends = qhull
depends = wxgtk3 depends = wxgtk3

View file

@ -2,12 +2,12 @@
pkgname=slic3r++ pkgname=slic3r++
pkgver=2.2.47.1 pkgver=2.2.47.1
pkgrel=1 pkgrel=2
pkgdesc="G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)" pkgdesc="G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)"
arch=('x86_64') arch=('x86_64')
url="https://github.com/supermerill/Slic3r" url="https://github.com/supermerill/Slic3r"
license=('AGPL3') license=('AGPL3')
depends=('boost-libs' 'glew' 'nlopt' 'qhull' 'wxgtk3') depends=('boost-libs' 'glew' 'intel-tbb' 'nlopt' 'qhull' 'wxgtk3')
makedepends=('boost' 'cereal' 'cmake' 'eigen' 'libigl' 'openvdb' 'wxgtk2') # cmake doesn't detect wx if not both gtk2 and gtk3 are installed makedepends=('boost' 'cereal' 'cmake' 'eigen' 'libigl' 'openvdb' 'wxgtk2') # cmake doesn't detect wx if not both gtk2 and gtk3 are installed
source=("https://github.com/supermerill/Slic3r/archive/$pkgver.tar.gz" source=("https://github.com/supermerill/Slic3r/archive/$pkgver.tar.gz"
"slic3r++.desktop" "slic3r++.desktop"
@ -53,7 +53,7 @@ package()
cd "$srcdir/Slic3r-$pkgver/build" cd "$srcdir/Slic3r-$pkgver/build"
make DESTDIR="$pkgdir" install make DESTDIR="$pkgdir" install
rm "$pkgdir/usr/share/slic3r++/resources" test ! -h "$pkgdir/usr/share/slic3r++/resources" || rm "$pkgdir/usr/share/slic3r++/resources"
install -d "$pkgdir/usr/share/applications" install -d "$pkgdir/usr/share/applications"
install -m 644 "$srcdir/slic3r++.desktop" "$pkgdir/usr/share/applications/" install -m 644 "$srcdir/slic3r++.desktop" "$pkgdir/usr/share/applications/"