From 846cb2488de45d0a116b0a3e41aa75a5619f00e9 Mon Sep 17 00:00:00 2001 From: Malte Kiessling Date: Tue, 14 Feb 2023 22:11:21 +0100 Subject: [PATCH] kicad: update to 7.0.0. also fixes the Warnings.cmake patch and adds the dependency on unixodbc --- srcpkgs/kicad/patches/disable-warnings.patch | 4 ++-- srcpkgs/kicad/template | 13 ++++++++----- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/srcpkgs/kicad/patches/disable-warnings.patch b/srcpkgs/kicad/patches/disable-warnings.patch index 7a7e7a2193e..168f61e6a21 100644 --- a/srcpkgs/kicad/patches/disable-warnings.patch +++ b/srcpkgs/kicad/patches/disable-warnings.patch @@ -1,5 +1,5 @@ ---- a/CMakeModules/Warnings.cmake -+++ b/CMakeModules/Warnings.cmake +--- a/cmake/Warnings.cmake ++++ b/cmake/Warnings.cmake @@ -38,13 +38,6 @@ set( WARN_FLAGS_CXX "-Wall" ) diff --git a/srcpkgs/kicad/template b/srcpkgs/kicad/template index 4db59d0bdd2..9ba4b39d34b 100644 --- a/srcpkgs/kicad/template +++ b/srcpkgs/kicad/template @@ -1,7 +1,7 @@ # Template file for 'kicad' pkgname=kicad -version=6.0.7 -revision=2 +version=7.0.0 +revision=1 build_style=cmake build_helper=cmake-wxWidgets-gtk3 configure_args="-DKICAD_SCRIPTING_WXPYTHON=ON @@ -10,17 +10,20 @@ configure_args="-DKICAD_SCRIPTING_WXPYTHON=ON -DKICAD_USE_OCC=$(vopt_if occt ON OFF) -DKICAD_SPICE=$(vopt_if spice ON OFF)" hostmakedepends="pkg-config swig wxWidgets-gtk3-devel python3 tar gettext" makedepends="wxWidgets-gtk3-devel wxPython4 python3-devel glew-devel cairo-devel - boost-devel libcurl-devel glm libgomp-devel libfreeglut-devel gtk+3-devel + boost-devel libcurl-devel glm libgomp-devel libfreeglut-devel gtk+3-devel unixodbc-devel $(vopt_if occt occt-devel) $(vopt_if spice ngspice-devel)" depends="wxPython4" short_desc="Electronic schematic and PCB design software" maintainer="Érico Nogueira " license="GPL-3.0-or-later" homepage="http://kicad.org" -distfiles="https://gitlab.com/kicad/code/${pkgname}/-/archive/${version}/kicad-${version}.tar.gz" -checksum=a72e88b15f360d76ea7427923a5073db5e34b5f8cfc4be389cfc24b12a71e7f9 +distfiles="https://gitlab.com/kicad/code/kicad/-/archive/${version}/kicad-${version}.tar.gz" +checksum=a992234a06d18e45dbec847624e7966b3850c5f1e44474007e8fe7c6c24d3fbc python_version=3 replaces="kicad-i18n>=0" +# one test appears to be flaky +# https://gitlab.com/kicad/code/kicad/-/blob/7.0.0/qa/unittests/eeschema/test_netlist_exporter_spice.h#L195-197 +make_check=ci-skip build_options="spice occt" build_options_default="spice occt"