From 4fdcab8f50ab871a461b122ac3e4227d93aab796 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 1/8] 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" From 68bb662bd80a8c9851ffe2279f16c109dd75c083 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Fri, 2 Oct 2020 18:05:27 -0300 Subject: [PATCH 2/8] kicad-doc: update to 5.1.7. --- srcpkgs/kicad-doc/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/kicad-doc/template b/srcpkgs/kicad-doc/template index 1105b934ff2..d58be46be38 100644 --- a/srcpkgs/kicad-doc/template +++ b/srcpkgs/kicad-doc/template @@ -1,13 +1,13 @@ # Template file for 'kicad-doc' pkgname=kicad-doc -version=5.1.6 -revision=2 +version=5.1.7 +revision=1 short_desc="KiCad documentation" maintainer="Érico Nogueira " license="GPL-3.0-or-later OR CC-BY-3.0" homepage="http://kicad-pcb.org" distfiles="https://kicad-downloads.s3.cern.ch/docs/${pkgname}-${version}.tar.gz" -checksum=3abb7f96269d146023463edb0a5eaaeb73ff4f7b1b6948a5d97deeaf625aecd0 +checksum=552156c0dbf05ac3767b49d294f2f99c4963621e06577042d311ac470490eb21 do_install() { vmkdir usr/ From 0d06aee269f9a991dbd6a0341e67f24a722b81a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Fri, 2 Oct 2020 18:06:32 -0300 Subject: [PATCH 3/8] kicad-i18n: update to 5.1.7. --- srcpkgs/kicad-i18n/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/kicad-i18n/template b/srcpkgs/kicad-i18n/template index 97fcdccef22..ff728c9e68e 100644 --- a/srcpkgs/kicad-i18n/template +++ b/srcpkgs/kicad-i18n/template @@ -1,8 +1,8 @@ # Template file for 'kicad-i18n' pkgname=kicad-i18n -version=5.1.6 -revision=2 -_commit=5ad171ce5c8d90f4740517c2adecb310d8be51bd +version=5.1.7 +revision=1 +_commit=d24af2da8cab4ce1081c401909a4a880514e5549 wrksrc="${pkgname}-${version}-${_commit}" build_style=cmake hostmakedepends="gettext" @@ -12,4 +12,4 @@ maintainer="Urs Schulz " license="CC-BY-SA-4.0" homepage="http://kicad-pcb.org" distfiles="https://gitlab.com/kicad/code/${pkgname}/-/archive/${version}/kicad-${version}.tar.gz>${pkgname}-${version}.tar.gz" -checksum=c6f64f4c09286a6fb5834d72bcd6523aed7051d705fb110a52ba2af53f7a10fe +checksum=49017d00cd3272d6615b4e3fe3fb14a48c113398e4dfdb1eda65b9c8595bff2b From 45182308f9ba28df1e68a1d0ab0cfa97119c1127 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Fri, 2 Oct 2020 18:05:42 -0300 Subject: [PATCH 4/8] kicad-footprints: update to 5.1.7. --- srcpkgs/kicad-footprints/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/kicad-footprints/template b/srcpkgs/kicad-footprints/template index 4c7ec73dca9..f947b903001 100644 --- a/srcpkgs/kicad-footprints/template +++ b/srcpkgs/kicad-footprints/template @@ -1,7 +1,7 @@ # Template file for 'kicad-footprints' pkgname=kicad-footprints -version=5.1.6 -revision=2 +version=5.1.7 +revision=1 build_style=cmake depends="kicad" short_desc="Kicad footprint libraries" @@ -9,4 +9,4 @@ maintainer="Urs Schulz " license="CC-BY-SA-4.0" homepage="http://kicad-pcb.org" distfiles="https://github.com/kicad/kicad-footprints/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz" -checksum=a6585cac71aa100375b6e969cb43388749e5d77a54674569f3627aaaf38c6a2c +checksum=2720e009285fbafa44216417c71d438833398ccb4a23d9c6cce86170983817fa From 324f776322d74034e788f1944ebf23bb1b759181 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Fri, 2 Oct 2020 18:06:09 -0300 Subject: [PATCH 5/8] kicad-templates: update to 5.1.7. --- srcpkgs/kicad-templates/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/kicad-templates/template b/srcpkgs/kicad-templates/template index c1177998656..4bcf224c462 100644 --- a/srcpkgs/kicad-templates/template +++ b/srcpkgs/kicad-templates/template @@ -1,7 +1,7 @@ # Template file for 'kicad-templates' pkgname=kicad-templates -version=5.1.6 -revision=2 +version=5.1.7 +revision=1 build_style=cmake depends="kicad" short_desc="Kicad templates" @@ -9,4 +9,4 @@ maintainer="Urs Schulz " license="CC-BY-SA-4.0" homepage="http://kicad-pcb.org" distfiles="https://github.com/kicad/kicad-templates/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz" -checksum=f970e889ed3c909691f8a2464831e117e0002cfb0d3b3558bf16f42fa04c55dc +checksum=0454a08872e39c7f5f038f4447606ec05d7e327684a8361ccb71e7e3d497bbb2 From 2cf3d122b81f2a61393c10ab1e538ec9ba3ac9f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Fri, 2 Oct 2020 18:06:17 -0300 Subject: [PATCH 6/8] kicad-symbols: update to 5.1.7. --- srcpkgs/kicad-symbols/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/kicad-symbols/template b/srcpkgs/kicad-symbols/template index 5cca24be661..29abc082b28 100644 --- a/srcpkgs/kicad-symbols/template +++ b/srcpkgs/kicad-symbols/template @@ -1,7 +1,7 @@ # Template file for 'kicad-symbols' pkgname=kicad-symbols -version=5.1.6 -revision=2 +version=5.1.7 +revision=1 build_style=cmake depends="kicad" short_desc="Kicad symbol libraries" @@ -9,4 +9,4 @@ maintainer="Urs Schulz " license="CC-BY-SA-4.0" homepage="http://kicad-pcb.org" distfiles="https://github.com/kicad/kicad-symbols/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz" -checksum=c4cd711698aaa681693a733f80c371e140c2cd5809e3ee569320e843aac3325e +checksum=ab8fe5a65a7c1a99d9b85f82c56cc7b2dbe77eb37e28945481dcddad7378b425 From a8b8d6791e1241b2582626abe12d237634fe89e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Fri, 2 Oct 2020 18:06:24 -0300 Subject: [PATCH 7/8] kicad-packages3D: update to 5.1.7. --- srcpkgs/kicad-packages3D/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/kicad-packages3D/template b/srcpkgs/kicad-packages3D/template index e6080431a89..dcc7da781d6 100644 --- a/srcpkgs/kicad-packages3D/template +++ b/srcpkgs/kicad-packages3D/template @@ -1,7 +1,7 @@ # Template file for 'kicad-packages3D' pkgname=kicad-packages3D -version=5.1.6 -revision=2 +version=5.1.7 +revision=1 build_style=cmake depends="kicad" short_desc="Kicad 3D model libraries" @@ -9,4 +9,4 @@ maintainer="Urs Schulz " license="CC-BY-SA-4.0" homepage="http://kicad-pcb.org" distfiles="https://github.com/kicad/kicad-packages3D/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz" -checksum=c455712a9eacdbbabf3367977911152f2e616bf8f622962f0fd4f3c6ddd00038 +checksum=5420ed6a9cebb15c70210c633d0710f0a89ec43ca2ef111c0439930c8156006c From 7a2483db83e8feabc68d5b868b9943e6bd854cb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Fri, 2 Oct 2020 18:06:44 -0300 Subject: [PATCH 8/8] kicad-library: update to 5.1.7. [ci skip] --- srcpkgs/kicad-library/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/kicad-library/template b/srcpkgs/kicad-library/template index 30397caabd6..0b9217d4e78 100644 --- a/srcpkgs/kicad-library/template +++ b/srcpkgs/kicad-library/template @@ -1,6 +1,6 @@ # Template file for 'kicad-library' pkgname=kicad-library -version=5.1.6 +version=5.1.7 revision=1 build_style=meta depends="kicad-footprints>=${version} kicad-packages3D>=${version}