kicad 5.1.10

6 files changed, 47 insertions, 10 deletions

diff --git a/graphics/kicad/BUILD b/graphics/kicad/BUILD
index e013b8d866..128ebd0022 100755
--- a/graphics/kicad/BUILD
+++ b/graphics/kicad/BUILD
@@ -1 +1,8 @@
+# XXX workaround for linking issue with GCC 11
+case "$HOST" in
+  (*-musl)
+    CXXFLAGS+=' -static-libstdc++'
+    ;;
+esac &&
+OPTS+=' -DKICAD_USE_OCE=OFF' &&
 cmake_build
diff --git a/graphics/kicad/DEPENDS b/graphics/kicad/DEPENDS
index 96f2f3aae6..61b24f62e2 100755
--- a/graphics/kicad/DEPENDS
+++ b/graphics/kicad/DEPENDS
@@ -1,4 +1,28 @@
+depends cmake &&
 depends WXWIDGET &&
+depends OPENGL &&
+depends glew &&
+depends glm &&
+depends curl &&
+depends cairo &&
+depends pixman &&
 depends boost -DKICAD_SKIP_BOOST=1 &&
+depends swig &&
 depends zlib  &&
-suggest_depends kicad-library "" "" "provides example modules"
+suggest_depends kicad-library "" "" "provides example modules" &&
+optional_depends ngspice \
+		 -DKICAD_SPICE={ON,OFF} \
+		 'for SPICE simulation' &&
+optional_depends occt \
+		 -DKICAD_USE_OCC={ON,OFF} \
+		 'for 3D STEP models' &&
+optional_depends python3 \
+		 -DKICAD_SCRIPTING_PYTHON3=ON \
+		 -DKICAD_SCRIPTING=OFF \
+		 'for Python scripting' &&
+if is_depends_enabled "$SPELL" python3; then
+  optional_depends wxpython \
+		   -DKICAD_SCRIPTING_WXPYTHON_PHOENIX=ON \
+		   -DKICAD_SCRIPTING_WXPYTHON=OFF \
+		   'for Python scripting of the GUI'
+fi
diff --git a/graphics/kicad/DETAILS b/graphics/kicad/DETAILS
index b888509c33..0411f9bac4 100755
--- a/graphics/kicad/DETAILS
+++ b/graphics/kicad/DETAILS
@@ -1,8 +1,8 @@
            SPELL=kicad
-         VERSION=4.0.7
-     SOURCE_HASH=sha512:7b2acd9efadf5d48565f71bd0df2474ecc8fc04145953c13ac27363d48dbe6b0de091e311713635f603aed89ce0759a1d623abb37a139e2c87184ca4e717145b
-          SOURCE="$SPELL-$VERSION.tar.xz"
-   SOURCE_URL[0]=https://launchpad.net/$SPELL/${VERSION%.*}/$VERSION/+download/$SOURCE
+         VERSION=5.1.10
+     SOURCE_HASH=sha512:3b97279bfe7e2f45e07d347317f1b4cf9eb604331a6383916c87415354da665c80b567d031bda123445ea100ae12075f01d112b473b45516e3aa4d79d1841fa0
+          SOURCE="$SPELL-$VERSION.tar.bz2"
+   SOURCE_URL[0]="https://gitlab.com/kicad/code/kicad/-/archive/$VERSION/$SOURCE"
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
         WEB_SITE="http://kicad-pcb.org/"
       LICENSE[0]=GPL
diff --git a/graphics/kicad/HISTORY b/graphics/kicad/HISTORY
index 44b1415173..b8238d8a0f 100644
--- a/graphics/kicad/HISTORY
+++ b/graphics/kicad/HISTORY
@@ -1,3 +1,9 @@
+2021-05-05 Ismael Luceno <ismael@sourcemage.org>
+	* DETAILS, PRE_BUILD: updated spell to 5.1.10
+	* boost-1.61.patch.gz: removed, no longer needed
+	* BUILD, DEPENDS: updated dependencies
+	* BUILD: Workaround linking issue with GCC 11 on musl
+
 2017-11-22 Ismael Luceno <ismael@sourcemage.org>
 	* DETAILS: updated spell to 4.0.7.
 	  updated WEB_SITE and SOURCE_URL.
diff --git a/graphics/kicad/PRE_BUILD b/graphics/kicad/PRE_BUILD
index dc4b5f9077..f30359b7a9 100755
--- a/graphics/kicad/PRE_BUILD
+++ b/graphics/kicad/PRE_BUILD
@@ -1,12 +1,12 @@
 default_pre_build &&
 cd "$SOURCE_DIRECTORY" &&
 
-# Patch to build against Boost 1.61+
-zcat "$SPELL_DIRECTORY/boost-1.61.patch.gz" | patch -fp1
-
 # Remove dependency on advanced regexps, allows building against wxgtk* with
 # external PCRE, plus it's not really useful.
 sed -i 's/wxRE_ADVANCED/wxRE_EXTENDED/' \
-      eeschema/class_netlist_object.cpp \
-      pcbnew/dialogs/dialog_fp_lib_table.cpp \
+      common/eda_pattern_match.cpp \
+      eeschema/dialogs/panel_sym_lib_table.cpp \
+      eeschema/netlist_exporters/netlist_exporter_pspice.cpp \
+      eeschema/netlist_object.cpp \
+      pcbnew/dialogs/panel_fp_lib_table.cpp \
       pcbnew/netlist_reader.cpp
diff --git a/graphics/kicad/boost-1.61.patch.gz b/graphics/kicad/boost-1.61.patch.gz
deleted file mode 100644
index 064a5fc736..0000000000
--- a/graphics/kicad/boost-1.61.patch.gz
+++ /dev/null