Update kicad-*devel ports

Enable spice

6 files changed, 19 insertions, 33 deletions

diff --git a/cad/kicad-devel/Makefile b/cad/kicad-devel/Makefile
index 7cb120b0e1db..ae0415800ee0 100644
--- a/cad/kicad-devel/Makefile
+++ b/cad/kicad-devel/Makefile
@@ -16,6 +16,9 @@ LICENSE=	GPLv3
 BUILD_DEPENDS=	${LOCALBASE}/include/glm/glm.hpp:math/glm \
 		${LOCALBASE}/bin/swig3.0:devel/swig30
 LIB_DEPENDS=	libboost_thread.so:devel/boost-libs \
+		libngspice.so:cad/ngspice_rework@shlib \
+		libTKernel.so:cad/opencascade \
+		libpixman-1.so:x11/pixman \
 		libpng.so:graphics/png \
 		libcurl.so:ftp/curl
 
@@ -26,7 +29,7 @@ GH_ACCOUNT=     KiCad
 GH_PROJECT=     kicad-source-mirror
 GH_TAGNAME=	${GIT_SRC_HASH}
 
-CXXFLAGS+=	--std=c++11 -I${WRKSRC}/include -I${LOCALBASE}/include -msse
+CXXFLAGS+=	--std=c++11 -I${WRKSRC} -I${WRKSRC}/include -I${LOCALBASE}/include -msse
 USE_GL=		gl glew glu glut
 USE_WX=		3.0
 WX_COMPS=	wx wx:build wx:run python:build python:run
@@ -43,7 +46,7 @@ PLIST_SUB=	OPSYS=${OPSYS}	\
 BINS=		cvpcb eeschema gerbview kicad pcbnew
 EXTRAS2RM=	linux-non_unicode linux wings3d LINUX.README	\
 		contrib_makefiles.txt running_kicad_under_W98.txt
-USES=		desktop-file-utils shared-mime-info compiler:c++11-lib tar:bzip2 cmake \
+USES=		desktop-file-utils shared-mime-info compiler:c++11-lib tar:bzip2 cmake:noninja \
 		gettext python:2.7 shebangfix ssl
 SHEBANG_FILES=	pcbnew/python/plugins/touch_slider_wizard.py
 
@@ -60,8 +63,10 @@ CMAKE_ARGS=	-DLOCALBASE="${LOCALBASE}" \
 		-DKICAD_SCRIPTING_MODULES=ON \
 		-DKICAD_SCRIPTING_WXPYTHON=OFF \
 		-DKICAD_SKIP_BOOST=YES \
-		-DKICAD_SPICE=OFF \
-		-DKICAD_USE_OCE=OFF
+		-DKICAD_SPICE=ON \
+		-DKICAD_USE_OCE=OFF \
+		-DKICAD_USE_OCC=ON \
+		-DOCC_INCLUDE_DIR=${LOCALBASE}/include/OpenCASCADE
 
 .include "Makefile.git_rev"
 
diff --git a/cad/kicad-devel/Makefile.git_rev b/cad/kicad-devel/Makefile.git_rev
index 82294166c9f9..d23ad4ce02cf 100644
--- a/cad/kicad-devel/Makefile.git_rev
+++ b/cad/kicad-devel/Makefile.git_rev
@@ -1,2 +1,2 @@
-GIT_SRC_HASH=  f52da8ed969d63eb945be7abb6ba57ccc51ed758
-GIT_SRC_DATE=  20180821185413
+GIT_SRC_HASH=  d953724365e54c68dc861b5b9202cc3d75b1fb0f
+GIT_SRC_DATE=  20181026164214
diff --git a/cad/kicad-devel/distinfo b/cad/kicad-devel/distinfo
index 98c758bcbd8e..e5784f522618 100644
--- a/cad/kicad-devel/distinfo
+++ b/cad/kicad-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1534873756
-SHA256 (kicad/KiCad-kicad-source-mirror-r20180821185413-f52da8ed969d63eb945be7abb6ba57ccc51ed758_GH0.tar.gz) = 8d65f0eec7d8889ec9a2ef2a54d185f0a97a8bfe800ead42583752873dd9dba4
-SIZE (kicad/KiCad-kicad-source-mirror-r20180821185413-f52da8ed969d63eb945be7abb6ba57ccc51ed758_GH0.tar.gz) = 23540199
+TIMESTAMP = 1540565514
+SHA256 (kicad/KiCad-kicad-source-mirror-r20181026164214-d953724365e54c68dc861b5b9202cc3d75b1fb0f_GH0.tar.gz) = 2c2e5891f6255fc88d18ee7f69d7085fd6fe14a8f5d6d45e45695234d06b2990
+SIZE (kicad/KiCad-kicad-source-mirror-r20181026164214-d953724365e54c68dc861b5b9202cc3d75b1fb0f_GH0.tar.gz) = 23653240
diff --git a/cad/kicad-devel/files/newVersion.sh b/cad/kicad-devel/files/newVersion.sh
index 2bb33f409121..0ffa9dd30569 100644
--- a/cad/kicad-devel/files/newVersion.sh
+++ b/cad/kicad-devel/files/newVersion.sh
@@ -16,10 +16,10 @@ WRKDIR=`pwd`/work
 #fi
 
 if [ \! -d "${CURDIR}/kicad-repo" ]; then
- git clone https://git.launchpad.net/kicad -b master "${CURDIR}/kicad-repo";
+ git clone https://github.com/KiCad/kicad-source-mirror.git -b master "${CURDIR}/kicad-repo";
 else
   cd "${CURDIR}/kicad-repo"
-  git pull https://git.launchpad.net/kicad;
+  git pull https://github.com/KiCad/kicad-source-mirror.git;
 fi
 
 cd "${CURDIR}/kicad-repo"
diff --git a/cad/kicad-devel/files/patch-3d-viewer_3d__cache_3d__cache.cpp b/cad/kicad-devel/files/patch-3d-viewer_3d__cache_3d__cache.cpp
deleted file mode 100644
index 8fcc7f6603e8..000000000000
--- a/cad/kicad-devel/files/patch-3d-viewer_3d__cache_3d__cache.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-After https://github.com/boostorg/uuid/commit/33da3e2a5b87 build fails:
-
-3d-viewer/3d_cache/3d_cache.cpp:37:10: fatal error: 'boost/uuid/sha1.hpp' file not found
-#include <boost/uuid/sha1.hpp>
-         ^
-
---- 3d-viewer/3d_cache/3d_cache.cpp.orig	2018-07-03 15:23:16 UTC
-+++ 3d-viewer/3d_cache/3d_cache.cpp
-@@ -34,7 +34,12 @@
- #include <wx/log.h>
- #include <wx/stdpaths.h>
- 
-+#include <boost/version.hpp>
-+#if (BOOST_VERSION >= 106600)
-+#include <boost/uuid/detail/sha1.hpp>
-+#else
- #include <boost/uuid/sha1.hpp>
-+#endif
- 
- #include <glm/glm.hpp>
- #include <glm/ext.hpp>
diff --git a/cad/kicad-devel/pkg-plist b/cad/kicad-devel/pkg-plist
index 228c32478a44..fba8828b18d2 100644
--- a/cad/kicad-devel/pkg-plist
+++ b/cad/kicad-devel/pkg-plist
@@ -13,10 +13,12 @@ bin/idfcyl
 bin/idfrect
 bin/kicad
 bin/kicad-ogltest
+bin/kicad2step
 bin/pcb_calculator
 bin/pcbnew
 bin/pl_editor
 lib/kicad/plugins/3d/libs3d_plugin_idf.so
+lib/kicad/plugins/3d/libs3d_plugin_oce.so
 lib/kicad/plugins/3d/libs3d_plugin_vrml.so
 lib/libkicad_3dsg.so
 lib/libkicad_3dsg.so.2.0.0
@@ -300,10 +302,10 @@ share/icons/hicolor/scalable/mimetypes/application-x-kicad-schematic.svg
 %%DATADIR%%/scripting/plugins/__init__.py
 %%DATADIR%%/scripting/plugins/bga_wizard.py
 %%DATADIR%%/scripting/plugins/circular_pad_array_wizard.py
+%%DATADIR%%/scripting/plugins/kicad_qrcode.py
 %%DATADIR%%/scripting/plugins/microMatch_connectors.py
 %%DATADIR%%/scripting/plugins/qfn_wizard.py
 %%DATADIR%%/scripting/plugins/qfp_wizard.py
-%%DATADIR%%/scripting/plugins/qrcode.py
 %%DATADIR%%/scripting/plugins/qrcode_footprint_wizard.py
 %%DATADIR%%/scripting/plugins/sdip_wizard.py
 %%DATADIR%%/scripting/plugins/touch_slider_wizard.py