From 5640057fbb87c5758a57a55239e40774c21d3c96 Mon Sep 17 00:00:00 2001
From: Juan Miguel Carceller <22276694+jmcarcell@users.noreply.github.com>
Date: Fri, 23 Aug 2024 11:16:45 +0200
Subject: [PATCH] Changes for the new nightlies (#622)

---
 .cherry-pick                              | 34 +++++++++++++----------
 .latest-commit                            |  2 +-
 environments/key4hep-common/packages.yaml |  6 ++--
 scripts/run_usability_tests.sh            |  2 +-
 4 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/.cherry-pick b/.cherry-pick
index a5c750e3..ee8c94bb 100644
--- a/.cherry-pick
+++ b/.cherry-pick
@@ -10,9 +10,6 @@ git cherry-pick f97fabc3ff12527e5220ea6917719a73f8bd4315 -X theirs --no-commit
 # podio: add rpath, remove when https://github.com/spack/spack/pull/42844 is merged
 git cherry-pick 4d3b81d73b9dcbbe176d6baf3c00a4032307f6a8 -X theirs --no-commit
 
-# py-onnxruntime: Install the session headers, needed by FCCAnalyses, check if needed
-# git cherry-pick e272ffa5a4768d23f1579403f9872360630e7278 -X theirs --no-commit
-
 # geant4 twisted tubes: remove when https://github.com/spack/spack/pull/45368 is merged or after 11.2.2
 # curl -s https://patch-diff.githubusercontent.com/raw/spack/spack/pull/45368.diff | patch -p1
 
@@ -22,29 +19,38 @@ git cherry-pick 4d3b81d73b9dcbbe176d6baf3c00a4032307f6a8 -X theirs --no-commit
 # Both geant4 changes in a single commit
 git cherry-pick c8191268c3ea4aca6e870ad40d695e92f94d0e47 -X theirs --no-commit
 
-# sherpa v3: remove when https://github.com/spack/spack/pull/45101 is merged
+# sherpa v3: remove!
 curl -s https://patch-diff.githubusercontent.com/raw/spack/spack/pull/45101.diff | patch -p1
 
-# root: fix TUri for 6.32, remove!
-curl -s https://patch-diff.githubusercontent.com/raw/spack/spack/pull/45428.diff | patch -p1
-
 # gaudi: use fmt 10 for now, remove!
 # remember to fix the range before v40
-curl -s https://patch-diff.githubusercontent.com/raw/spack/spack/pull/45466.diff | patch -p1
 
 # py-onnx: make sure py-setuptools 64 and onwards is used for editable_mode
 git cherry-pick a8c4b3a03f0988cc201580f979980d61d3d5e417 -X theirs --no-commit
 
-# acts: add a dependency on dfelibs, remove when https://github.com/spack/spack/pull/45498 is merged
-curl -s https://patch-diff.githubusercontent.com/raw/spack/spack/pull/45498.diff | patch -p1
+# xrootd: don't download from SLAC until the certificate issue is solved
+git cherry-pick afcd8b32383b1425062b25126890e12338d70e36 -X theirs --no-commit
 
-# groff: add a dependency on m4, remove!
-git cherry-pick c471e510dde3c23d3f586d1fa8b66e934513ce43 -X theirs --no-commit
+# root: Add version 6.32.04, remove!
+git cherry-pick b6a5e4f8eb6276a68d7d42cf14812397cf6d2743 -X theirs --no-commit
 
-# xrootd: change the certificate url until the issue is solved
-git cherry-pick afcd8b32383b1425062b25126890e12338d70e36 -X theirs --no-commit
+# acts: Add versions 36.0.0 and 36.1.0, remove when https://github.com/spack/spack/pull/45851 is merged
+git cherry-pick 5bab73925c6da457f2fdf5c7d8fbeb14ff6e2986 -X theirs --no-commit
+
+# sleef: Add the -fPIC flag
+git cherry-pick f4b2c42028405591cf44a2c5910840e894144f67 -X theirs --no-commit
+
+# poppler: fix URL, remove!
+git cherry-pick 8becc0ca3c86f1fa26593909da03effbc665c31c -X theirs --no-commit
+
+# texlive: clean up recipe, remove when https://github.com/spack/spack/pull/45863 is merged
+# git cherry-pick 4ab7f72041d49f947230df2aa6426b6e39069a3a -X theirs --no-commit
 
+# whizard: add fix for hepmc3 3.3.10 or above, remove when https://github.com/spack/spack/pull/45862 is merged
+curl -s https://patch-diff.githubusercontent.com/raw/spack/spack/pull/45862.diff | patch -p1
 
+# dd4hep: add patch not to install plugins at CMAKE_INSTALL_LIBDIR
+git cherry-pick 6cb6f338d869de7b29d672083f15bfd2aefd2d45 -X theirs --no-commit
 
 if [[ "$(grep -E '^ID=' /etc/os-release)" = 'ID=ubuntu' && "$(grep -E 'VERSION_ID' /etc/os-release)" = 'VERSION_ID="22.04"' ]]; then
 
diff --git a/.latest-commit b/.latest-commit
index e7836071..b87dfbf7 100644
--- a/.latest-commit
+++ b/.latest-commit
@@ -1 +1 @@
-4917e3f664cc5120c16fd45919e9ca1fe8ce9c39
\ No newline at end of file
+f596a8cdad601bb226723c551624d86abe3a6237
\ No newline at end of file
diff --git a/environments/key4hep-common/packages.yaml b/environments/key4hep-common/packages.yaml
index ab4b576a..5fd5dd7d 100644
--- a/environments/key4hep-common/packages.yaml
+++ b/environments/key4hep-common/packages.yaml
@@ -24,7 +24,7 @@ packages:
   hdf5:
     require: +cxx+hl
   hepmc3:
-    require: +python
+    require: +python+rootio
   # https://github.com/key4hep/key4hep-spack/issues/517
   lccd:
     require: +conddbmysql
@@ -44,8 +44,6 @@ packages:
   # Requested by Thomas Madlener for DESY, without CUDA and before v2
   py-torch:
     require: ~cuda
-  texlive:
-    require: scheme=basic
   xrootd:
     require: +krb5 cxxstd=20
 
@@ -88,7 +86,7 @@ packages:
 
   # The version seems to be necessary, otherwise it defaults to an older version
   root:
-    require: '@6.32: +davix+fftw+gsl+math+minuit+mlp+opengl~postgres+pythia8+python+r+roofit+root7+rpath~shadow+sqlite+ssl+tbb+threads+tmva+tmva-cpu+unuran+vc+vdt+x+xml+xrootd cxxstd=20'
+    require: '@6.32: +davix+fftw+gsl+math+minuit+mlp+opengl~postgres~pythia8+python+r+roofit+root7+rpath~shadow+sqlite+ssl+tbb+threads+tmva+tmva-cpu+unuran+vc+vdt+x+xml+xrootd cxxstd=20'
   py-tensorflow:
     require: ~cuda~nccl
   k4simdelphes:
diff --git a/scripts/run_usability_tests.sh b/scripts/run_usability_tests.sh
index 20b73572..a2bd8a7d 100755
--- a/scripts/run_usability_tests.sh
+++ b/scripts/run_usability_tests.sh
@@ -33,7 +33,7 @@ int main() {
 }
 EOF
 run_test "c++ test" "g++ -o hello hello.cpp && ./hello"
-run_test "c++17 test" "g++ -std=c++17 -o hello hello.cpp && ./hello"
+run_test "c++20 test" "g++ -std=c++20 -o hello hello.cpp && ./hello"
 cat <<EOF > hello.f
       program hello
       print *, "Hello, world!"