From b4286551fd240bcf7a8fa6f6e0f80d31aff51308 Mon Sep 17 00:00:00 2001 From: Lukas1818 Date: Sat, 2 Apr 2022 17:53:20 +0200 Subject: [PATCH] use wxgtk instead of wxgtk-dev-314-opt --- .SRCINFO | 4 ++-- PKGBUILD | 9 ++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index a78c8f9..a14732b 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -13,7 +13,7 @@ pkgbase = superslicer-prerelease makedepends = libigl makedepends = openvdb makedepends = samurai - makedepends = wxgtk2-dev-314-opt + makedepends = wxgtk2 depends = boost-libs>=1.73.0 depends = cgal depends = glew @@ -22,7 +22,7 @@ pkgbase = superslicer-prerelease depends = nlopt depends = openvdb depends = qhull>=2020.2-4 - depends = wxgtk3-dev-314-opt + depends = wxgtk3 optdepends = superslicer-profiles: Predefined printer profiles provides = superslicer=1:2.4.58.2 conflicts = superslicer diff --git a/PKGBUILD b/PKGBUILD index 9a7a92e..5281288 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -10,8 +10,8 @@ arch=("$CARCH") url="https://github.com/supermerill/SuperSlicer" license=('AGPL3') options=(!emptydirs) -depends=('boost-libs>=1.73.0' 'cgal' 'glew' 'imath' 'libspnav' 'nlopt' 'openvdb' 'qhull>=2020.2-4' 'wxgtk3-dev-314-opt') -makedepends=('boost>=1.73.0' 'cereal>=1.3.0' 'cmake' 'eigen' 'libigl' 'openvdb' 'samurai' 'wxgtk2-dev-314-opt') # cmake doesn't detect wx if not both gtk2 and gtk3 are installed +depends=('boost-libs>=1.73.0' 'cgal' 'glew' 'imath' 'libspnav' 'nlopt' 'openvdb' 'qhull>=2020.2-4' 'wxgtk3') +makedepends=('boost>=1.73.0' 'cereal>=1.3.0' 'cmake' 'eigen' 'libigl' 'openvdb' 'samurai' 'wxgtk2') # cmake doesn't detect wx if not both gtk2 and gtk3 are installed optdepends=('superslicer-profiles: Predefined printer profiles') provides=("superslicer=$epoch:$pkgver") conflicts=('superslicer' 'superslicer-git') @@ -28,6 +28,7 @@ prepare() { cd "$srcdir/SuperSlicer-$_pkgtag" [ ! -f build/Makefile ] || rm -rf build + rm -rf build # build does fail everytime if it is not clean build ? mkdir -p build # disabling tests is not enough, we need to remove them explicitly @@ -54,9 +55,7 @@ build() -DSLIC3R_WX_STABLE=ON \ -DSLIC3R_GTK=3 \ -DSLIC3R_BUILD_TESTS=OFF \ - -DSLIC3R_ALPHA=ON \ - -DwxWidgets_CONFIG_EXECUTABLE=/opt/wxgtk-dev-314/bin/wx-config \ - -DCMAKE_CXX_FLAGS="-Wno-unused-command-line-argument -Wl,-rpath=/opt/wxgtk-dev-314/lib" + -DSLIC3R_ALPHA=ON samu }