diff --git a/.SRCINFO b/.SRCINFO index b3c8b10..f97d948 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = orca-slicer pkgdesc = G-code generator for 3D printers (Bambu, Prusa, Voron, VzBot, RatRig, Creality, etc.) - pkgver = 2.1.1 + pkgver = 2.2.0 pkgrel = 1 url = https://github.com/SoftFever/OrcaSlicer arch = x86_64 @@ -44,11 +44,7 @@ pkgbase = orca-slicer depends = nlopt depends = opencascade provides = orca-slicer - source = orca-slicer::git+https://github.com/SoftFever/OrcaSlicer.git#tag=v2.1.1 - source = test.patch - source = dont-link-opencv-world.patch - b2sums = e5b0e0c15ac6418bed32ca144342acb5db37f55cf028b2f5ba32e0765e7e876786efa6f15e66e7b0e1ddef05eb22d2a5d390835fc584838f66d5f869df02eb32 - b2sums = SKIP - b2sums = SKIP + source = orca-slicer::git+https://github.com/SoftFever/OrcaSlicer.git#tag=v2.2.0 + b2sums = 4f199f82cf1c99af120c7a451c356fa229dd92b7b2fac4a2a15f4efd2c24ff147348ccba75d8b0c2a08a4d5874e780df885fe41ab2a82209e88547687e17b5e1 pkgname = orca-slicer diff --git a/PKGBUILD b/PKGBUILD index 9a79b23..9c22bc0 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: lod pkgname=orca-slicer -pkgver=2.1.1 +pkgver=2.2.0 pkgrel=1 pkgdesc="G-code generator for 3D printers (Bambu, Prusa, Voron, VzBot, RatRig, Creality, etc.) " arch=('x86_64') @@ -10,19 +10,17 @@ depends=('cairo' 'curl' 'dbus' 'expat' 'fontconfig' 'freetype2' 'gcc-libs' 'glib makedepends=('cmake' 'extra-cmake-modules' 'git' 'm4' 'ninja' 'pkgconf' 'wayland-protocols' 'glew') provides=("orca-slicer") -source=("$pkgname::git+https://github.com/SoftFever/OrcaSlicer.git#tag=v$pkgver" - "test.patch" - "dont-link-opencv-world.patch") -b2sums=('e5b0e0c15ac6418bed32ca144342acb5db37f55cf028b2f5ba32e0765e7e876786efa6f15e66e7b0e1ddef05eb22d2a5d390835fc584838f66d5f869df02eb32' - 'SKIP' - 'SKIP') +source=("$pkgname::git+https://github.com/SoftFever/OrcaSlicer.git#tag=v$pkgver") +b2sums=('4f199f82cf1c99af120c7a451c356fa229dd92b7b2fac4a2a15f4efd2c24ff147348ccba75d8b0c2a08a4d5874e780df885fe41ab2a82209e88547687e17b5e1') prepare() { cd $srcdir/$pkgname - patch -p1 -i ../test.patch - patch -p1 -i ../dont-link-opencv-world.patch # C++20 disallows the use of the Point syntax in the constructor sed -i 's/explicit Point(/explicit Point(/' src/clipper2/Clipper2Lib/include/clipper2/clipper.core.h + # abuse FLATPAK IF statement to build against some system libs + sed -i 's/if(FLATPAK)/if(true)/' deps/CMakeLists.txt + # System Freetype has some breaking changes + sed -i 's/find_package(Freetype)/# find_package(Freetype)/' deps/CMakeLists.txt } build() { @@ -49,6 +47,7 @@ build() { -DSLIC3R_GTK=3 ninja -C build + ./run_gettext.sh } package() {