From 7db09410e997a8edc6c7d017a2b34b72cf8aff55 Mon Sep 17 00:00:00 2001
From: mid-kid <esteve.varela@gmail.com>
Date: Thu, 26 Jul 2018 11:36:15 +0200
Subject: [PATCH] Upgrade kicad

---
 satellites/kicad-footprints.sat | 11 -----------
 satellites/kicad-library.sat    | 21 ++++++++++++++++-----
 satellites/kicad.sat            | 12 ++++++++----
 satellites/ngspice.sat          | 18 ++++++++++++++++++
 satellites/waf.sat              |  4 ++--
 satellites/wxwidgets.sat        |  2 +-
 6 files changed, 45 insertions(+), 23 deletions(-)
 delete mode 100644 satellites/kicad-footprints.sat
 create mode 100644 satellites/ngspice.sat

diff --git a/satellites/kicad-footprints.sat b/satellites/kicad-footprints.sat
deleted file mode 100644
index d5d6162..0000000
--- a/satellites/kicad-footprints.sat
+++ /dev/null
@@ -1,11 +0,0 @@
-name=kicad
-version=4.0.7
-
-dlextract "http://downloads.kicad-pcb.org/libraries/$name-footprints-$version.tar.gz" \
-          '280b065c34ca9ea225772893e84c65cc'
-_
-
-mkdir -p "$dir_install/$dir_prefix/$dir_data/kicad"
-cp -aT "$name-footprints-$version" "$dir_install/$dir_prefix/$dir_data/kicad/footprints"
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/kicad-library.sat b/satellites/kicad-library.sat
index 3e6469b..5fe624d 100644
--- a/satellites/kicad-library.sat
+++ b/satellites/kicad-library.sat
@@ -1,13 +1,24 @@
 import 'compile/cmake'
 
 name=kicad
-version=4.0.7
+version=5.0.0
 
-dlextract "http://downloads.kicad-pcb.org/libraries/$name-library-$version.tar.gz" \
-          'b8517ed459d1f9d73a85b0a79691df29'
+dlextract "https://github.com/KiCad/$name-symbols/archive/$version/$name-symbols-$version.tar.gz" \
+          '03cb33312062571118a277bafd01c06d'
+dlextract "https://github.com/KiCad/$name-footprints/archive/$version/$name-footprints-$version.tar.gz" \
+          'e8ce40c47b108280d7878f858899ab10'
+dlextract "https://github.com/KiCad/$name-packages3D/archive/$version/$name-packages3D-$version.tar.gz" \
+          'aac66499bbbd9f21ad3e90af7ba854d2'
 _
 
-cd "$name-library-$version"
-compile_cmake
+( cd "$name-symbols-$version"
+    compile_cmake
+)
+( cd "$name-footprints-$version"
+    compile_cmake
+)
+( cd "$name-packages3D-$version"
+    compile_cmake
+)
 
 # vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/kicad.sat b/satellites/kicad.sat
index 75f4071..a7dbf90 100644
--- a/satellites/kicad.sat
+++ b/satellites/kicad.sat
@@ -1,14 +1,18 @@
 import 'compile/cmake'
 
 name=kicad
-majver=4.0
-version=$majver.7
+majver=5.0
+version=$majver.0
 
 dlextract "https://launchpad.net/$name/$majver/$version/+download/$name-$version.tar.xz" \
-          'af3ee2e40c25f1c01b92cd27c1a1b180'
+          '99a39910a3f7d8320b605bb9a9ff3af8'
 _
 
 cd "$name-$version"
-compile_cmake -- -DKICAD_SKIP_BOOST=ON
+compile_cmake -- \
+    -DKICAD_USE_OCE=OFF \
+    -DKICAD_SCRIPTING_WXPYTHON=OFF
+# Disabled WxPython until Phoenix is supported...
+# It's not worth it to downgrade WxWidgets just to be able use non-existing scripts for an old library on a now unsupported version of python.
 
 # vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/ngspice.sat b/satellites/ngspice.sat
new file mode 100644
index 0000000..d81f671
--- /dev/null
+++ b/satellites/ngspice.sat
@@ -0,0 +1,18 @@
+import 'compile/configure'
+
+name=ngspice
+version=28
+
+dlextract "https://sourceforge.net/projects/ngspice/files/ng-spice-rework/$version/$name-$version.tar.gz" \
+          '5ee9c0a5f52d69ae20b8ef9b46608769'
+_
+
+cd "$name-$version"
+compile_configure -- \
+    --with-readline=yes \
+    --with-ngshared \
+    --enable-xspice \
+    --enable-cider \
+    --enable-openmp
+
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/waf.sat b/satellites/waf.sat
index e1a89a9..ff5be95 100644
--- a/satellites/waf.sat
+++ b/satellites/waf.sat
@@ -1,10 +1,10 @@
 import 'compile/waf'
 
 name=waf
-version=1.9.12
+version=2.0.9
 
 dlextract "https://waf.io/$name-$version.tar.bz2" \
-          '601d7f5d92c9366f1196c2dfa32dee76'
+          'ae4225757cb0611b408856ea99b9a901'
 _
 
 cd "$name-$version"
diff --git a/satellites/wxwidgets.sat b/satellites/wxwidgets.sat
index 01f196d..be9a43c 100644
--- a/satellites/wxwidgets.sat
+++ b/satellites/wxwidgets.sat
@@ -8,6 +8,6 @@ dlextract "https://github.com/$name/$name/releases/download/v$version/$name-$ver
 _
 
 cd "$name-$version"
-compile_configure
+compile_configure -- --with-gtk=2
 
 # vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab: