From 0ed65f28a24bf3e984e1ecff1a4fe8c936b96560 Mon Sep 17 00:00:00 2001 From: PoroCYon Date: Mon, 17 Jan 2022 01:52:38 +0100 Subject: [PATCH] kicad: update to 6.0.1 --- srcpkgs/kicad/patches/disable-warnings.patch | 24 ++++++++------------ srcpkgs/kicad/template | 17 +++++++------- 2 files changed, 18 insertions(+), 23 deletions(-) diff --git a/srcpkgs/kicad/patches/disable-warnings.patch b/srcpkgs/kicad/patches/disable-warnings.patch index e59a5417244..7a7e7a2193e 100644 --- a/srcpkgs/kicad/patches/disable-warnings.patch +++ b/srcpkgs/kicad/patches/disable-warnings.patch @@ -1,17 +1,13 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 21bebddbb1..956de85b13 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -197,12 +197,6 @@ perform_feature_checks() - if( CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang" ) - include(CheckCXXCompilerFlag) +--- a/CMakeModules/Warnings.cmake ++++ b/CMakeModules/Warnings.cmake +@@ -38,13 +38,6 @@ + set( WARN_FLAGS_CXX "-Wall" ) -- CHECK_CXX_COMPILER_FLAG("-Wsuggest-override" COMPILER_SUPPORTS_WSUGGEST_OVERRIDE) + +- # Warn about missing override specifiers +- CHECK_CXX_COMPILER_FLAG( "-Wsuggest-override" COMPILER_SUPPORTS_WSUGGEST_OVERRIDE ) - -- if(COMPILER_SUPPORTS_WSUGGEST_OVERRIDE) -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wsuggest-override") +- if( COMPILER_SUPPORTS_WSUGGEST_OVERRIDE ) +- set( WARN_FLAGS_CXX "${WARN_FLAGS_CXX} -Wsuggest-override" ) +- message( STATUS "Enabling warning -Wsuggest-override" ) - endif() -- - CHECK_CXX_COMPILER_FLAG("-Wvla" COMPILER_SUPPORTS_WVLA) - - if(COMPILER_SUPPORTS_WVLA) diff --git a/srcpkgs/kicad/template b/srcpkgs/kicad/template index ba9934bf70c..4369166674d 100644 --- a/srcpkgs/kicad/template +++ b/srcpkgs/kicad/template @@ -1,18 +1,16 @@ # Template file for 'kicad' pkgname=kicad -version=5.1.11 -revision=4 +version=6.0.1 +revision=1 build_style=cmake build_helper=cmake-wxWidgets-gtk3 -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_SCRIPTING_PYTHON3=ON -DKICAD_SCRIPTING_WXPYTHON_PHOENIX=ON +configure_args="-DKICAD_SCRIPTING_WXPYTHON=ON + -DKICAD_BUILD_I18N=ON -DKICAD_I18N_UNIX_STRICT_PATH=ON -DwxWidgets_CONFIG_EXECUTABLE=$WX_CONFIG -DKICAD_USE_OCC=$(vopt_if occt ON OFF) -DKICAD_SPICE=$(vopt_if spice ON OFF)" -hostmakedepends="pkg-config swig wxWidgets-gtk3-devel python3" +hostmakedepends="pkg-config swig wxWidgets-gtk3-devel python3 tar gettext" makedepends="wxWidgets-gtk3-devel wxPython4 python3-devel glew-devel cairo-devel - openssl-devel boost-devel libcurl-devel glm libgomp-devel + boost-devel libcurl-devel glm libgomp-devel libfreeglut-devel gtk+3-devel $(vopt_if occt occt-devel) $(vopt_if spice ngspice-devel)" depends="wxPython4" short_desc="Electronic schematic and PCB design software" @@ -20,8 +18,9 @@ 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=32751a375bb117d51c07dde29cf3eea01cd9ff77336740e2728cb5f36bb48374 +checksum=946173455db986cc79050a8c1983193690f14eb538785b21c1584d5999b864e4 python_version=3 +replaces="kicad-i18n>=0" build_options="spice occt" build_options_default="spice occt"