diff --git a/srcpkgs/root/patches/python3.11.patch b/srcpkgs/root/patches/python3.11.patch new file mode 100644 index 00000000000..3507945cf73 --- /dev/null +++ b/srcpkgs/root/patches/python3.11.patch @@ -0,0 +1,15 @@ +Python 3.11 restructures some headers, so fix the includes here. + +--- a/bindings/pyroot/cppyy/CPyCppyy/src/CPPOverload.cxx ++++ b/bindings/pyroot/cppyy/CPyCppyy/src/CPPOverload.cxx +@@ -1,7 +1,9 @@ + // Bindings + #include "CPyCppyy.h" + #include "structmember.h" // from Python +-#if PY_VERSION_HEX >= 0x02050000 ++#if PY_VERSION_HEX >= 0x030B0000 ++#include // from Python ++#elif PY_VERSION_HEX >= 0x02050000 + #include "code.h" // from Python + #else + #include "compile.h" // from Python diff --git a/srcpkgs/root/template b/srcpkgs/root/template index e87769061a7..713df0d2cd0 100644 --- a/srcpkgs/root/template +++ b/srcpkgs/root/template @@ -1,7 +1,7 @@ # Template file for 'root' pkgname=root -version=6.26.04 -revision=2 +version=6.26.06 +revision=1 # Only i686 and x86_64 seem to be officially supported archs="i686* x86_64*" build_style=cmake @@ -19,23 +19,24 @@ makedepends="libX11-devel libXpm-devel libXft-devel libXext-devel libxml2-devel python3-devel python3-numpy R-cran-Rcpp R-cran-RInside xrootd" depends="gcc" -case "$XBPS_TARGET_MACHINE" in - *-musl) - configure_args+=" -Dssl=OFF" - ;; -esac short_desc="C++ framework for data processing created by CERN" maintainer="Ben Jargowsky " license="LGPL-2.1-or-later" homepage="https://root.cern" distfiles="https://root.cern/download/root_v${version}.source.tar.gz" -checksum=a271cf82782d6ed2c87ea5eef6681803f2e69e17b3036df9d863636e9358421e +checksum=b1f73c976a580a5c56c8c8a0152582a1dfc560b4dd80e1b7545237b65e6c89cb build_options="fortran root7" build_options_default="fortran" python_version=3 shlib_provides="libCore.so libTree.so libRIO.so libMatrix.so libThread.so libTMVA.so libMathCore.so" +case "$XBPS_TARGET_MACHINE" in + *-musl) + configure_args+=" -Dssl=OFF" + ;; +esac + case "$XBPS_TARGET_MACHINE" in i686*) configure_args+=" -DCMAKE_C_FLAGS=-g0 -DCMAKE_CXX_FLAGS=-g0" ;; esac diff --git a/srcpkgs/root/update b/srcpkgs/root/update index 14a1134144f..e6a583a6f1b 100644 --- a/srcpkgs/root/update +++ b/srcpkgs/root/update @@ -1 +1 @@ -ignore="*.win32*" +ignore="*.win32* *.win64*"