From f974b39829b7ba3f7d0a4ce4fc484c9ae45d4427 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Fri, 2 Oct 2020 18:06:01 -0300 Subject: [PATCH] kicad: update to 5.1.7. --- srcpkgs/kicad/patches/disable-warnings.patch | 31 ++++++------------- .../kicad/patches/fix-cross-compilation.patch | 10 ------ srcpkgs/kicad/template | 6 ++-- 3 files changed, 13 insertions(+), 34 deletions(-) delete mode 100644 srcpkgs/kicad/patches/fix-cross-compilation.patch diff --git a/srcpkgs/kicad/patches/disable-warnings.patch b/srcpkgs/kicad/patches/disable-warnings.patch index 71cf31867c8..d44a87145bb 100644 --- a/srcpkgs/kicad/patches/disable-warnings.patch +++ b/srcpkgs/kicad/patches/disable-warnings.patch @@ -1,28 +1,17 @@ ---- CMakeLists.txt 2019-06-13 14:40:04.382931388 +0200 -+++ CMakeLists.txt 2019-06-13 14:40:56.256019689 +0200 -@@ -203,25 +203,6 @@ - endif() +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 21bebddbb1..956de85b13 100644 +--- CMakeLists.txt ++++ CMakeLists.txt +@@ -197,12 +197,6 @@ perform_feature_checks() + if( CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang" ) + include(CheckCXXCompilerFlag) - --# Warn about missing override specifiers, if supported --if( CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang" ) -- include(CheckCXXCompilerFlag) -- - CHECK_CXX_COMPILER_FLAG("-Wsuggest-override" COMPILER_SUPPORTS_WSUGGEST_OVERRIDE) - - if(COMPILER_SUPPORTS_WSUGGEST_OVERRIDE) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wsuggest-override") - endif() - -- CHECK_CXX_COMPILER_FLAG("-Wvla" COMPILER_SUPPORTS_WVLA) -- -- if(COMPILER_SUPPORTS_WVLA) -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=vla") -- endif() -- --endif() -- -- - # Warn about shadowed variables (-Wshadow option), if supported - # Unfortunately, the swig autogenerated files have a lot of shadowed variables - # and -Wno-shadow does not exist. + CHECK_CXX_COMPILER_FLAG("-Wvla" COMPILER_SUPPORTS_WVLA) + + if(COMPILER_SUPPORTS_WVLA) diff --git a/srcpkgs/kicad/patches/fix-cross-compilation.patch b/srcpkgs/kicad/patches/fix-cross-compilation.patch deleted file mode 100644 index e7cf6fdf291..00000000000 --- a/srcpkgs/kicad/patches/fix-cross-compilation.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- 3d-viewer/3d_cache/sg/CMakeLists.txt.orig 2018-08-28 02:50:47.256524770 +0200 -+++ 3d-viewer/3d_cache/sg/CMakeLists.txt 2018-08-28 02:51:35.080183811 +0200 -@@ -44,7 +44,7 @@ - endif() - - find_file( S3DSG_VERSION_FILE sg_version.h -- PATHS ${CMAKE_SOURCE_DIR}/include/plugins/3dapi NO_DEFAULT_PATH ) -+ PATHS ${CMAKE_SOURCE_DIR}/include/plugins/3dapi NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH) - - if( NOT ${S3DSG_VERSION_FILE} STREQUAL "S3DSG_VERSION_FILE-NOTFOUND" ) diff --git a/srcpkgs/kicad/template b/srcpkgs/kicad/template index 84a2a7eb1bb..07cd9220f13 100644 --- a/srcpkgs/kicad/template +++ b/srcpkgs/kicad/template @@ -1,7 +1,7 @@ # Template file for 'kicad' pkgname=kicad -version=5.1.6 -revision=4 +version=5.1.7 +revision=1 build_style=cmake configure_args="-DKICAD_BUILD_VERSION=${version} -DKICAD_SCRIPTING=ON -DKICAD_SCRIPTING_MODULES=ON -DKICAD_SCRIPTING_WXPYTHON=ON @@ -19,7 +19,7 @@ maintainer="Érico Nogueira " license="GPL-3.0-or-later" homepage="http://kicad-pcb.org" distfiles="https://gitlab.com/kicad/code/${pkgname}/-/archive/${version}/kicad-${version}.tar.gz" -checksum=ac1a15e25a7ff0aca4b6224bdb2d3298081b43bedfad79470339d53d5e72beb0 +checksum=96ad30aa289ed6f77ffcd8283d0877b700139187e5f1957acad8ad4dbad472bc python_version=3 build_options="spice occt"