From c01aae1b380b2f81ab2d3251e53dea7e073d0224 Mon Sep 17 00:00:00 2001 From: Christian Buschau Date: Wed, 19 Dec 2018 22:40:23 +0100 Subject: [PATCH] kicad: update to 5.0.2. --- .../kicad/patches/fix-ngspice-finding.patch | 30 ------------------- srcpkgs/kicad/template | 15 ++++------ 2 files changed, 5 insertions(+), 40 deletions(-) delete mode 100644 srcpkgs/kicad/patches/fix-ngspice-finding.patch diff --git a/srcpkgs/kicad/patches/fix-ngspice-finding.patch b/srcpkgs/kicad/patches/fix-ngspice-finding.patch deleted file mode 100644 index 35b78a8809a..00000000000 --- a/srcpkgs/kicad/patches/fix-ngspice-finding.patch +++ /dev/null @@ -1,30 +0,0 @@ -From: =?utf-8?q?Stefan_Br=C3=BCns?= -Date: Fri, 26 Oct 2018 23:35:13 +0200 -Subject: Use fixed version for libngspice.so.0 - -CanonicalizeName only adds the lib prefix and .so suffix, so loading -libngspice.so fails until the development package is installed. -MAC/Windows code paths lookup soversion 0 of ngspice as well, as this -is the only compatible version. ---- - eeschema/sim/ngspice.cpp | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/eeschema/sim/ngspice.cpp b/eeschema/sim/ngspice.cpp -index 8818b50..81c9123 100644 ---- eeschema/sim/ngspice.cpp -+++ eeschema/sim/ngspice.cpp -@@ -318,8 +318,11 @@ void NGSPICE::init_dll() - } - - if( !m_dll.IsLoaded() ) // try also the system libraries --#endif /* __WINDOWS || __WXMAC__ */ -+ - m_dll.Load( wxDynamicLibrary::CanonicalizeName( "ngspice" ) ); -+#else -+ m_dll.Load("libngspice.so.0"); -+#endif /* __WINDOWS || __WXMAC__ */ - - if( !m_dll.IsLoaded() ) - throw std::runtime_error( "Missing ngspice shared library" ); - diff --git a/srcpkgs/kicad/template b/srcpkgs/kicad/template index ac92f21581c..1a6b282ee4b 100644 --- a/srcpkgs/kicad/template +++ b/srcpkgs/kicad/template @@ -1,13 +1,13 @@ # Template file for 'kicad' pkgname=kicad -version=5.0.1 -revision=4 +version=5.0.2 +revision=1 build_style=cmake configure_args="-DKICAD_BUILD_VERSION=${version} -DKICAD_SCRIPTING=ON -DKICAD_SCRIPTING_MODULES=ON -DKICAD_SCRIPTING_WXPYTHON=ON -DKICAD_SCRIPTING_ACTION_MENU=ON -DBUILD_GITHUB_PLUGIN=ON -DKICAD_USE_OCE=OFF -DKICAD_SPICE=$(vopt_if spice ON OFF)" -hostmakedepends="pkg-config swig" +hostmakedepends="pkg-config swig wxWidgets-devel" makedepends="wxWidgets-devel wxPython-devel python-devel glew-devel cairo-devel libressl-devel boost-devel libcurl-devel glm occt-devel libgomp-devel $(vopt_if spice ngspice-devel)" @@ -17,21 +17,16 @@ maintainer="Steve Prybylski " license="GPL-3.0-or-later" homepage="http://kicad-pcb.org" distfiles="https://launchpad.net/${pkgname}/${version%.*}/${version}/+download/${pkgname}-${version}.tar.xz" -checksum=5fe4f63318522cb0a1c89ecd6a71c470def1720f152954cf3182f5deb878716a +checksum=2f3406e72eb6757789c18bd9204d0c6ddae64b025f4c6fec28037410722ec080 build_options="spice" +build_options_default="spice" CXXFLAGS="-std=c++14" -# currently disabled on arm because nocross is set for ngspice case $XBPS_TARGET_MACHINE in armv6l-musl) broken="depends on broken tbb" ;; - *-musl) - ;; - *) - build_options_default="spice" - ;; esac