vtk: support Qt6

lib/spack/spack/database.py

@@ -778,7 +778,7 @@ def _assign_dependencies(
             spec_node_dict = spec_node_dict[spec.name]
         if "dependencies" in spec_node_dict:
             yaml_deps = spec_node_dict["dependencies"]
-            for dname, dhash, dtypes, _, virtuals, direct in spec_reader.read_specfile_dep_specs(
+            for dname, dhash, dtypes, _, virtuals in spec_reader.read_specfile_dep_specs(
                 yaml_deps
             ):
                 # It is important that we always check upstream installations in the same order,
@@ -797,9 +797,7 @@ def _assign_dependencies(
                     )
                     continue
 
-                spec._add_dependency(
+                spec._add_dependency(child, depflag=dt.canonicalize(dtypes), virtuals=virtuals)
-                    child, depflag=dt.canonicalize(dtypes), virtuals=virtuals, direct=direct
-                )
 
     def _read_from_file(self, filename: pathlib.Path, *, reindex: bool = False) -> None:
         """Fill database from file, do not maintain old data.

lib/spack/spack/environment/__init__.py

@@ -543,6 +543,7 @@
         },
       }
     }
+
 """
 
 from .environment import (

lib/spack/spack/environment/environment.py

@@ -2230,14 +2230,9 @@ def filter_specs(self, reader, json_specs_by_hash, order_concretized):
         # and add them to the spec, including build specs
         for lockfile_key, node_dict in json_specs_by_hash.items():
             name, data = reader.name_and_data(node_dict)
-            for _, dep_hash, deptypes, _, virtuals, direct in reader.dependencies_from_node_dict(
+            for _, dep_hash, deptypes, _, virtuals in reader.dependencies_from_node_dict(data):
-                data
-            ):
                 specs_by_hash[lockfile_key]._add_dependency(
-                    specs_by_hash[dep_hash],
+                    specs_by_hash[dep_hash], depflag=dt.canonicalize(deptypes), virtuals=virtuals
-                    depflag=dt.canonicalize(deptypes),
-                    virtuals=virtuals,
-                    direct=direct,
                 )
 
             if "build_spec" in node_dict:

lib/spack/spack/spec.py

@@ -2383,7 +2383,6 @@ def to_node_dict(self, hash=ht.dag_hash):
                     "parameters": {
                         "deptypes": dt.flag_to_tuple(dspec.depflag),
                         "virtuals": dspec.virtuals,
-                        "direct": dspec.direct,
                     },
                 }
                 for name, edges_for_name in sorted(deps.items())
@@ -4891,7 +4890,7 @@ def _load(cls, data):
 
         # Pass 0: Determine hash type
         for node in nodes:
-            for _, _, _, dhash_type, _, _ in cls.dependencies_from_node_dict(node):
+            for _, _, _, dhash_type, _ in cls.dependencies_from_node_dict(node):
                 any_deps = True
                 if dhash_type:
                     hash_type = dhash_type
@@ -4922,12 +4921,11 @@ def _load(cls, data):
         # Pass 2: Finish construction of all DAG edges (including build specs)
         for node_hash, node in hash_dict.items():
             node_spec = node["node_spec"]
-            for _, dhash, dtype, _, virtuals, direct in cls.dependencies_from_node_dict(node):
+            for _, dhash, dtype, _, virtuals in cls.dependencies_from_node_dict(node):
                 node_spec._add_dependency(
                     hash_dict[dhash]["node_spec"],
                     depflag=dt.canonicalize(dtype),
                     virtuals=virtuals,
-                    direct=direct,
                 )
             if "build_spec" in node.keys():
                 _, bhash, _ = cls.extract_build_spec_info_from_node_dict(node, hash_type=hash_type)
@@ -4968,9 +4966,9 @@ def load(cls, data):
         for node in nodes:
             # get dependency dict from the node.
             name, data = cls.name_and_data(node)
-            for dname, _, dtypes, _, virtuals, direct in cls.dependencies_from_node_dict(data):
+            for dname, _, dtypes, _, virtuals in cls.dependencies_from_node_dict(data):
                 deps[name]._add_dependency(
-                    deps[dname], depflag=dt.canonicalize(dtypes), virtuals=virtuals, direct=direct
+                    deps[dname], depflag=dt.canonicalize(dtypes), virtuals=virtuals
                 )
 
         reconstruct_virtuals_on_edges(result)
@@ -5008,7 +5006,7 @@ def read_specfile_dep_specs(cls, deps, hash_type=ht.dag_hash.name):
                     raise spack.error.SpecError("Couldn't parse dependency spec.")
             else:
                 raise spack.error.SpecError("Couldn't parse dependency types in spec.")
-            yield dep_name, dep_hash, list(deptypes), hash_type, list(virtuals), True
+            yield dep_name, dep_hash, list(deptypes), hash_type, list(virtuals)
 
 
 class SpecfileV2(SpecfileReaderBase):
@@ -5045,15 +5043,13 @@ def read_specfile_dep_specs(cls, deps, hash_type=ht.dag_hash.name):
                 # new format: elements of dependency spec are keyed.
                 for h in ht.HASHES:
                     if h.name in elt:
-                        dep_hash, deptypes, hash_type, virtuals, direct = (
+                        dep_hash, deptypes, hash_type, virtuals = cls.extract_info_from_dep(elt, h)
-                            cls.extract_info_from_dep(elt, h)
-                        )
                         break
                 else:  # We never determined a hash type...
                     raise spack.error.SpecError("Couldn't parse dependency spec.")
             else:
                 raise spack.error.SpecError("Couldn't parse dependency types in spec.")
-            result.append((dep_name, dep_hash, list(deptypes), hash_type, list(virtuals), direct))
+            result.append((dep_name, dep_hash, list(deptypes), hash_type, list(virtuals)))
         return result
 
     @classmethod
@@ -5061,8 +5057,7 @@ def extract_info_from_dep(cls, elt, hash):
         dep_hash, deptypes = elt[hash.name], elt["type"]
         hash_type = hash.name
         virtuals = []
-        direct = True
+        return dep_hash, deptypes, hash_type, virtuals
-        return dep_hash, deptypes, hash_type, virtuals, direct
 
     @classmethod
     def extract_build_spec_info_from_node_dict(cls, node, hash_type=ht.dag_hash.name):
@@ -5083,8 +5078,7 @@ def extract_info_from_dep(cls, elt, hash):
         deptypes = elt["parameters"]["deptypes"]
         hash_type = hash.name
         virtuals = elt["parameters"]["virtuals"]
-        direct = True
+        return dep_hash, deptypes, hash_type, virtuals
-        return dep_hash, deptypes, hash_type, virtuals, direct
 
     @classmethod
     def load(cls, data):
@@ -5098,15 +5092,6 @@ class SpecfileV5(SpecfileV4):
     def legacy_compiler(cls, node):
         raise RuntimeError("The 'compiler' option is unexpected in specfiles at v5 or greater")
 
-    @classmethod
-    def extract_info_from_dep(cls, elt, hash):
-        dep_hash = elt[hash.name]
-        deptypes = elt["parameters"]["deptypes"]
-        hash_type = hash.name
-        virtuals = elt["parameters"]["virtuals"]
-        direct = elt["parameters"].get("direct", True)
-        return dep_hash, deptypes, hash_type, virtuals, direct
-
 
 #: Alias to the latest version of specfiles
 SpecfileLatest = SpecfileV5

lib/spack/spack/test/spec_yaml.py

@@ -494,10 +494,6 @@ def test_anchorify_2():
         "hdf5~~mpi++shared",
         "hdf5 cflags==-g foo==bar cxxflags==-O3",
         "hdf5 cflags=-g foo==bar cxxflags==-O3",
-        "hdf5%gcc",
-        "hdf5%cmake",
-        "hdf5^gcc",
-        "hdf5^cmake",
     ],
 )
 def test_pickle_roundtrip_for_abstract_specs(spec_str):

var/spack/repos/spack_repo/builtin/packages/vtk/package.py

@@ -156,7 +156,13 @@ class Vtk(CMakePackage):
     depends_on("libxt", when="^[virtuals=gl] glx platform=linux")
 
     # VTK will need Qt5OpenGL, and qt needs '-opengl' for that
-    depends_on("qt+opengl", when="+qt")
+    depends_on("qmake", when="@9.1: +qt")
+    with when("^[virtuals=qmake] qt-base"):
+        depends_on("qt-base+opengl+widgets")
+        depends_on("qt-quick3d")
+    with when("^[virtuals=qmake] qt"):
+        depends_on("qt+opengl")
+    depends_on("qt+opengl", when="@:9.0 +qt")
 
     depends_on("boost", when="+xdmf")
     depends_on("boost+mpi", when="+xdmf +mpi")
@@ -380,8 +386,8 @@ def cmake_args(self):
             cmake_args.extend(["-DCMAKE_MACOSX_RPATH=ON"])
 
         if "+qt" in spec:
-            qt_ver = spec["qt"].version.up_to(1)
+            qt_ver = spec["qmake"].version.up_to(1)
-            qt_bin = spec["qt"].prefix.bin
+            qt_bin = spec["qmake"].prefix.bin
             qmake_exe = os.path.join(qt_bin, "qmake")
 
             # https://github.com/martijnkoopman/Qt-VTK-viewer/blob/master/doc/Build-VTK.md
@@ -406,7 +412,7 @@ def cmake_args(self):
             # NOTE: The following definitions are required in order to allow
             # VTK to build with qt~webkit versions (see the documentation for
             # more info: http://www.vtk.org/Wiki/VTK/Tutorials/QtSetup).
-            if "~webkit" in spec["qt"]:
+            if "~webkit" in spec["qmake"]:
                 if spec.satisfies("@:8"):
                     cmake_args.extend(
                         [