fix build with python3.12

2 files changed, 18 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2ced7e6851ce..211b84500864 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = yade
 	pkgdesc = Yet Another Dynamic Engine, free software for discrete element modeling.
 	pkgver = 2024.02a
-	pkgrel = 1
+	pkgrel = 2
 	url = https://yade-dem.org/doc/index.html
 	arch = x86_64
 	license = GPL2
diff --git a/PKGBUILD b/PKGBUILD
index 9ea3b4055bd3..3871ccca3469 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Sukanka <su975853527 [AT] gmail.com>
 pkgname=yade
 pkgver=2024.02a
-pkgrel=1
+pkgrel=2
 pkgdesc="Yet Another Dynamic Engine, free software for discrete element modeling."
 arch=("x86_64")
 url='https://yade-dem.org/doc/index.html'
@@ -16,7 +16,7 @@ depends=(
     'tk'
     'python-matplotlib' # needed in runtime
     'python-mpi4py'
-    'fmt' # needed by `boot.so`
+    'fmt'     # needed by `boot.so`
     'verdict' # needed by `boot.so`
 )
 makedepends=(
@@ -30,54 +30,54 @@ makedepends=(
     'openmp'
 )
 optdepends=(
-'cuda: GPU acceleration'
+    'cuda: GPU acceleration'
 )
 source=("trunk-${pkgver}.tar.gz::https://gitlab.com/yade-dev/trunk/-/archive/${pkgver}/trunk-${pkgver}.tar.gz"
-'remove-metis.patch'
+    'remove-metis.patch'
 )
 sha512sums=('e3c4cf14124494ebc824a66d5e818fb3037eec86be1e2668af786046cd988d68510aa19c41a1e7ba5837fcaae72529c4b40f7e2a8871d9bfda799fd81895a2b1'
-            'ebbbb16ebc7f5fa383425149030f37e3309dd1411bc4ac464fd81dcd3e2e3acfc0ac141a631b287e91e8fab1f0e8d6f77dad476936edb9f297e11ea5f4c26422')
+    'ebbbb16ebc7f5fa383425149030f37e3309dd1411bc4ac464fd81dcd3e2e3acfc0ac141a631b287e91e8fab1f0e8d6f77dad476936edb9f297e11ea5f4c26422')
 options=('!buildflags' '!lto')
 
-prepare(){
+prepare() {
     # Follow https://yade-dem.org/doc/installation.html#compilation
     test -d trunk && rm -rf trunk
     mv trunk-${pkgver} trunk
     test -d build || mkdir build
     cd trunk
-    patch --strip=1 < ../remove-metis.patch
+    patch --strip=1 <../remove-metis.patch
 }
 
-
-build(){
+build() {
 
     # To speed up compilation you can try (27 requires over 50GiB RAM)
     # -DCMAKE_UNITY_BUILD=ON -DCMAKE_UNITY_BUILD_BATCH_SIZE=27
+    local pyver
+    pyver=$(python -V | cut -d ' ' -f2)
     cmake -B build -S trunk \
         -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=lib -DruntimePREFIX=/usr \
-        -DNOSUFFIX=ON -DPYTHON_VERSION=-1 \
+        -DNOSUFFIX=ON -DPYTHON_VERSION="${pyver%.*}" \
         -DFORCE_FREEGLUT_PATH=/usr/include \
         -DOpenGL_GL_PREFERENCE=GLVND \
         -DCHOLMOD_GPU=ON -DENABLE_DEFORM=ON -DENABLE_OAR=ON -DENABLE_FEMLIKE=ON \
-        -DENABLE_MPFR=ON  \
+        -DENABLE_MPFR=ON \
         -DENABLE_POTENTIAL_PARTICLES=ON -DENABLE_VTK=ON \
         -DENABLE_SPH=ON -DENABLE_PROFILING=ON -DENABLE_LIQMIGRATION=ON \
-        -DENABLE_MASK_ARBITRARY=ON -DENABLE_PARTIALSAT=ON  \
-        -DENABLE_POTENTIAL_BLOCKS=ON  -DVECTORIZE=ON \
+        -DENABLE_MASK_ARBITRARY=ON -DENABLE_PARTIALSAT=ON \
+        -DENABLE_POTENTIAL_BLOCKS=ON -DVECTORIZE=ON \
         -DENABLE_USEFUL_ERRORS=OFF \
-        -DCMAKE_BUILD_TYPE=None  -Wno-dev \
+        -DCMAKE_BUILD_TYPE=None -Wno-dev \
         -DCMAKE_CXX_FLAGS=-DNDEBUG
     cmake --build build
 }
 
-package(){
+package() {
     cd "$srcdir"/build
     make install DESTDIR="${pkgdir}"
 
     # need to add \x0 with length ${#srcdir}+1
     rplc='\x0'
-    for ((i=1;i <=${#srcdir};i++))
-    do
+    for ((i = 1; i <= ${#srcdir}; i++)); do
         rplc="$rplc\\x0"
     done
     msg2 'Stripping $srcdir'