Re: [PR PATCH] [Updated] Switch KiCad to python3

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

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

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

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

Switch KiCad to python3
- Update wxPython4 as well

We should check if `mymcplus` is still working after this update, but I couldn't even get it working without the update. @abenson 

Build is probably going to timeout, tested on x86_64 musl and glibc.

EDIT: I'm testing cross build for now

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

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

From bbe05bc0c37cf48805bca3665fef48efc6211296 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 7 Jun 2020 02:11:25 -0300
Subject: [PATCH 1/3] wxPython4: update to 4.0.7.

- fix xlint
- update depends

[ci skip]
---
 srcpkgs/wxPython4/template | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/wxPython4/template b/srcpkgs/wxPython4/template
index b65e0b2ffe1..4823b2e11cb 100644
--- a/srcpkgs/wxPython4/template
+++ b/srcpkgs/wxPython4/template
@@ -1,22 +1,21 @@
 # Template file for 'wxPython4'
 pkgname=wxPython4
-version=4.0.6
-revision=3
+version=4.0.7
+revision=1
 wrksrc="wxPython-${version}"
 build_style=python3-module
-pycompile_module="wx"
 make_build_args="--skip-build"
 make_install_args="--skip-build"
 hostmakedepends="pkg-config python3-setuptools python3-pathlib2"
 makedepends="python3-devel wxWidgets-gtk3-devel SDL2-devel webkit2gtk-devel
  gst-plugins-base1-devel"
-depends="python3"
+depends="python3 python3-six python3-numpy python3-Pillow"
 short_desc="WxWidgets GUI toolkit library (Python3 Bindings)"
 maintainer="Jasper Chan <jasperchan515@gmail.com>"
 license="custom:wxWindows"
 homepage="http://www.wxpython.org/"
 distfiles="${PYPI_SITE}/w/wxPython/wxPython-${version}.tar.gz"
-checksum=35cc8ae9dd5246e2c9861bb796026bbcb9fb083e4d49650f776622171ecdab37
+checksum=3be608bfdede3063678cc703453850ab0a018b82bafd5ee057302250b18f0233
 
 if [ "$CROSS_BUILD" ]; then
 	CFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/python${py3_ver}"

From 3064ddc1aa48fa7db6eb5dc0ee7d3ec84163e13f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 8 Jun 2020 00:29:29 -0300
Subject: [PATCH 2/3] occt: add build option for tbb.

- Makes it possible to build occt for all archs.
---
 srcpkgs/occt/template | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/occt/template b/srcpkgs/occt/template
index 3b131d74512..6dab53861ae 100644
--- a/srcpkgs/occt/template
+++ b/srcpkgs/occt/template
@@ -1,14 +1,14 @@
 # Template file for 'occt'
 pkgname=occt
 version=7.4.0
-revision=1
+revision=2
 _gittag="V${version//./_}"
 wrksrc=occt-${_gittag}
 build_style=cmake
-configure_args="-DUSE_FREEIMAGE=ON -DUSE_TBB=ON -DUSE_GL2PS=ON -DUSE_VTK=OFF
- -DINSTALL_SAMPLES=ON"
-makedepends="freetype-devel glu-devel freeimage-devel gl2ps-devel tbb-devel
- tcl-devel tk-devel"
+configure_args="-DUSE_FREEIMAGE=ON -DUSE_GL2PS=ON -DUSE_VTK=OFF
+ -DINSTALL_SAMPLES=ON -DUSE_TBB=$(vopt_if tbb ON OFF)"
+makedepends="freetype-devel glu-devel freeimage-devel gl2ps-devel
+ tcl-devel tk-devel $(vopt_if tbb tbb-devel)"
 short_desc="OpenCASCADE Technology - library for CAD/CAM/CAE applications"
 maintainer="Piraty <piraty1@inbox.ru>"
 license="LGPL-2.1-only"
@@ -19,6 +19,16 @@ distfiles="https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=refs/
 checksum=655da7717dac3460a22a6a7ee68860c1da56da2fec9c380d8ac0ac0349d67676
 conflicts="oce>=0"
 
+build_options="tbb"
+desc_option_tbb="Enable multithreaded algorithms"
+
+case "$XBPS_TARGET_MACHINE" in
+	# platforms for which tbb can be built
+	i686*|x86_64*|armv7l*|aarch64*|ppc*)
+		build_options_default+=" tbb"
+		;;
+esac
+
 post_install() {
 	rm ${PKGDESTDIR}/usr/share/doc/opencascade/*_LGPL_*.txt
 	vlicense OCCT_LGPL_EXCEPTION.txt

From 107b3356b3b57407a9cbd6a244fe1dd584022394 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 7 Jun 2020 02:11:57 -0300
Subject: [PATCH 3/3] kicad: switch to python3, add occt build_option.

- Move from wxPython to wxPython4.
- Move from python to python3.
- Fix wxWidgets config options.

- Add occt build option (not needed for now, occt can be built for all archs).

[ci skip]
---
 srcpkgs/kicad/template | 35 +++++++++++++++++------------------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/srcpkgs/kicad/template b/srcpkgs/kicad/template
index 8368993a5e6..7ef1403e996 100644
--- a/srcpkgs/kicad/template
+++ b/srcpkgs/kicad/template
@@ -6,31 +6,30 @@ build_style=cmake
 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_USE_OCC=ON -DKICAD_SPICE=$(vopt_if spice ON OFF)"
-hostmakedepends="pkg-config swig wxWidgets-gtk3-devel"
-makedepends="wxWidgets-gtk3-devel wxPython-devel python-devel glew-devel cairo-devel
- libressl-devel boost-devel libcurl-devel glm occt-devel libgomp-devel
- $(vopt_if spice ngspice-devel)"
-depends="wxPython"
+ -DKICAD_SCRIPTING_PYTHON3=ON -DKICAD_SCRIPTING_WXPYTHON_PHOENIX=ON
+ -DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-gtk3
+ -DKICAD_USE_OCC=$(vopt_if occt ON OFF) -DKICAD_SPICE=$(vopt_if spice ON OFF)"
+hostmakedepends="pkg-config swig wxWidgets-gtk3-devel python3"
+makedepends="wxWidgets-gtk3-devel wxPython4 python3-devel glew-devel cairo-devel
+ libressl-devel boost-devel libcurl-devel glm libgomp-devel
+ $(vopt_if occt occt-devel) $(vopt_if spice ngspice-devel)"
+depends="wxPython4"
 short_desc="Electronic schematic and PCB design software"
 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=ac1a15e25a7ff0aca4b6224bdb2d3298081b43bedfad79470339d53d5e72beb0
-build_options="spice"
-build_options_default="spice"
+python_version=3
 
-CXXFLAGS="-std=c++17"
+build_options="spice occt"
+build_options_default="spice occt"
+desc_option_spice="Enable support for SPICE simulation"
+desc_option_occt="Enable support for 3D STEP models"
 
 if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" python wxPython"
-	configure_args+=" -DPYTHON_SITE_PACKAGE_PATH=${XBPS_CROSS_BASE}/${py2_sitelib}
-	 -DPYTHON_DEST=/${py2_sitelib}"
+	hostmakedepends+=" wxPython4"
+	configure_args+=" -DPYTHON_SITE_PACKAGE_PATH=/${py3_sitelib}
+	 -DPYTHON_DEST=/${py3_sitelib}
+ 	 -DwxWidgets_CONFIG_OPTIONS='--prefix=${XBPS_CROSS_BASE}'"
 fi
-
-pre_configure() {
-	if [ "$CROSS_BUILD" ]; then
-		CXXFLAGS+=" $(wx-config --cxxflags)"
-	fi
-}