update to 2.3.57.1; switch to wxgtk-dev-314 package; remove start script

This commit is contained in:
Lukas1818 2021-10-08 18:41:40 +02:00
parent 6daf86e2b3
commit 630f38236b
3 changed files with 16 additions and 38 deletions

View file

@ -1,6 +1,6 @@
pkgbase = superslicer-prerelease pkgbase = superslicer-prerelease
pkgdesc = G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.) pkgdesc = G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)
pkgver = 2.3.57.0 pkgver = 2.3.57.1
pkgrel = 1 pkgrel = 1
epoch = 1 epoch = 1
url = https://github.com/supermerill/SuperSlicer url = https://github.com/supermerill/SuperSlicer
@ -13,25 +13,23 @@ pkgbase = superslicer-prerelease
makedepends = libigl makedepends = libigl
makedepends = openvdb makedepends = openvdb
makedepends = boost>=1.73.0 makedepends = boost>=1.73.0
makedepends = wxgtk2-dev-opt makedepends = wxgtk2-dev-314-opt
depends = cgal depends = cgal
depends = glew depends = glew
depends = nlopt depends = nlopt
depends = openvdb depends = openvdb
depends = wxgtk3-dev-opt depends = wxgtk3-dev-314-opt
depends = boost-libs>=1.73.0 depends = boost-libs>=1.73.0
depends = qhull>=2020.2-4 depends = qhull>=2020.2-4
optdepends = superslicer-profiles: Predefined printer profiles optdepends = superslicer-profiles: Predefined printer profiles
provides = superslicer=1:2.3.57.0 provides = superslicer=1:2.3.57.1
conflicts = superslicer conflicts = superslicer
conflicts = superslicer-git conflicts = superslicer-git
replaces = slic3r++ replaces = slic3r++
source = https://github.com/supermerill//SuperSlicer/archive/2.3.57.0.tar.gz source = https://github.com/supermerill//SuperSlicer/archive/2.3.57.1.tar.gz
source = start-superslicer.sh
source = 0001-wxgtk3-is-broken-on-wayland.patch source = 0001-wxgtk3-is-broken-on-wayland.patch
source = https://raw.githubusercontent.com/archlinux/svntogit-community/1dea61c0b581ff5001d073689f68b0323740be93/trunk/prusa-slicer-openexr3.patch source = https://raw.githubusercontent.com/archlinux/svntogit-community/1dea61c0b581ff5001d073689f68b0323740be93/trunk/prusa-slicer-openexr3.patch
sha512sums = f0b7284197526abacd45b8c5a026a20d6833b9f30a6c4b84c0f2db2332c2115c0ef261f6a03133c42c327346847e0a1d5fd546183478295258b71402d543ca14 sha512sums = 85f27864ec5c3c1b473ae4c9405b419b565246c9e4c0967f0adfbbe6c6baeb1c5c9a14c5d24883c12ff4b9b09faf88dfc590d034416a58696e1d38db3aec24be
sha512sums = db66bb6ddaf5882db26ea10e53c8ca648d94b898a333177c281c353d56e6f9ce75d91a4941ebdc5a9f1f627a986f5e70adbcd785a24d02fc9af58407e22ab926
sha512sums = acf35ebe467e9fb30f1b77d15348f1a7b82dcf45a5b829e375e972b5d6b49968603b3fa090c4d1f56e8b5148e2b820e79afa269da60ace70de1ceadcf6e820c5 sha512sums = acf35ebe467e9fb30f1b77d15348f1a7b82dcf45a5b829e375e972b5d6b49968603b3fa090c4d1f56e8b5148e2b820e79afa269da60ace70de1ceadcf6e820c5
sha512sums = c33c2414746bc9d7dceb5af59ecb4aed2189211fc3c8b144d712a39d3677ba4d366eb9b4dd05fbc3811954d69cd1273d714dc4536489fe153ac1aee2919e5c98 sha512sums = c33c2414746bc9d7dceb5af59ecb4aed2189211fc3c8b144d712a39d3677ba4d366eb9b4dd05fbc3811954d69cd1273d714dc4536489fe153ac1aee2919e5c98

View file

@ -1,7 +1,7 @@
# Maintainer: Lukas1818 aur at lukas1818 dot de # Maintainer: Lukas1818 aur at lukas1818 dot de
pkgname=superslicer-prerelease pkgname=superslicer-prerelease
pkgver=2.3.57.0 pkgver=2.3.57.1
_pkgtag=$pkgver _pkgtag=$pkgver
pkgrel=1 pkgrel=1
epoch=1 epoch=1
@ -9,26 +9,24 @@ pkgdesc="G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)"
arch=("$CARCH") arch=("$CARCH")
url="https://github.com/supermerill/SuperSlicer" url="https://github.com/supermerill/SuperSlicer"
license=('AGPL3') license=('AGPL3')
depends=('cgal' 'glew' 'nlopt' 'openvdb' 'wxgtk3-dev-opt' 'boost-libs>=1.73.0' 'qhull>=2020.2-4') depends=('cgal' 'glew' 'nlopt' 'openvdb' 'wxgtk3-dev-314-opt' 'boost-libs>=1.73.0' 'qhull>=2020.2-4')
replaces=('slic3r++') replaces=('slic3r++')
makedepends=('cereal' 'cmake' 'ninja' 'eigen' 'libigl' 'openvdb' 'boost>=1.73.0' 'wxgtk2-dev-opt') # cmake doesn't detect wx if not both gtk2 and gtk3 are installed makedepends=('cereal' 'cmake' 'ninja' 'eigen' 'libigl' 'openvdb' 'boost>=1.73.0' 'wxgtk2-dev-314-opt') # cmake doesn't detect wx if not both gtk2 and gtk3 are installed
optdepends=('superslicer-profiles: Predefined printer profiles') optdepends=('superslicer-profiles: Predefined printer profiles')
provides=("superslicer=$epoch:$pkgver") provides=("superslicer=$epoch:$pkgver")
conflicts=('superslicer' 'superslicer-git') conflicts=('superslicer' 'superslicer-git')
source=("https://github.com/supermerill//SuperSlicer/archive/$_pkgtag.tar.gz" source=("https://github.com/supermerill//SuperSlicer/archive/$_pkgtag.tar.gz"
"start-superslicer.sh"
"0001-wxgtk3-is-broken-on-wayland.patch" "0001-wxgtk3-is-broken-on-wayland.patch"
"https://raw.githubusercontent.com/archlinux/svntogit-community/1dea61c0b581ff5001d073689f68b0323740be93/trunk/prusa-slicer-openexr3.patch") "https://raw.githubusercontent.com/archlinux/svntogit-community/1dea61c0b581ff5001d073689f68b0323740be93/trunk/prusa-slicer-openexr3.patch")
sha512sums=('f0b7284197526abacd45b8c5a026a20d6833b9f30a6c4b84c0f2db2332c2115c0ef261f6a03133c42c327346847e0a1d5fd546183478295258b71402d543ca14' sha512sums=('85f27864ec5c3c1b473ae4c9405b419b565246c9e4c0967f0adfbbe6c6baeb1c5c9a14c5d24883c12ff4b9b09faf88dfc590d034416a58696e1d38db3aec24be'
'db66bb6ddaf5882db26ea10e53c8ca648d94b898a333177c281c353d56e6f9ce75d91a4941ebdc5a9f1f627a986f5e70adbcd785a24d02fc9af58407e22ab926'
'acf35ebe467e9fb30f1b77d15348f1a7b82dcf45a5b829e375e972b5d6b49968603b3fa090c4d1f56e8b5148e2b820e79afa269da60ace70de1ceadcf6e820c5' 'acf35ebe467e9fb30f1b77d15348f1a7b82dcf45a5b829e375e972b5d6b49968603b3fa090c4d1f56e8b5148e2b820e79afa269da60ace70de1ceadcf6e820c5'
'c33c2414746bc9d7dceb5af59ecb4aed2189211fc3c8b144d712a39d3677ba4d366eb9b4dd05fbc3811954d69cd1273d714dc4536489fe153ac1aee2919e5c98') 'c33c2414746bc9d7dceb5af59ecb4aed2189211fc3c8b144d712a39d3677ba4d366eb9b4dd05fbc3811954d69cd1273d714dc4536489fe153ac1aee2919e5c98')
prepare() prepare()
{ {
cd "$srcdir/SuperSlicer-$_pkgtag" cd "$srcdir/SuperSlicer-$_pkgtag"
[ ! -f build/Makefile ] || rm -rf build [ ! -f build/Makefile ] || rm -rf build
mkdir -p build mkdir -p build
# disabling tests is not enough, we need to remove them explicitly # disabling tests is not enough, we need to remove them explicitly
sed -i 's,add_subdirectory(test),,g' src/CMakeLists.txt sed -i 's,add_subdirectory(test),,g' src/CMakeLists.txt
@ -44,7 +42,7 @@ build()
cd build cd build
cmake .. \ cmake .. \
-G Ninja \ -G Ninja \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_PREFIX=/usr \
-DOpenGL_GL_PREFERENCE=GLVND \ -DOpenGL_GL_PREFERENCE=GLVND \
@ -54,8 +52,8 @@ build()
-DSLIC3R_GTK=3 \ -DSLIC3R_GTK=3 \
-DSLIC3R_BUILD_TESTS=OFF \ -DSLIC3R_BUILD_TESTS=OFF \
-DSLIC3R_ALPHA=ON \ -DSLIC3R_ALPHA=ON \
-DwxWidgets_CONFIG_EXECUTABLE=/opt/wxgtk-dev/bin/wx-config \ -DwxWidgets_CONFIG_EXECUTABLE=/opt/wxgtk-dev-314/bin/wx-config \
-DCMAKE_CXX_FLAGS="-Wl,-rpath=/opt/wxgtk-dev/lib" -DCMAKE_CXX_FLAGS="-Wl,-rpath=/opt/wxgtk-dev-314/lib"
ninja ninja
} }
@ -66,7 +64,4 @@ package()
DESTDIR="$pkgdir" ninja install DESTDIR="$pkgdir" ninja install
test ! -h "$pkgdir/usr/share/SuperSlicer/resources" || rm "$pkgdir/usr/share/SuperSlicer/resources" test ! -h "$pkgdir/usr/share/SuperSlicer/resources" || rm "$pkgdir/usr/share/SuperSlicer/resources"
mv "$pkgdir/usr/bin/superslicer" "$pkgdir/usr/share/SuperSlicer"
install -Dm 755 "${srcdir}/start-superslicer.sh" "${pkgdir}/usr/bin/superslicer"
} }

View file

@ -1,15 +0,0 @@
#!/bin/bash
import_settings()
{
if [ -d "$1" ] && [ ! -d "$HOME/.config/SuperSlicer-alpha" ]
then
echo "import data from $1 to the new data folder ~/.config/SuperSlicer-alpha"
cp -r "$HOME/.SuperSlicer" "$HOME/.config/SuperSlicer-alpha"
fi
}
import_settings "$HOME/.config/SuperSlicer"
import_settings "$HOME/.SuperSlicer"
/usr/share/SuperSlicer/superslicer "$@"