aur/superslicer-prerelease
1
0
Fork 0
Code Issues Pull requests Releases Activity Actions

remove qhull patch (was fixed in qhull 2020.2-4)

Browse source
This commit is contained in:
Lukas1818 2020-11-05 14:00:52 +01:00
parent cc0c4d5e5d
commit ae9b9428ab
3 changed files with 6 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.SRCINFO
View file

@ -1,7 +1,7 @@
pkgbase = superslicer pkgbase = superslicer
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.54.2 pkgver = 2.2.54.2
pkgrel = 1 pkgrel = 2
url = https://github.com/supermerill/SuperSlicer url = https://github.com/supermerill/SuperSlicer
arch = x86_64 arch = x86_64
license = AGPL3 license = AGPL3
@ -17,17 +17,16 @@ pkgbase = superslicer
depends = openvdb depends = openvdb
depends = wxgtk3-dev-opt depends = wxgtk3-dev-opt
depends = boost-libs-171-opt depends = boost-libs-171-opt
depends = qhull>=2020.2-4
replaces = slic3r++ replaces = slic3r++
source = https://github.com/supermerill//SuperSlicer/archive/2.2.54.2.tar.gz source = https://github.com/supermerill//SuperSlicer/archive/2.2.54.2.tar.gz
source = superslicer.desktop source = superslicer.desktop
source = start-superslicer.sh source = start-superslicer.sh
source = 0001-wxgtk3-is-broken-on-wayland.patch source = 0001-wxgtk3-is-broken-on-wayland.patch
source = qhull-broken.patch
sha512sums = 3e28d28f463be49217d4aa19691bd190d644f86474786db69ec82d58090d2231a6c0add66eec59ac9f8c2169bfcd730a0c9deafd9df48182e92194bf6d2f39b6 sha512sums = 3e28d28f463be49217d4aa19691bd190d644f86474786db69ec82d58090d2231a6c0add66eec59ac9f8c2169bfcd730a0c9deafd9df48182e92194bf6d2f39b6
sha512sums = 8f75de56ba3e29b9c650d2946bd11afcf406a7fd42d2620ec44e4e76f6b64626de720190ce0f8be29ba7c48f714bfa0a71c45f868bdce7bc1ac7dbbc0e9e7583 sha512sums = 8f75de56ba3e29b9c650d2946bd11afcf406a7fd42d2620ec44e4e76f6b64626de720190ce0f8be29ba7c48f714bfa0a71c45f868bdce7bc1ac7dbbc0e9e7583
sha512sums = 3703901d97ae1982a36eb5c491fe0fd6953e81e6bb1d155404acfcac1de1f377931c88b9667688775af5ed16bd46944ca3a285bc4b2739762faa70e546044c43 sha512sums = 3703901d97ae1982a36eb5c491fe0fd6953e81e6bb1d155404acfcac1de1f377931c88b9667688775af5ed16bd46944ca3a285bc4b2739762faa70e546044c43
sha512sums = acf35ebe467e9fb30f1b77d15348f1a7b82dcf45a5b829e375e972b5d6b49968603b3fa090c4d1f56e8b5148e2b820e79afa269da60ace70de1ceadcf6e820c5 sha512sums = acf35ebe467e9fb30f1b77d15348f1a7b82dcf45a5b829e375e972b5d6b49968603b3fa090c4d1f56e8b5148e2b820e79afa269da60ace70de1ceadcf6e820c5
sha512sums = db1857418c2fe380a5e82c3c2b67d945ceb81f40df810c9b6b64730fdbcdf0e5b45e5f6ee8d77f40547b8f078b07aa92f2011e2aaa864a69c4b13d60c2a7b912
pkgname = superslicer pkgname = superslicer

11
PKGBUILD
View file

@ -3,24 +3,22 @@
pkgname=superslicer pkgname=superslicer
pkgver=2.2.54.2 pkgver=2.2.54.2
_pkgtag=$pkgver _pkgtag=$pkgver
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/SuperSlicer" url="https://github.com/supermerill/SuperSlicer"
license=('AGPL3') license=('AGPL3')
depends=('cgal' 'glew' 'nlopt' 'openvdb' 'wxgtk3-dev-opt' 'boost-libs-171-opt') depends=('cgal' 'glew' 'nlopt' 'openvdb' 'wxgtk3-dev-opt' 'boost-libs-171-opt' 'qhull>=2020.2-4')
replaces=('slic3r++') replaces=('slic3r++')
makedepends=('cereal' 'cmake' 'eigen' 'libigl' 'openvdb' 'wxgtk2-dev-opt') # cmake doesn't detect wx if not both gtk2 and gtk3 are installed makedepends=('cereal' 'cmake' 'eigen' 'libigl' 'openvdb' 'wxgtk2-dev-opt') # cmake doesn't detect wx if not both gtk2 and gtk3 are installed
source=("https://github.com/supermerill//SuperSlicer/archive/$_pkgtag.tar.gz" source=("https://github.com/supermerill//SuperSlicer/archive/$_pkgtag.tar.gz"
"superslicer.desktop" "superslicer.desktop"
"start-superslicer.sh" "start-superslicer.sh"
"0001-wxgtk3-is-broken-on-wayland.patch" "0001-wxgtk3-is-broken-on-wayland.patch")
"qhull-broken.patch")
sha512sums=('3e28d28f463be49217d4aa19691bd190d644f86474786db69ec82d58090d2231a6c0add66eec59ac9f8c2169bfcd730a0c9deafd9df48182e92194bf6d2f39b6' sha512sums=('3e28d28f463be49217d4aa19691bd190d644f86474786db69ec82d58090d2231a6c0add66eec59ac9f8c2169bfcd730a0c9deafd9df48182e92194bf6d2f39b6'
'8f75de56ba3e29b9c650d2946bd11afcf406a7fd42d2620ec44e4e76f6b64626de720190ce0f8be29ba7c48f714bfa0a71c45f868bdce7bc1ac7dbbc0e9e7583' '8f75de56ba3e29b9c650d2946bd11afcf406a7fd42d2620ec44e4e76f6b64626de720190ce0f8be29ba7c48f714bfa0a71c45f868bdce7bc1ac7dbbc0e9e7583'
'3703901d97ae1982a36eb5c491fe0fd6953e81e6bb1d155404acfcac1de1f377931c88b9667688775af5ed16bd46944ca3a285bc4b2739762faa70e546044c43' '3703901d97ae1982a36eb5c491fe0fd6953e81e6bb1d155404acfcac1de1f377931c88b9667688775af5ed16bd46944ca3a285bc4b2739762faa70e546044c43'
'acf35ebe467e9fb30f1b77d15348f1a7b82dcf45a5b829e375e972b5d6b49968603b3fa090c4d1f56e8b5148e2b820e79afa269da60ace70de1ceadcf6e820c5' 'acf35ebe467e9fb30f1b77d15348f1a7b82dcf45a5b829e375e972b5d6b49968603b3fa090c4d1f56e8b5148e2b820e79afa269da60ace70de1ceadcf6e820c5')
'db1857418c2fe380a5e82c3c2b67d945ceb81f40df810c9b6b64730fdbcdf0e5b45e5f6ee8d77f40547b8f078b07aa92f2011e2aaa864a69c4b13d60c2a7b912')
prepare() prepare()
{ {
@ -31,7 +29,6 @@ prepare()
# apply patches # apply patches
patch --forward --strip=1 --input="$srcdir/0001-wxgtk3-is-broken-on-wayland.patch" patch --forward --strip=1 --input="$srcdir/0001-wxgtk3-is-broken-on-wayland.patch"
patch --forward --strip=0 --input="$srcdir/qhull-broken.patch"
} }
build() build()

11
qhull-broken.patch
View file

@ -1,11 +0,0 @@
--- src/qhull/CMakeLists.txt.orig 2020-06-18 04:22:25.000000000 +0200
+++ src/qhull/CMakeLists.txt 2020-10-11 13:48:06.303764726 +0200
@@ -10,7 +10,7 @@
# see bug report: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=925540
-find_package(Qhull 7.2 QUIET)
+#find_package(Qhull 7.2 QUIET)
add_library(qhull INTERFACE)