Paraview 6 updates

repos/spack_repo/builtin/build_systems/cmake.py

@@ -60,6 +60,13 @@ def _maybe_set_python_hints(pkg: PackageBase, args: List[str]) -> None:
     )
 
 
+def _dependencies_cmake_extra_args(pkg: PackageBase, args: List[str]) -> None:
+    for dep in pkg.spec.traverse(deptype=("build", "link")):
+        extra_args = getattr(dep.package, "cmake_extra_args", None)
+        if extra_args:
+            args.extend(extra_args)
+
+
 def _supports_compilation_databases(pkg: PackageBase) -> bool:
     """Check if this package (and CMake) can support compilation databases."""
 
@@ -406,6 +413,7 @@ def std_args(pkg: PackageBase, generator: Optional[str] = None) -> List[str]:
 
         _conditional_cmake_defaults(pkg, args)
         _maybe_set_python_hints(pkg, args)
+        _dependencies_cmake_extra_args(pkg, args)
 
         return args
 

repos/spack_repo/builtin/packages/apple_glu/package.py

@@ -14,3 +14,8 @@ class AppleGlu(AppleGlBase):
     provides("glu@1.3")
 
     requires("platform=darwin", msg="Apple-GL is only available on Darwin")
+
+    def setup_dependent_build_environment(
+        self, env: EnvironmentModifications, dependent_spec: Spec
+    ):
+        env.prepend_path("OpenGL_ROOT", self.prefix)

repos/spack_repo/builtin/packages/at_spi2_core/package.py

@@ -42,6 +42,7 @@ class AtSpi2Core(MesonPackage):
     depends_on("libxi")
     depends_on("libxml2", type="build", when="@2.47:")
     depends_on("libxtst")
+    depends_on("libxml2")
     depends_on("recordproto")
     depends_on("inputproto")
     depends_on("fixesproto")

repos/spack_repo/builtin/packages/cairo/package.py

@@ -143,7 +143,7 @@ class Cairo(AutotoolsPackage, MesonPackage):
     # patch from https://gitlab.freedesktop.org/cairo/cairo/issues/346
     patch("fontconfig.patch", when="@1.16.0:1.17.2")
     # Don't regenerate docs to avoid a dependency on gtk-doc
-    patch("disable-gtk-docs.patch", when="build_system=autotools ^autoconf@2.70:")
+    patch("disable-gtk-docs.patch", when="build_system=autotools")
 
 
 class MesonBuilder(meson.MesonBuilder):

repos/spack_repo/builtin/packages/glx/package.py

@@ -14,9 +14,18 @@ class Glx(BundlePackage):
 
     version("1.4")
 
+    # GLX is only supported on Linux-like platforms
+    conflicts("platform=windows")
+    conflicts("platform=darwin")
+
     depends_on("libglx")
     provides("gl@4.5")
 
+    def setup_dependent_build_environment(
+        self, env: EnvironmentModifications, dependent_spec: Spec
+    ):
+        env.prepend_path("OpenGL_ROOT", self.home)
+
     @property
     def home(self):
         return self.spec["libglx"].home

repos/spack_repo/builtin/packages/libproxy/package.py

@@ -56,12 +56,13 @@ class Libproxy(CMakePackage, MesonPackage):
     extends("python", when="+python")
 
     def setup_run_environment(self, env: EnvironmentModifications) -> None:
-        if self.spec.satisfies("+python"):
-            libs = self.spec["libproxy"].libs.directories[0]
-            if self.spec.satisfies("platform=darwin"):
-                env.prepend_path("DYLD_FALLBACK_LIBRARY_PATH", libs)
-            else:
-                env.prepend_path("LD_LIBRARY_PATH", libs)
+        libs = self.spec["libproxy"].libs.directories[0]
+        if self.spec.satisfies("platform=darwin"):
+            env.prepend_path("DYLD_FALLBACK_LIBRARY_PATH", join_path(libs, "libproxy"))
+            env.prepend_path("DYLD_FALLBACK_LIBRARY_PATH", libs)
+        else:
+            env.prepend_path("LD_LIBRARY_PATH", join_path(libs, "libproxy"))
+            env.prepend_path("LD_LIBRARY_PATH", libs)
 
 
 class CMakeBuilder(cmake.CMakeBuilder):

repos/spack_repo/builtin/packages/libxslt/package.py

@@ -2,12 +2,13 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack_repo.builtin.build_systems.autotools import AutotoolsPackage
+from spack_repo.builtin.build_systems.autotools import AutotoolsBuilder, AutotoolsPackage
+from spack_repo.builtin.build_systems.cmake import CMakeBuilder, CMakePackage
 
 from spack.package import *
 
 
-class Libxslt(AutotoolsPackage):
+class Libxslt(CMakePackage, AutotoolsPackage):
     """Libxslt is the XSLT C library developed for the GNOME project. XSLT
     itself is a an XML language to define transformation for XML. Libxslt is
     based on libxml2 the XML C library developed for the GNOME project. It also
@@ -22,6 +23,8 @@ class Libxslt(AutotoolsPackage):
 
     license("X11", checked_by="wdconinc")
 
+    build_system(conditional("cmake", when="@1.1.35:"), "autotools", default="cmake")
+
     version("1.1.42", sha256="85ca62cac0d41fc77d3f6033da9df6fd73d20ea2fc18b0a3609ffb4110e1baeb")
     version("1.1.41", sha256="3ad392af91115b7740f7b50d228cc1c5fc13afc1da7f16cb0213917a37f71bda")
     version("1.1.40", sha256="194715db023035f65fb566402f2ad2b5eab4c29d541f511305c40b29b1f48d13")
@@ -48,7 +51,9 @@ class Libxslt(AutotoolsPackage):
     depends_on("libxml2+python", when="+python")
     depends_on("xz")
     depends_on("zlib-api")
+
     depends_on("libgcrypt", when="+crypto")
+    conflicts("+crypto", when="platform=windows")
 
     depends_on("python+shared", when="+python")
     extends("python", when="+python")
@@ -59,6 +64,20 @@ def url_for_version(self, v):
         else:
             return f"http://xmlsoft.org/sources/libxslt-{v}.tar.gz"
 
+    @run_after("install")
+    @on_package_attributes(run_tests=True)
+    def import_module_test(self):
+        if self.spec.satisfies("+python"):
+            with working_dir("spack-test", create=True):
+                python("-c", "import libxslt")
+
+    def patch(self):
+        # Remove flags not recognized by the NVIDIA compiler
+        if self.spec.satisfies("build_system=autotools %nvhpc"):
+            filter_file("-Wmissing-format-attribute", "", "configure")
+
+
+class AutotoolsBuilder(AutotoolsBuilder):
     def configure_args(self):
         args = []
 
@@ -74,14 +93,12 @@ def configure_args(self):
 
         return args
 
-    @run_after("install")
-    @on_package_attributes(run_tests=True)
-    def import_module_test(self):
-        if self.spec.satisfies("+python"):
-            with working_dir("spack-test", create=True):
-                python("-c", "import libxslt")
 
-    def patch(self):
-        # Remove flags not recognized by the NVIDIA compiler
-        if self.spec.satisfies("%nvhpc"):
-            filter_file("-Wmissing-format-attribute", "", "configure")
+class CMakeBuilder(CMakeBuilder):
+    def cmake_args(self):
+        return [
+            self.define_from_variant("LIBXSLT_WITH_PYTHON", "python"),
+            self.define_from_variant("LIBXSLT_WITH_CRYPTO", "crypto"),
+            self.define("DLIBXSLT_WITH_MODULES", False),
+            self.define("DLIBXSLT_WITH_TESTS", False),
+        ]

repos/spack_repo/builtin/packages/mesa/package.py

@@ -176,6 +176,10 @@ def flag_handler(self, name, flags):
                 flags.append("-std=c99")
         return super().flag_handler(name, flags)
 
+    @property
+    def cmake_extra_args(self):
+        return ["-DOpenGL_GL_PREFERENCE:STRING=LEGACY"]
+
     @property
     def libglx_headers(self):
         return find_headers("GL/glx", root=self.spec.prefix.include, recursive=False)

repos/spack_repo/builtin/packages/mesa_glu/package.py

@@ -26,6 +26,11 @@ class MesaGlu(AutotoolsPackage):
     # patch switches all instances of register long to long to fix this.
     patch("register-long.patch")
 
+    def setup_dependent_build_environment(
+        self, env: EnvironmentModifications, dependent_spec: Spec
+    ):
+        env.prepend_path("OpenGL_ROOT", self.prefix)
+
     def configure_args(self):
         args = ["--disable-libglvnd"]
 

repos/spack_repo/builtin/packages/openglu/package.py

@@ -64,6 +64,11 @@ def fetcher(self):
     def fetcher(self):
         _ = self.fetcher
 
+    def setup_dependent_build_environment(
+        self, env: EnvironmentModifications, dependent_spec: Spec
+    ):
+        env.prepend_path("OpenGL_ROOT", self.prefix)
+
     @property
     def libs(self):
         return find_libraries("libGLU", self.prefix, shared=True, recursive=True)