diff --git a/.SRCINFO b/.SRCINFO index d386391..2c92fe2 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,11 +1,10 @@ pkgbase = superslicer pkgdesc = G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.) - pkgver = 2.2.51.2 + pkgver = 2.2.53.3 pkgrel = 1 url = https://github.com/supermerill/SuperSlicer arch = x86_64 license = AGPL3 - makedepends = boost makedepends = cereal makedepends = cmake makedepends = eigen @@ -17,15 +16,20 @@ pkgbase = superslicer depends = nlopt depends = openvdb depends = qhull - depends = wxgtk3 + depends = wxgtk3-dev + depends = boost-libs-171-opt conflicts = slic3r++ replaces = slic3r++ - source = https://github.com/supermerill//SuperSlicer/archive/2.2.51.2.tar.gz + source = https://github.com/supermerill//SuperSlicer/archive/2.2.53.3.tar.gz source = superslicer.desktop + source = start-superslicer.sh source = 0001-wxgtk3-is-broken-on-wayland.patch - sha512sums = fbcfa98bee8f3284c36eb33eb715ab03979c26778656d16b56485ba553f5c5702e1fb59b2b43ce0e1e0ddea1d15f278b007c7a064824df16b95d8a2f9647e928 + source = qhull-broken.patch + sha512sums = a025db731f7f9dff4d6754b8ac9d76067ab6a48323df6bfc00f748a4ca34cd34d69f9d7337dd0ef7f09854f862b5fa45355924b75c8b7f3708b6642a2ad409ae sha512sums = 18b39d66b12453686ac0b411bac4a7c3000c541aeb0de2cacf37552a0e2435858c9ce2d3da10fa05ab6ab0e5e714f78f6a011f894435ab7195ae5f3ed8bc5623 + sha512sums = c1960eab53ffdd62dac6e33e936dd577fa9c93e100dd3bffdf69bbf71ec995d98ffcc46118bf0830f7017a0fafe5fb611a11861a607737a9bd34337f2bc13423 sha512sums = acf35ebe467e9fb30f1b77d15348f1a7b82dcf45a5b829e375e972b5d6b49968603b3fa090c4d1f56e8b5148e2b820e79afa269da60ace70de1ceadcf6e820c5 + sha512sums = db1857418c2fe380a5e82c3c2b67d945ceb81f40df810c9b6b64730fdbcdf0e5b45e5f6ee8d77f40547b8f078b07aa92f2011e2aaa864a69c4b13d60c2a7b912 pkgname = superslicer diff --git a/PKGBUILD b/PKGBUILD index 47afebc..ad3ed5c 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,23 +1,25 @@ # Maintainer: Lukas1818 aur at lukas1818 dot de pkgname=superslicer -pkgver=2.2.51.2 +pkgver=2.2.53.3 _pkgtag=$pkgver pkgrel=1 pkgdesc="G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)" arch=('x86_64') url="https://github.com/supermerill/SuperSlicer" license=('AGPL3') -depends=('cgal' 'glew' 'nlopt' 'openvdb' 'qhull' 'wxgtk3') +depends=('cgal' 'glew' 'nlopt' 'openvdb' 'qhull' 'wxgtk3-dev' 'boost-libs-171-opt') conflicts=('slic3r++') replaces=('slic3r++') -makedepends=('boost' 'cereal' 'cmake' 'eigen' 'libigl' 'openvdb' 'wxgtk2') # cmake doesn't detect wx if not both gtk2 and gtk3 are installed +makedepends=('cereal' 'cmake' 'eigen' 'libigl' 'openvdb' 'wxgtk2') # cmake doesn't detect wx if not both gtk2 and gtk3 are installed source=("https://github.com/supermerill//SuperSlicer/archive/$_pkgtag.tar.gz" "superslicer.desktop" + "start-superslicer.sh" "0001-wxgtk3-is-broken-on-wayland.patch" "qhull-broken.patch") -sha512sums=('fbcfa98bee8f3284c36eb33eb715ab03979c26778656d16b56485ba553f5c5702e1fb59b2b43ce0e1e0ddea1d15f278b007c7a064824df16b95d8a2f9647e928' +sha512sums=('a025db731f7f9dff4d6754b8ac9d76067ab6a48323df6bfc00f748a4ca34cd34d69f9d7337dd0ef7f09854f862b5fa45355924b75c8b7f3708b6642a2ad409ae' '18b39d66b12453686ac0b411bac4a7c3000c541aeb0de2cacf37552a0e2435858c9ce2d3da10fa05ab6ab0e5e714f78f6a011f894435ab7195ae5f3ed8bc5623' + 'c1960eab53ffdd62dac6e33e936dd577fa9c93e100dd3bffdf69bbf71ec995d98ffcc46118bf0830f7017a0fafe5fb611a11861a607737a9bd34337f2bc13423' 'acf35ebe467e9fb30f1b77d15348f1a7b82dcf45a5b829e375e972b5d6b49968603b3fa090c4d1f56e8b5148e2b820e79afa269da60ace70de1ceadcf6e820c5' 'db1857418c2fe380a5e82c3c2b67d945ceb81f40df810c9b6b64730fdbcdf0e5b45e5f6ee8d77f40547b8f078b07aa92f2011e2aaa864a69c4b13d60c2a7b912') @@ -47,7 +49,13 @@ build() -DSLIC3R_STATIC=OFF \ -DSLIC3R_WX_STABLE=ON \ -DSLIC3R_GTK=3 \ - -DSLIC3R_BUILD_TESTS=OFF + -DSLIC3R_BUILD_TESTS=OFF \ + -DBoost_NO_BOOST_CMAKE=TRUE \ + -DBoost_NO_SYSTEM_PATHS=TRUE \ + -DBOOST_ROOT:PATHNAME=/opt/usr \ + -DBoost_LIBRARY_DIRS:FILEPATH=/opt/usr/lib \ + -DBoost_INCLUDE_DIR:FILEPATH=/opt/usr/include + make } @@ -56,8 +64,11 @@ package() cd "$srcdir/SuperSlicer-$_pkgtag/build" make DESTDIR="$pkgdir" install - test ! -h "$pkgdir/usr/share/slic3r++/resources" || rm "$pkgdir/usr/share/slic3r++/resources" + test ! -h "$pkgdir/usr/share/SuperSlicer/resources" || rm "$pkgdir/usr/share/SuperSlicer/resources" install -d "$pkgdir/usr/share/applications" install -m 644 "$srcdir/superslicer.desktop" "$pkgdir/usr/share/applications/" + + mv "$pkgdir/usr/bin/superslicer" "$pkgdir/usr/share/SuperSlicer" + install -Dm 755 "${srcdir}/start-superslicer.sh" "${pkgdir}/usr/bin/superslicer" } diff --git a/start-superslicer.sh b/start-superslicer.sh new file mode 100644 index 0000000..3a2da44 --- /dev/null +++ b/start-superslicer.sh @@ -0,0 +1,2 @@ +#!/bin/bash +LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/opt/usr/lib" /usr/share/SuperSlicer/superslicer $@