From 246ac7ced94f850c91830f2566bdff14374c83aa Mon Sep 17 00:00:00 2001 From: "Seth R. Johnson" Date: Fri, 11 Apr 2025 13:20:04 -0400 Subject: [PATCH] root: remove unnecessary patches (#50022) * root: 6.34 included this patch * ROOT: no need to patch unless +root7 +geom +webgui --- var/spack/repos/builtin/packages/root/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/var/spack/repos/builtin/packages/root/package.py b/var/spack/repos/builtin/packages/root/package.py index 61078203c14..30e58c4e847 100644 --- a/var/spack/repos/builtin/packages/root/package.py +++ b/var/spack/repos/builtin/packages/root/package.py @@ -179,7 +179,7 @@ class Root(CMakePackage): patch( "https://github.com/root-project/root/pull/15925.diff?full_index=1", sha256="1937290a4d54cd2e3e8a8d23d93b8dedaca9ed8dcfdcfa2f0d16629ff53fb3b7", - when="@6.28: +python", + when="@6.28:6.32 +python", ) # ###################### Variants ########################## @@ -505,6 +505,7 @@ class Root(CMakePackage): # See https://github.com/root-project/root/issues/11135 conflicts("+ipo", msg="LTO is not a supported configuration for building ROOT") + @when("+root7 +geom +webgui") def patch(self): filter_file( r"#include ",