diff --git a/.SRCINFO b/.SRCINFO index 7f04d1f..0521786 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = orca-slicer-git pkgdesc = G-code generator for 3D printers (Bambu, Prusa, Voron, VzBot, RatRig, Creality, etc.) - pkgver = 2.3.1.r25150.88fb818 + pkgver = 2.3.1.r25349.e44ec1f pkgrel = 1 url = https://github.com/SoftFever/OrcaSlicer arch = x86_64 @@ -34,6 +34,7 @@ pkgbase = orca-slicer-git depends = libx11 depends = pango depends = python + depends = ttf-nanum depends = wayland depends = webkit2gtk-4.1 depends = zlib diff --git a/PKGBUILD b/PKGBUILD index bd1b5c5..35ff22b 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: lod pkgname=orca-slicer-git -pkgver=2.3.1.r25150.88fb818 +pkgver=2.3.1.r25349.e44ec1f pkgrel=1 pkgdesc="G-code generator for 3D printers (Bambu, Prusa, Voron, VzBot, RatRig, Creality, etc.)" arch=('x86_64') @@ -9,7 +9,7 @@ url="https://github.com/SoftFever/OrcaSlicer" license=('AGPL-3.0-only') depends=('bash' 'cairo' 'dbus' 'expat' 'fontconfig' 'freetype2' 'gcc-libs' 'gdk-pixbuf2' 'glib2' 'glibc' 'gst-plugins-base-libs' 'gstreamer' 'gtk3' 'hicolor-icon-theme' 'libglvnd' 'libjpeg-turbo' - 'libspnav' 'libx11' 'pango' 'python' 'wayland' 'webkit2gtk-4.1' 'zlib') + 'libspnav' 'libx11' 'pango' 'python' 'ttf-nanum' 'wayland' 'webkit2gtk-4.1' 'zlib') makedepends=('cmake' 'extra-cmake-modules' 'git' 'glew' 'libigl' 'm4' 'ninja' 'pkgconf' 'wayland-protocols') optdepends=('mesa: Enables Zink fallback workaround for NVIDIA on Wayland' 'mesa-utils: for detecting renderer' @@ -35,6 +35,8 @@ prepare() { # abuse FLATPAK IF statement to build against some system libs sed -i 's/if(FLATPAK)/if(true)/' deps/CMakeLists.txt + # revert: Link libspnav statically (#9964) + git revert --no-commit 6ed9b0817381042a63fa121c5f9b5cbcb11a3bfa } build() { @@ -45,6 +47,9 @@ build() { -G Ninja \ -S deps \ -B deps/build \ + -DDESTDIR="$PWD/deps/build/destdir" \ + -DDEP_DOWNLOAD_DIR="$PWD/deps/DL_CACHE" \ + -DCOLORED_OUTPUT=ON \ -DDEP_WX_GTK3=ON ninja -C deps/build @@ -54,7 +59,7 @@ build() { -B build \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_FULL_DATAROOTDIR=/usr/share/ \ - -DCMAKE_PREFIX_PATH="$srcdir/$pkgname/deps/build/destdir/usr/local" \ + -DCMAKE_PREFIX_PATH="$PWD/deps/build/destdir/usr/local" \ -DSLIC3R_STATIC=1 \ -DORCA_TOOLS=1 \ -DSLIC3R_FHS=1 \