remove CMake upper version check

This commit is contained in:
lod 2025-04-19 11:17:14 +02:00
parent 104c19184d
commit bd8f1c7914
2 changed files with 7 additions and 3 deletions

View file

@ -1,6 +1,6 @@
pkgbase = orca-slicer-git pkgbase = orca-slicer-git
pkgdesc = G-code generator for 3D printers (Bambu, Prusa, Voron, VzBot, RatRig, Creality, etc.) pkgdesc = G-code generator for 3D printers (Bambu, Prusa, Voron, VzBot, RatRig, Creality, etc.)
pkgver = 2.3.1.r24918.82bc52c pkgver = 2.3.1.r24980.7d2a12a
pkgrel = 1 pkgrel = 1
url = https://github.com/SoftFever/OrcaSlicer url = https://github.com/SoftFever/OrcaSlicer
arch = x86_64 arch = x86_64
@ -42,6 +42,7 @@ pkgbase = orca-slicer-git
optdepends = mesa-utils: for detecting renderer optdepends = mesa-utils: for detecting renderer
optdepends = nvidia-utils: for querying driver version optdepends = nvidia-utils: for querying driver version
provides = orca-slicer provides = orca-slicer
conflicts = orca-slicer
options = !debug options = !debug
options = !emptydirs options = !emptydirs
source = orca-slicer-git::git+https://github.com/SoftFever/OrcaSlicer.git source = orca-slicer-git::git+https://github.com/SoftFever/OrcaSlicer.git

View file

@ -1,7 +1,7 @@
# Maintainer: lod <aur@cyber-anlage.de> # Maintainer: lod <aur@cyber-anlage.de>
pkgname=orca-slicer-git pkgname=orca-slicer-git
pkgver=2.3.1.r24918.82bc52c pkgver=2.3.1.r24980.7d2a12a
pkgrel=1 pkgrel=1
pkgdesc="G-code generator for 3D printers (Bambu, Prusa, Voron, VzBot, RatRig, Creality, etc.)" pkgdesc="G-code generator for 3D printers (Bambu, Prusa, Voron, VzBot, RatRig, Creality, etc.)"
arch=('x86_64') arch=('x86_64')
@ -15,7 +15,8 @@ optdepends=('mesa: Enables Zink fallback workaround for NVIDIA on Wayland'
'mesa-utils: for detecting renderer' 'mesa-utils: for detecting renderer'
'nvidia-utils: for querying driver version') 'nvidia-utils: for querying driver version')
options=('!debug' '!emptydirs') options=('!debug' '!emptydirs')
provides=("orca-slicer") provides=('orca-slicer')
conflicts=('orca-slicer')
source=($pkgname::git+https://github.com/SoftFever/OrcaSlicer.git source=($pkgname::git+https://github.com/SoftFever/OrcaSlicer.git
orca-slicer-wrapper.sh orca-slicer-wrapper.sh
https://github.com/Open-Cascade-SAS/OCCT/commit/7236e83dcc1e7284e66dc61e612154617ef715d6.patch) https://github.com/Open-Cascade-SAS/OCCT/commit/7236e83dcc1e7284e66dc61e612154617ef715d6.patch)
@ -34,6 +35,8 @@ pkgver() {
prepare() { prepare() {
# C++20 disallows the use of the Point<T> syntax in the constructor # C++20 disallows the use of the Point<T> syntax in the constructor
sed -i 's/explicit Point<T>(/explicit Point(/' $pkgname/src/clipper2/Clipper2Lib/include/clipper2/clipper.core.h sed -i 's/explicit Point<T>(/explicit Point(/' $pkgname/src/clipper2/Clipper2Lib/include/clipper2/clipper.core.h
# Remove upper cmake version check
sed -i 's| OR ${CMAKE_VERSION} VERSION_GREATER_EQUAL "4.0"| |' $pkgname/CMakeLists.txt
# abuse FLATPAK IF statement to build against some system libs # abuse FLATPAK IF statement to build against some system libs
sed -i 's/if(FLATPAK)/if(true)/' $pkgname/deps/CMakeLists.txt sed -i 's/if(FLATPAK)/if(true)/' $pkgname/deps/CMakeLists.txt
# cherry pick an OCCT commit to make it build with system freetype # cherry pick an OCCT commit to make it build with system freetype