From 3b6ca774e45da956ac3d5d4b8108be8b4ddf0620 Mon Sep 17 00:00:00 2001
From: Patrick Gartung <gartung@fnal.gov>
Date: Fri, 13 Oct 2023 09:38:48 -0500
Subject: [PATCH] Changes needed building on AL9 with gcc 13 and std20

---
 var/spack/repos/builtin/packages/catch2/package.py    | 5 +++++
 var/spack/repos/builtin/packages/davix/package.py     | 2 +-
 var/spack/repos/builtin/packages/grpc/package.py      | 2 +-
 var/spack/repos/builtin/packages/intel-tbb/package.py | 2 +-
 var/spack/repos/builtin/packages/jsoncpp/package.py   | 2 +-
 var/spack/repos/builtin/packages/py-sphinx/package.py | 1 +
 6 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/var/spack/repos/builtin/packages/catch2/package.py b/var/spack/repos/builtin/packages/catch2/package.py
index dd7b79e89c3d4e..38544312ad663a 100644
--- a/var/spack/repos/builtin/packages/catch2/package.py
+++ b/var/spack/repos/builtin/packages/catch2/package.py
@@ -116,6 +116,11 @@ class Catch2(CMakePackage):
         description="C++ standard",
     )
 
+    def patch(self):
+        filter_file(r'#include <vector>', '#include <vector>\n#include <cstdint>', 'src/catch2/internal/catch_string_manip.hpp')
+        filter_file(r'#include <vector>', '#include <vector>\n#include <cstdint>', 'src/catch2/internal/catch_xmlwriter.hpp')
+        filter_file(r'#include <vector>', '#include <vector>\n#include <cstdint>', 'src/catch2/catch_test_case_info.hpp')
+
     def cmake_args(self):
         spec = self.spec
         args = []
diff --git a/var/spack/repos/builtin/packages/davix/package.py b/var/spack/repos/builtin/packages/davix/package.py
index ea0eb7eb35dbc9..34a37b4386ea76 100644
--- a/var/spack/repos/builtin/packages/davix/package.py
+++ b/var/spack/repos/builtin/packages/davix/package.py
@@ -25,7 +25,7 @@ class Davix(CMakePackage):
     variant(
         "cxxstd",
         default="11",
-        values=("11", "14", "17"),
+        values=("11", "14", "17", "20"),
         multi=False,
         description="Use the specified C++ standard when building.",
     )
diff --git a/var/spack/repos/builtin/packages/grpc/package.py b/var/spack/repos/builtin/packages/grpc/package.py
index 4634941090a52b..67f5484c427576 100644
--- a/var/spack/repos/builtin/packages/grpc/package.py
+++ b/var/spack/repos/builtin/packages/grpc/package.py
@@ -50,7 +50,7 @@ class Grpc(CMakePackage):
     variant(
         "cxxstd",
         default="11",
-        values=("11", "14", "17"),
+        values=("11", "14", "17", "20"),
         multi=False,
         description="Use the specified C++ standard when building.",
     )
diff --git a/var/spack/repos/builtin/packages/intel-tbb/package.py b/var/spack/repos/builtin/packages/intel-tbb/package.py
index 45761c7a06fcc3..664471b0ecf3d6 100644
--- a/var/spack/repos/builtin/packages/intel-tbb/package.py
+++ b/var/spack/repos/builtin/packages/intel-tbb/package.py
@@ -103,7 +103,7 @@ class IntelTbb(CMakePackage, MakefilePackage):
     variant(
         "cxxstd",
         default="default",
-        values=("default", "98", "11", "14", "17"),
+        values=("default", "98", "11", "14", "17", "20"),
         multi=False,
         description="Use the specified C++ standard when building.",
     )
diff --git a/var/spack/repos/builtin/packages/jsoncpp/package.py b/var/spack/repos/builtin/packages/jsoncpp/package.py
index b5eff5150d7e75..a6086bdcc57912 100644
--- a/var/spack/repos/builtin/packages/jsoncpp/package.py
+++ b/var/spack/repos/builtin/packages/jsoncpp/package.py
@@ -43,7 +43,7 @@ class Jsoncpp(CMakePackage):
     variant(
         "cxxstd",
         default="default",
-        values=("default", "98", "11", "14", "17"),
+        values=("default", "98", "11", "14", "17", "20"),
         multi=False,
         description="Use the specified C++ standard when building.",
     )
diff --git a/var/spack/repos/builtin/packages/py-sphinx/package.py b/var/spack/repos/builtin/packages/py-sphinx/package.py
index 9b0e1eb323070a..f7e445ddf35de7 100644
--- a/var/spack/repos/builtin/packages/py-sphinx/package.py
+++ b/var/spack/repos/builtin/packages/py-sphinx/package.py
@@ -14,6 +14,7 @@ class PySphinx(PythonPackage):
 
     maintainers("adamjstewart")
 
+    version("7.2.6", sha256="9a5160e1ea90688d5963ba09a2dcd8bdd526620edbb65c328728f1b2228d5ab5")
     version("7.2.3", sha256="ece68bb4d77b7dc090573825db45a6f9183e74098d1c21573485de250b1d1e3f")
     version("7.2.2", sha256="1c0abe6d4de7a6b2c2b109a2e18387bf27b240742e1b34ea42ac3ed2ac99978c")
     version("7.2.1", sha256="dad5e865dcdeb1486f70d8963cc9140561836bb243c311868cf11eb0f741497a")