From 409398ee5aace6c9743664662963549d9cd55a45 Mon Sep 17 00:00:00 2001
From: lod <github@bremsspur.org>
Date: Sun, 30 Mar 2025 11:09:47 +0200
Subject: [PATCH] Set cmake_minimum_required to 3.5 for all dependencies to
build with cmake 4
---
.SRCINFO | 6 +++++-
PKGBUILD | 23 ++++++++++++++++++-----
2 files changed, 23 insertions(+), 6 deletions(-)
diff --git a/.SRCINFO b/.SRCINFO
index efa9f2b..5bffdfc 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.r24811.108eeae
+ pkgver = 2.3.1.r24828.933b282
pkgrel = 1
url = https://github.com/SoftFever/OrcaSlicer
arch = x86_64
@@ -42,7 +42,11 @@ pkgbase = orca-slicer-git
options = !emptydirs
source = orca-slicer-git::git+https://github.com/SoftFever/OrcaSlicer.git
source = https://github.com/Open-Cascade-SAS/OCCT/commit/7236e83dcc1e7284e66dc61e612154617ef715d6.patch
+ source = cmake=min-version.patch
+ source = wxWidgets-cmake-min-version.patch
b2sums = SKIP
b2sums = cc7791841533e07787a4921b688fdd885782a67320936d445ad04102a68e8e044b5bf52a58d987d158ae522ae4f02a56a3525ccfd1831ef6a3b6459be14bd408
+ b2sums = 562dcd07530faef0d9fdddf1e009075f67105c8239e4b1402cd890f7a89be8b11671dd6ecc7b55a155f2d05247070bb0b8ff84f2170ce2454ab818018be80e48
+ b2sums = 1459ce126dd80a891006d2c40a001e75dc146ac9eb6ad8e975a3e4672ebb914baabecd8a4048742fab03e2820242f614449dd23a8e721bd5c945c8765e986a5a
pkgname = orca-slicer-git
diff --git a/PKGBUILD b/PKGBUILD
index 64396f1..697e613 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: lod <aur@cyber-anlage.de>
pkgname=orca-slicer-git
-pkgver=2.3.1.r24811.108eeae
+pkgver=2.3.1.r24828.933b282
pkgrel=1
pkgdesc="G-code generator for 3D printers (Bambu, Prusa, Voron, VzBot, RatRig, Creality, etc.)"
arch=('x86_64')
@@ -14,9 +14,13 @@ makedepends=('cmake' 'extra-cmake-modules' 'git' 'glew' 'libigl' 'm4' 'ninja' 'p
options=('!debug' '!emptydirs')
provides=("orca-slicer")
source=("$pkgname::git+https://github.com/SoftFever/OrcaSlicer.git"
- "https://github.com/Open-Cascade-SAS/OCCT/commit/7236e83dcc1e7284e66dc61e612154617ef715d6.patch")
+ "https://github.com/Open-Cascade-SAS/OCCT/commit/7236e83dcc1e7284e66dc61e612154617ef715d6.patch"
+ "cmake=min-version.patch"
+ "wxWidgets-cmake-min-version.patch")
b2sums=('SKIP'
- 'cc7791841533e07787a4921b688fdd885782a67320936d445ad04102a68e8e044b5bf52a58d987d158ae522ae4f02a56a3525ccfd1831ef6a3b6459be14bd408')
+ 'cc7791841533e07787a4921b688fdd885782a67320936d445ad04102a68e8e044b5bf52a58d987d158ae522ae4f02a56a3525ccfd1831ef6a3b6459be14bd408'
+ '562dcd07530faef0d9fdddf1e009075f67105c8239e4b1402cd890f7a89be8b11671dd6ecc7b55a155f2d05247070bb0b8ff84f2170ce2454ab818018be80e48'
+ '1459ce126dd80a891006d2c40a001e75dc146ac9eb6ad8e975a3e4672ebb914baabecd8a4048742fab03e2820242f614449dd23a8e721bd5c945c8765e986a5a')
pkgver() {
@@ -36,6 +40,13 @@ prepare() {
cat 7236e83dcc1e7284e66dc61e612154617ef715d6.patch >> $pkgname/deps/OCCT/0001-OCCT-fix.patch
# Fix xgettext: case-sensitive mismatches
sed -i 's|src/slic3r/GUI/AMSMappingPopup.cpp|src/slic3r/GUI/AmsMappingPopup.cpp|g' $pkgname/localization/i18n/list.txt
+ # Set cmake_minimum_required to 3.5 for all dependencies
+ cp wxWidgets-cmake-min-version.patch $pkgname/deps/wxWidgets/wxWidgets-cmake-min-version.patch
+ cd $pkgname
+ git apply ../cmake=min-version.patch
+
+
+
}
build() {
@@ -46,7 +57,8 @@ build() {
-G Ninja \
-S deps \
-B deps/build \
- -DDEP_WX_GTK3=ON
+ -DDEP_WX_GTK3=ON \
+ -DCMAKE_POLICY_VERSION_MINIMUM=3.5
ninja -C deps/build
cmake \
@@ -59,7 +71,8 @@ build() {
-DSLIC3R_STATIC=1 \
-DORCA_TOOLS=1 \
-DSLIC3R_FHS=1 \
- -DSLIC3R_GTK=3
+ -DSLIC3R_GTK=3 \
+ -DCMAKE_POLICY_VERSION_MINIMUM=3.5
ninja -C build
# add localizations