Re: [PR PATCH] [Updated] Kicad 5.1.9

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

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

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

https://github.com/ericonr/void-packages kicad
https://github.com/void-linux/void-packages/pull/28239

Kicad 5.1.9
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


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

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

From 27237345d7364ccf27459a63de844e862e816f9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 26 Jan 2021 15:36:17 -0300
Subject: [PATCH 1/9] wxWidgets-gtk3: fix some cross builds.

Projects that include <wx/setup.h> use wx-config to get flags for where
it's located. For example, "-I
/usr/armv7l-linux-musleabihf/lib/wx/include/gtk3-unicode-3.0".
Unfortunately, wx-config uses libdir from the native package,
/usr/lib$host_wordsize, which breaks cross builds for targets with
different word sizes.

Fix this by changing "lib$wordsize" to "lib".
---
 srcpkgs/wxWidgets-gtk3/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/wxWidgets-gtk3/template b/srcpkgs/wxWidgets-gtk3/template
index 1081bc8853d..7847442b405 100644
--- a/srcpkgs/wxWidgets-gtk3/template
+++ b/srcpkgs/wxWidgets-gtk3/template
@@ -1,7 +1,7 @@
 # Template file for 'wxWidgets-gtk3'
 pkgname=wxWidgets-gtk3
 version=3.0.5.1
-revision=3
+revision=4
 wrksrc="wxWidgets-${version}"
 build_style=gnu-configure
 configure_args="--with-gtk=3 --enable-unicode --with-opengl --with-sdl
@@ -34,11 +34,12 @@ post_install() {
 	ln -sf ../lib/wx/config/${_config} ${DESTDIR}/usr/bin/wx-config-gtk3
 	#   - ignore --host option; breaks configure scripts when
 	#     cross compiling (isn’t necessary in our case anyway)
-	sed -i -e '/^libdir="\/usr/s,/usr,${exec_prefix},' \
+	vsed -i -e '/^libdir="\/usr/s,/usr,${exec_prefix},' \
 		-e '/^bindir="\/usr/s,/usr,${exec_prefix},' \
 		-e 's/is_cross().*/is_cross() { false; }/g' \
 		-e '/--\*=\*)/i --host=\*) continue;;' \
-		$DESTDIR/usr/lib/wx/config/gtk3-unicode-3.0
+		-e "s/lib${XBPS_WORDSIZE}/lib/g" \
+		$DESTDIR/usr/lib/wx/config/${_config}
 }
 
 wxWidgets-common_package() {

From 521904cabf257459e51ebde0e23f98e07c41e432 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 26 Jan 2021 12:05:27 -0300
Subject: [PATCH 2/9] kicad-doc: update to 5.1.9.

---
 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 8c9d44e7a86..780a7db122e 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.8
+version=5.1.9
 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-pcb.org"
 distfiles="https://kicad-downloads.s3.cern.ch/docs/${pkgname}-${version}.tar.gz"
-checksum=f2d96bae9bb44c089b155ee61bb589d51373647cdfdf28b5f931756e369bdf14
+checksum=61571f260bba67e26b9f7456ad6eb5da7c3b406412f506e7857d0ca70ca66393
 
 do_install() {
 	vmkdir usr/

From 0a030d950f1499e73bfd8e9f533cd759f6f8931f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 26 Jan 2021 12:05:46 -0300
Subject: [PATCH 3/9] kicad-footprints: update to 5.1.9.

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

diff --git a/srcpkgs/kicad-footprints/template b/srcpkgs/kicad-footprints/template
index e082ad14a42..e5bc62c420c 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.8
+version=5.1.9
 revision=1
 build_style=cmake
 depends="kicad"
@@ -9,7 +9,7 @@ maintainer="Urs Schulz <voidpkgs@ursschulz.de>"
 license="CC-BY-SA-4.0"
 homepage="http://kicad-pcb.org"
 distfiles="https://gitlab.com/kicad/libraries/${pkgname}/-/archive/${version}/${pkgname}-${version}.tar.gz"
-checksum=31c3676d71139259f1cc67b3a0254ec8a8659d35f2c51a273f5de542c651a819
+checksum=415e014364d1c12584f115a4adfeec1b71e41e2cd7f4ae543237ee71b8ef41bd
 
 post_install() {
 	# otherwise KiCad will complain about a missing library when launched

From b0e4fdb86566395b9908ca15009569bbf8716fba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 26 Jan 2021 12:06:01 -0300
Subject: [PATCH 4/9] kicad-packages3D: update to 5.1.9.

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

diff --git a/srcpkgs/kicad-packages3D/template b/srcpkgs/kicad-packages3D/template
index 41e1d13f6ee..93b9241577a 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.8
+version=5.1.9
 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-pcb.org"
 distfiles="https://gitlab.com/kicad/libraries/${pkgname}/-/archive/${version}/${pkgname}-${version}.tar.gz"
-checksum=faf3ddf4036a6084618c1d90254b554f845693549afb2c483291133dca27ee3a
+checksum=efce7b0b65ece76b57002cd4b84152fb359f7c47fe0b3d71166e9255ffa5c5b0

From 175a98e7422623620e12e6c93ac3bd7cc2f34960 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 26 Jan 2021 12:06:18 -0300
Subject: [PATCH 5/9] kicad-templates: update to 5.1.9.

---
 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 48d8ffda2eb..9cc44f0c139 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.8
+version=5.1.9
 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-pcb.org"
 distfiles="https://gitlab.com/kicad/libraries/${pkgname}/-/archive/${version}/${pkgname}-${version}.tar.gz"
-checksum=1afc8196f47d053937c2db9ee7f09b0d812e1ba93e57a0610ab1ced21c9134ca
+checksum=0c1bf3d2e6d8d1056a5da6c1f7a173551c154b4bdaddb86b6a34155b18e65da6

From b4bb55f1b61335f98bce9684f10b5cbe3f2703be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 26 Jan 2021 12:06:28 -0300
Subject: [PATCH 6/9] kicad-symbols: update to 5.1.9.

---
 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 73c1c529bc2..9c699f97ff6 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.8
+version=5.1.9
 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-pcb.org"
 distfiles="https://gitlab.com/kicad/libraries/${pkgname}/-/archive/${version}/${pkgname}-${version}.tar.gz"
-checksum=a5ca226afbabdd1822c4a18e63a2943cd2913df11e8e50530768fbdd7997ba54
+checksum=cdb033cc755cc66a087b44fff1d2b77bf2dd44311a02c81a516b8ca1fbd242a7

From 1f1f526dab40af091e170b7e6a1eb922b18ccca4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 26 Jan 2021 12:06:37 -0300
Subject: [PATCH 7/9] kicad-library: update to 5.1.9.

---
 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 c61f146fc2f..1ebed610fa0 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.8
+version=5.1.9
 revision=1
 build_style=meta
 depends="kicad-footprints>=${version} kicad-packages3D>=${version}

From ea773beec0ce2a11c5fac5fffe2b77c4306ee969 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 26 Jan 2021 12:06:51 -0300
Subject: [PATCH 8/9] kicad-i18n: update to 5.1.9.

---
 srcpkgs/kicad-i18n/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/kicad-i18n/template b/srcpkgs/kicad-i18n/template
index 6fd55602335..46f6e9c5c79 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.8
+version=5.1.9
 revision=1
-_commit=78adcd19e7ed53f4889d6db65a33dd8ec2d323e9
+_commit=04f3231f60d55400cb81564b2cd465a57d5192d5
 wrksrc="${pkgname}-${version}-${_commit}"
 build_style=cmake
 hostmakedepends="gettext"
@@ -12,4 +12,4 @@ maintainer="Urs Schulz <voidpkgs@ursschulz.de>"
 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=807eeceaa5688ca800fe01464b466755e7b9e3243cb0a776e2ea5ea1f963967b
+checksum=edd1ff381fc767c48270395b49156891c626eb7760768b4b082cd575b4038cce

From 7ca576592dd366f18e8cec30d53ee2d62c7b1b7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 26 Jan 2021 12:06:59 -0300
Subject: [PATCH 9/9] kicad: update to 5.1.9.

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

diff --git a/srcpkgs/kicad/template b/srcpkgs/kicad/template
index f11077d93bb..22e74879754 100644
--- a/srcpkgs/kicad/template
+++ b/srcpkgs/kicad/template
@@ -1,6 +1,6 @@
 # Template file for 'kicad'
 pkgname=kicad
-version=5.1.8
+version=5.1.9
 revision=1
 build_style=cmake
 configure_args="-DKICAD_BUILD_VERSION=${version} -DKICAD_SCRIPTING=ON
@@ -19,7 +19,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 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=bf24f8ef427b4a989479b8e4af0b8ae5c54766755f12748e2e88a922c5344ca4
+checksum=841be864b9dc5c761193c3ee9cbdbed6729952d7b38451aa8e1977bdfdb6081b
 python_version=3
 
 build_options="spice occt"