diff --git a/.SRCINFO b/.SRCINFO index 3ad713c..a6f8fab 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -9,6 +9,8 @@ pkgbase = orca-slicer makedepends = extra-cmake-modules makedepends = git makedepends = glew + makedepends = gcc14 + makedepends = gcc14-libs makedepends = m4 makedepends = ninja makedepends = pkgconf @@ -41,6 +43,7 @@ pkgbase = orca-slicer optdepends = mesa-utils: for detecting renderer optdepends = nvidia-utils: for querying driver version provides = orca-slicer + conflicts = orca-slicer options = !debug options = !emptydirs source = orca-slicer::git+https://github.com/SoftFever/OrcaSlicer.git#tag=v2.3.0 diff --git a/PKGBUILD b/PKGBUILD index c4e5c2f..53d8ab3 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -6,15 +6,16 @@ pkgdesc="G-code generator for 3D printers (Bambu, Prusa, Voron, VzBot, RatRig, C arch=('x86_64') url="https://github.com/SoftFever/OrcaSlicer" license=('AGPL-3.0-only') -depends=('bash' 'cairo' 'dbus' 'expat' 'fontconfig' 'freetype2' 'gcc-libs' 'gdk-pixbuf2' 'glib2' 'glibc' +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' 'libtiff' 'libx11' 'pango' 'python' 'wayland' 'webkit2gtk-4.1' 'zlib') -makedepends=('cmake' 'extra-cmake-modules' 'git' 'glew' 'm4' 'ninja' 'pkgconf' 'wayland-protocols') +makedepends=('cmake' 'extra-cmake-modules' 'git' 'glew' 'gcc14' 'gcc14-libs' 'm4' 'ninja' 'pkgconf' 'wayland-protocols') optdepends=('mesa: Enables Zink fallback workaround for NVIDIA on Wayland' 'mesa-utils: for detecting renderer' 'nvidia-utils: for querying driver version') options=('!debug' '!emptydirs') -provides=("orca-slicer") +provides=('orca-slicer') +conflicts=('orca-slicer') source=($pkgname::git+https://github.com/SoftFever/OrcaSlicer.git#tag=v$pkgver orca-slicer-wrapper.sh https://github.com/Open-Cascade-SAS/OCCT/commit/7236e83dcc1e7284e66dc61e612154617ef715d6.patch) @@ -32,14 +33,14 @@ prepare() { # Fix xgettext: case-sensitive mismatches sed -i 's|src/slic3r/GUI/AMSMappingPopup.cpp|src/slic3r/GUI/AmsMappingPopup.cpp|g' $pkgname/localization/i18n/list.txt sed -i 's|https://www.mpfr.org/mpfr-current/mpfr-4.2.1.tar.bz2|https://www.mpfr.org/mpfr-4.2.1/mpfr-4.2.1.tar.bz2|' $pkgname/deps/MPFR/MPFR.cmake - # Set cmake_minimum_required to 3.5 for all dependencies - } build() { cd $pkgname export CXXFLAGS="${CXXFLAGS} -flto" export CMAKE_POLICY_VERSION_MINIMUM=3.5 + export CC=/usr/bin/gcc-14 + export CXX=/usr/bin/g++-14 cmake \ -G Ninja \