From c87cc5c7b1165b8032f711a26ea123af67a14a42 Mon Sep 17 00:00:00 2001
From: Andrew W Elble <aweits@rit.edu>
Date: Fri, 28 Apr 2023 06:25:28 -0400
Subject: [PATCH] kicad: new version 7.0.2 (#37228)

---
 .../repos/builtin/packages/kicad/package.py   | 21 ++++++++++++++++++-
 .../repos/builtin/packages/ngspice/package.py |  3 +++
 .../builtin/packages/wxwidgets/package.py     |  2 ++
 3 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/var/spack/repos/builtin/packages/kicad/package.py b/var/spack/repos/builtin/packages/kicad/package.py
index ccb87d19a9..f6e5906126 100644
--- a/var/spack/repos/builtin/packages/kicad/package.py
+++ b/var/spack/repos/builtin/packages/kicad/package.py
@@ -16,6 +16,7 @@ class Kicad(CMakePackage):
     url = "https://gitlab.com/kicad/code/kicad/-/archive/5.1.8/kicad-5.1.8.tar.gz"
     maintainers("aweits")
 
+    version("7.0.2", sha256="8df56648226061c91ddd1d2ca970c66190fc70c7ace23c99cc28c209713e4dfc")
     version("5.1.9", sha256="841be864b9dc5c761193c3ee9cbdbed6729952d7b38451aa8e1977bdfdb6081b")
     version("5.1.8", sha256="bf24f8ef427b4a989479b8e4af0b8ae5c54766755f12748e2e88a922c5344ca4")
 
@@ -32,7 +33,9 @@ class Kicad(CMakePackage):
     # for instance depends_on('boost +filesystem')
     # See https://github.com/spack/spack/pull/22303 for reference
     depends_on(Boost.with_default_variants)
-    depends_on("oce+X11")
+    depends_on("oce+X11", when="@5")
+    depends_on("opencascade", when="@7:")
+    depends_on("unixodbc", when="@7:")
     depends_on("swig", type="build")
     depends_on("curl")
     depends_on("pkgconfig")
@@ -70,6 +73,18 @@ class Kicad(CMakePackage):
         ),
         ("5.1.9", "symbols", "6741a7b01f14f1f5aae3155a554816516cf02ce7790074ba8462dee8091f8c2f"),
         ("5.1.9", "templates", "bacf93567f8efe87314762448bb69698c8ed387058c13868c051c91740014aac"),
+        (
+            "7.0.2",
+            "footprints",
+            "81ba4e1a48a4a741e3860d2e6b305a1002aea41c9ce168db13f9c7650198e374",
+        ),
+        (
+            "7.0.2",
+            "packages3D",
+            "a436414b9466db3aacfbe3efedfc784bcec2d2839789234fc65414069a9e470d",
+        ),
+        ("7.0.2", "symbols", "d0f9aed81172e14da899d90e2ead6ef8c4d515da3a3847a26bab22db4a7e4528"),
+        ("7.0.2", "templates", "2ca6de284aa6d1567173d3d5ef10bb7f416cc919b7a9cae438ebb36ced15df74"),
     ]
 
     for ver, lib, checksum in resource_list:
@@ -99,6 +114,10 @@ def cmake_args(self):
         args = []
         args.append("-DKICAD_SCRIPTING_PYTHON3=ON")
         args.append("-DKICAD_SCRIPTING_WXPYTHON=OFF")
+        if self.spec.satisfies("^opencascade"):
+            args.append(
+                "-DOCC_INCLUDE_DIR={0}".format(self.spec["opencascade"].prefix.include.opencascade)
+            )
         return args
 
     @run_after("install")
diff --git a/var/spack/repos/builtin/packages/ngspice/package.py b/var/spack/repos/builtin/packages/ngspice/package.py
index 3cbc03fe3e..c826b24052 100644
--- a/var/spack/repos/builtin/packages/ngspice/package.py
+++ b/var/spack/repos/builtin/packages/ngspice/package.py
@@ -18,6 +18,9 @@ class Ngspice(AutotoolsPackage):
 
     # Master version by default adds the experimental adms feature
     version("master", branch="master")
+    version("40", sha256="e303ca7bc0f594e2d6aa84f68785423e6bf0c8dad009bb20be4d5742588e890d")
+    version("39", sha256="bf94e811eaad8aaf05821d036a9eb5f8a65d21d30e1cab12701885e09618d771")
+    version("38", sha256="2c3e22f6c47b165db241cf355371a0a7558540ab2af3f8b5eedeeb289a317c56")
     version("37", sha256="9beea6741a36a36a70f3152a36c82b728ee124c59a495312796376b30c8becbe")
     version("34", sha256="2263fffc6694754972af7072ef01cfe62ac790800dad651bc290bfcae79bd7b5")
     version("33", sha256="b99db66cc1c57c44e9af1ef6ccb1dcbc8ae1df3e35acf570af578f606f8541f1")
diff --git a/var/spack/repos/builtin/packages/wxwidgets/package.py b/var/spack/repos/builtin/packages/wxwidgets/package.py
index ae4abbf136..44af2e3519 100644
--- a/var/spack/repos/builtin/packages/wxwidgets/package.py
+++ b/var/spack/repos/builtin/packages/wxwidgets/package.py
@@ -23,6 +23,8 @@ class Wxwidgets(AutotoolsPackage):
     git = "https://github.com/wxWidgets/wxWidgets.git"
 
     version("develop", branch="master")
+    version("3.2.2.1", sha256="dffcb6be71296fff4b7f8840eb1b510178f57aa2eb236b20da41182009242c02")
+    version("3.2.2", sha256="8edf18672b7bc0996ee6b7caa2bee017a9be604aad1ee471e243df7471f5db5d")
     version("3.1.0", sha256="e082460fb6bf14b7dd6e8ac142598d1d3d0b08a7b5ba402fdbf8711da7e66da8")
     version("3.0.2", sha256="346879dc554f3ab8d6da2704f651ecb504a22e9d31c17ef5449b129ed711585d")
     version("3.0.1", sha256="bd671b79ec56af8fb3844e11cafceac1a4276fb02c79404d06b91b6c19d2c5f5")