Re: [PR PATCH] [Updated] kicad: update to 6.0.1

[PoroCYon <PoroCYon@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1203 bytes --]

There is an updated pull request by PoroCYon against master on the void-packages repository

https://github.com/PoroCYon/void-packages kicad-600
https://github.com/void-linux/void-packages/pull/34917

kicad: update to 6.0.1
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**/**briefly**: I opened a project of mine, looked around and made some minor edits, tried the main components (schematic editor, PCB editor, 3D viewer), but I didn't test *all* features (scripting, gerber output with weird contents, SPICE integration, ...).

[ci skip] because `kicad-packages3D` is humongous, and KiCAD itself takes a long while to build, and all other packages are trivial (only assets).

#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc
- I did **not** build this PR locally for these architectures as I don't have any of these machines (thus cannot test it) and cross-compiling would take too long.

So, preferably, a few other people should test this PR as well.


A patch file from https://github.com/void-linux/void-packages/pull/34917.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-kicad-600-34917.patch --]
[-- Type: text/x-diff, Size: 10807 bytes --]

From 56d8a0ff2d2e24c5f53d2067a495290a06b3aae9 Mon Sep 17 00:00:00 2001
From: PoroCYon <porocyon@titandemo.org>
Date: Mon, 17 Jan 2022 01:52:38 +0100
Subject: [PATCH 1/8] kicad: update to 6.0.1

---
 srcpkgs/kicad/patches/disable-warnings.patch | 24 ++++++++------------
 srcpkgs/kicad/template                       | 16 ++++++-------
 2 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/srcpkgs/kicad/patches/disable-warnings.patch b/srcpkgs/kicad/patches/disable-warnings.patch
index e59a54172441..7a7e7a2193e6 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 ba9934bf70c2..c1c9980c617c 100644
--- a/srcpkgs/kicad/template
+++ b/srcpkgs/kicad/template
@@ -1,18 +1,15 @@
 # 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
  -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"
 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 +17,9 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 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"

From 6d2b10347655b9f22e697387a6e7de1cc346712e Mon Sep 17 00:00:00 2001
From: PoroCYon <porocyon@titandemo.org>
Date: Mon, 17 Jan 2022 01:53:25 +0100
Subject: [PATCH 2/8] kicad-i18n: removed

---
 srcpkgs/kicad-i18n/template | 15 ---------------
 1 file changed, 15 deletions(-)
 delete mode 100644 srcpkgs/kicad-i18n/template

diff --git a/srcpkgs/kicad-i18n/template b/srcpkgs/kicad-i18n/template
deleted file mode 100644
index 67d31370545f..000000000000
--- a/srcpkgs/kicad-i18n/template
+++ /dev/null
@@ -1,15 +0,0 @@
-# Template file for 'kicad-i18n'
-pkgname=kicad-i18n
-version=5.1.11
-revision=1
-_commit=0ad3d7e469e31c8868ad83f90e22a9c18f16aa1f
-wrksrc="${pkgname}-${version}-${_commit}"
-build_style=cmake
-hostmakedepends="gettext"
-depends="kicad"
-short_desc="KiCad localization files"
-maintainer="Urs Schulz <voidpkgs@ursschulz.de>"
-license="CC-BY-SA-4.0"
-homepage="http://kicad.org"
-distfiles="https://gitlab.com/kicad/code/${pkgname}/-/archive/${version}/kicad-${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=2cbde9705f945be3b9796d981aea0dbc70a3f24796c9156e337b8014868be4e9

From be388e18518d79cff3d3f81f18c9dd171b6031c9 Mon Sep 17 00:00:00 2001
From: PoroCYon <porocyon@titandemo.org>
Date: Mon, 17 Jan 2022 01:54:13 +0100
Subject: [PATCH 3/8] kicad-footprints: update to 6.0.1

---
 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 53ee1dad0c2e..aa8062df6655 100644
--- a/srcpkgs/kicad-footprints/template
+++ b/srcpkgs/kicad-footprints/template
@@ -1,6 +1,6 @@
 # Template file for 'kicad-footprints'
 pkgname=kicad-footprints
-version=5.1.11
+version=6.0.1
 revision=1
 build_style=cmake
 depends="kicad"
@@ -9,9 +9,9 @@ maintainer="Urs Schulz <voidpkgs@ursschulz.de>"
 license="CC-BY-SA-4.0"
 homepage="http://kicad.org"
 distfiles="https://gitlab.com/kicad/libraries/${pkgname}/-/archive/${version}/${pkgname}-${version}.tar.gz"
-checksum=320cae2d830cfb4ff50f187f36c9e7c3c1565fbd6ea5b064e98ec44891ea8b9e
+checksum=c2b825f346b5eb60faaa7b39c64855c47d80e1ef950e4df08c58e843783bc9a6
 
 post_install() {
 	# otherwise KiCad will complain about a missing library when launched
-	touch $DESTDIR/usr/share/kicad/modules/Connector_Multicomp.pretty/.empty
+	touch $DESTDIR/usr/share/kicad/footprints/Connector_Multicomp.pretty/.empty
 }

From 0e1c4448e03bc9511fcfed21c16dfb2e7191bd46 Mon Sep 17 00:00:00 2001
From: PoroCYon <porocyon@titandemo.org>
Date: Mon, 17 Jan 2022 01:54:36 +0100
Subject: [PATCH 4/8] kicad-packages3D: update to 6.0.1

---
 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 3bd516bb4859..bc7dfc81abc6 100644
--- a/srcpkgs/kicad-packages3D/template
+++ b/srcpkgs/kicad-packages3D/template
@@ -1,6 +1,6 @@
 # Template file for 'kicad-packages3D'
 pkgname=kicad-packages3D
-version=5.1.11
+version=6.0.1
 revision=1
 build_style=cmake
 depends="kicad"
@@ -8,5 +8,5 @@ short_desc="Kicad 3D model libraries"
 maintainer="Urs Schulz <voidpkgs@ursschulz.de>"
 license="CC-BY-SA-4.0"
 homepage="http://kicad.org"
-distfiles="https://gitlab.com/kicad/libraries/${pkgname}/-/archive/${version}/${pkgname}-${version}.tar.gz"
-checksum=5ef77e1762fa8e8042f061dd2baa2bcb8934fe80c154f8b7e3c7a8cf474927d9
+distfiles="https://gitlab.com/kicad/libraries/${pkgname}/-/archive/${version}/${pkgname}-${version}.tar.bz2"
+checksum=caf3359cf474b4f71fa2b62a5128d594f92285a92817adbcd6be99f199ac36da

From 469582ab50924c13cac37691562f67056ab4c334 Mon Sep 17 00:00:00 2001
From: PoroCYon <porocyon@titandemo.org>
Date: Mon, 17 Jan 2022 01:54:50 +0100
Subject: [PATCH 5/8] kicad-symbols: update to 6.0.1

---
 srcpkgs/kicad-symbols/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kicad-symbols/template b/srcpkgs/kicad-symbols/template
index a5c8b3ebcb59..4580597c8f23 100644
--- a/srcpkgs/kicad-symbols/template
+++ b/srcpkgs/kicad-symbols/template
@@ -1,6 +1,6 @@
 # Template file for 'kicad-symbols'
 pkgname=kicad-symbols
-version=5.1.11
+version=6.0.1
 revision=1
 build_style=cmake
 depends="kicad"
@@ -9,4 +9,4 @@ maintainer="Urs Schulz <voidpkgs@ursschulz.de>"
 license="CC-BY-SA-4.0"
 homepage="http://kicad.org"
 distfiles="https://gitlab.com/kicad/libraries/${pkgname}/-/archive/${version}/${pkgname}-${version}.tar.gz"
-checksum=f0877ff30e3f17be1ba17f33895a45998b4c08d62a48c51a25626ce7e269b098
+checksum=56593ff7dfae14ce4e5afa2b0477a8fb832dbf5ae81abec831ebbae7568f0433

From 6dd6ab2392ae5478c53f7496c68001e875f624ee Mon Sep 17 00:00:00 2001
From: PoroCYon <porocyon@titandemo.org>
Date: Mon, 17 Jan 2022 01:55:04 +0100
Subject: [PATCH 6/8] kicad-templates: update to 6.0.1

---
 srcpkgs/kicad-templates/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kicad-templates/template b/srcpkgs/kicad-templates/template
index 7cfe95f73be5..9d3319894ca4 100644
--- a/srcpkgs/kicad-templates/template
+++ b/srcpkgs/kicad-templates/template
@@ -1,6 +1,6 @@
 # Template file for 'kicad-templates'
 pkgname=kicad-templates
-version=5.1.11
+version=6.0.1
 revision=1
 build_style=cmake
 depends="kicad"
@@ -9,4 +9,4 @@ maintainer="Urs Schulz <voidpkgs@ursschulz.de>"
 license="CC-BY-SA-4.0"
 homepage="http://kicad.org"
 distfiles="https://gitlab.com/kicad/libraries/${pkgname}/-/archive/${version}/${pkgname}-${version}.tar.gz"
-checksum=66272a39f624f5efa494b6bde2c10f3553167dbae5f52ca14a786bfc002b7961
+checksum=590d77e693d9f54d740e75f8e504e02227da44461f3ef3e69ff2ef9c3d6d78ee

From b8c428433eeb12bc20948cb4c8b5931a48ded04b Mon Sep 17 00:00:00 2001
From: PoroCYon <porocyon@titandemo.org>
Date: Mon, 17 Jan 2022 01:55:18 +0100
Subject: [PATCH 7/8] kicad-library: update to 6.0.1

---
 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 b8bb109976e7..ab472215f802 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.11
+version=6.0.1
 revision=1
 build_style=meta
 depends="kicad-footprints>=${version} kicad-packages3D>=${version}

From c99929472dcfa594b1d5639f2ee8ebd002e2e504 Mon Sep 17 00:00:00 2001
From: PoroCYon <porocyon@titandemo.org>
Date: Thu, 27 Jan 2022 14:53:38 +0100
Subject: [PATCH 8/8] kicad-doc: update to 6.0.1

---
 srcpkgs/kicad-doc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kicad-doc/template b/srcpkgs/kicad-doc/template
index 398cb7c5c0f2..0bdd249c7d88 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.11
+version=6.0.1
 revision=1
 short_desc="KiCad documentation"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="GPL-3.0-or-later, CC-BY-3.0"
 homepage="http://kicad.org"
 distfiles="https://kicad-downloads.s3.cern.ch/docs/${pkgname}-${version}.tar.gz"
-checksum=3ce13d43c29e9eab502575b765a9be077e4d478b6e9d829c01739a7575a83512
+checksum=6093c99cfde827fb42fc351ef301f0dcad805f0c256ef02a0e82d9daafc238d3
 
 do_install() {
 	vmkdir usr/