* Re: [PR PATCH] [Updated] Switch KiCad to python3
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-22667@inbox.vuxu.org>
@ 2020-07-05 3:12 ` ericonr
2020-07-06 6:27 ` ericonr
` (16 subsequent siblings)
17 siblings, 0 replies; 18+ messages in thread
From: ericonr @ 2020-07-05 3:12 UTC (permalink / raw)
To: ml
[-- 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
-}
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: [PR PATCH] [Updated] Switch KiCad to python3
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-22667@inbox.vuxu.org>
2020-07-05 3:12 ` [PR PATCH] [Updated] Switch KiCad to python3 ericonr
@ 2020-07-06 6:27 ` ericonr
2020-07-06 11:45 ` [PR REVIEW] " Piraty
` (15 subsequent siblings)
17 siblings, 0 replies; 18+ messages in thread
From: ericonr @ 2020-07-06 6:27 UTC (permalink / raw)
To: ml
[-- 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: 6175 bytes --]
From 995bd5c5476eddc2db687b52e21cbfeba48d083c 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 0d1339f857cecbd4c23584b63f2bdcd2b6e667fe 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 dce644f22c96aaf4011008f43228b3032ef31141 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 | 34 ++++++++++++++++------------------
1 file changed, 16 insertions(+), 18 deletions(-)
diff --git a/srcpkgs/kicad/template b/srcpkgs/kicad/template
index 8368993a5e6..3ba95326569 100644
--- a/srcpkgs/kicad/template
+++ b/srcpkgs/kicad/template
@@ -6,31 +6,29 @@ 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_DEST=/${py3_sitelib}
+ -DwxWidgets_CONFIG_OPTIONS='--prefix=${XBPS_CROSS_BASE}'"
fi
-
-pre_configure() {
- if [ "$CROSS_BUILD" ]; then
- CXXFLAGS+=" $(wx-config --cxxflags)"
- fi
-}
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: [PR REVIEW] Switch KiCad to python3
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-22667@inbox.vuxu.org>
2020-07-05 3:12 ` [PR PATCH] [Updated] Switch KiCad to python3 ericonr
2020-07-06 6:27 ` ericonr
@ 2020-07-06 11:45 ` Piraty
2020-07-06 11:46 ` Piraty
` (14 subsequent siblings)
17 siblings, 0 replies; 18+ messages in thread
From: Piraty @ 2020-07-06 11:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 346 bytes --]
New review comment by Piraty on void-packages repository
https://github.com/void-linux/void-packages/pull/22667#discussion_r450165732
Comment:
i think you shouldn't make it a build option, because why would you want to disable it if you can have it...
but rather add configure_args+=" -DUSE_TBB=ON" and makedepends+=" tbb-devel" in this case
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: [PR REVIEW] Switch KiCad to python3
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-22667@inbox.vuxu.org>
` (2 preceding siblings ...)
2020-07-06 11:45 ` [PR REVIEW] " Piraty
@ 2020-07-06 11:46 ` Piraty
2020-07-06 13:35 ` ericonr
` (13 subsequent siblings)
17 siblings, 0 replies; 18+ messages in thread
From: Piraty @ 2020-07-06 11:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 350 bytes --]
New review comment by Piraty on void-packages repository
https://github.com/void-linux/void-packages/pull/22667#discussion_r450165732
Comment:
i think you shouldn't make it a build option, because why would you want to disable it if you can have it...
but rather add `configure_args+=" -DUSE_TBB=ON"` and `makedepends+=" tbb-devel"` in this case
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: [PR REVIEW] Switch KiCad to python3
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-22667@inbox.vuxu.org>
` (3 preceding siblings ...)
2020-07-06 11:46 ` Piraty
@ 2020-07-06 13:35 ` ericonr
2020-07-06 15:01 ` q66
` (12 subsequent siblings)
17 siblings, 0 replies; 18+ messages in thread
From: ericonr @ 2020-07-06 13:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 382 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/22667#discussion_r450224612
Comment:
@q66 has mentioned that packages shouldn't have different features for different archs, if there isn't anything obvious differentiating between them. Using a build option as a way to make platform support clear is a preferred solution.
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: [PR REVIEW] Switch KiCad to python3
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-22667@inbox.vuxu.org>
` (4 preceding siblings ...)
2020-07-06 13:35 ` ericonr
@ 2020-07-06 15:01 ` q66
2020-07-06 15:03 ` ericonr
` (11 subsequent siblings)
17 siblings, 0 replies; 18+ messages in thread
From: q66 @ 2020-07-06 15:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 228 bytes --]
New review comment by q66 on void-packages repository
https://github.com/void-linux/void-packages/pull/22667#discussion_r450283401
Comment:
I haven't said that, not in this context anyway. This is not really a feature per se.
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: [PR REVIEW] Switch KiCad to python3
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-22667@inbox.vuxu.org>
` (5 preceding siblings ...)
2020-07-06 15:01 ` q66
@ 2020-07-06 15:03 ` ericonr
2020-07-06 15:03 ` q66
` (10 subsequent siblings)
17 siblings, 0 replies; 18+ messages in thread
From: ericonr @ 2020-07-06 15:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 191 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/22667#discussion_r450284932
Comment:
Should I do it without a build option, then?
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: [PR REVIEW] Switch KiCad to python3
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-22667@inbox.vuxu.org>
` (6 preceding siblings ...)
2020-07-06 15:03 ` ericonr
@ 2020-07-06 15:03 ` q66
2020-07-06 15:06 ` q66
` (9 subsequent siblings)
17 siblings, 0 replies; 18+ messages in thread
From: q66 @ 2020-07-06 15:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 312 bytes --]
New review comment by q66 on void-packages repository
https://github.com/void-linux/void-packages/pull/22667#discussion_r450283401
Comment:
I haven't said that, not in this context anyway (I said cross-compiled packages shouldn't be compiled differently than native ones). This is not really a feature per se.
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: [PR REVIEW] Switch KiCad to python3
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-22667@inbox.vuxu.org>
` (7 preceding siblings ...)
2020-07-06 15:03 ` q66
@ 2020-07-06 15:06 ` q66
2020-07-06 15:08 ` Piraty
` (8 subsequent siblings)
17 siblings, 0 replies; 18+ messages in thread
From: q66 @ 2020-07-06 15:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 239 bytes --]
New review comment by q66 on void-packages repository
https://github.com/void-linux/void-packages/pull/22667#discussion_r450287312
Comment:
also, i'm fairly sure tbb can be made to work everywhere, and the current template is just wrong
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: [PR REVIEW] Switch KiCad to python3
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-22667@inbox.vuxu.org>
` (8 preceding siblings ...)
2020-07-06 15:06 ` q66
@ 2020-07-06 15:08 ` Piraty
2020-07-06 15:26 ` [PR PATCH] [Updated] " ericonr
` (7 subsequent siblings)
17 siblings, 0 replies; 18+ messages in thread
From: Piraty @ 2020-07-06 15:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 325 bytes --]
New review comment by Piraty on void-packages repository
https://github.com/void-linux/void-packages/pull/22667#discussion_r450288606
Comment:
the result is the same for tbb-unsupported archs anyway, no matter if you make it a build_option or not. So it's either "have it not at all on" or have it but with not tbb support
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: [PR PATCH] [Updated] Switch KiCad to python3
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-22667@inbox.vuxu.org>
` (9 preceding siblings ...)
2020-07-06 15:08 ` Piraty
@ 2020-07-06 15:26 ` ericonr
2020-07-20 4:00 ` ericonr
` (6 subsequent siblings)
17 siblings, 0 replies; 18+ messages in thread
From: ericonr @ 2020-07-06 15:26 UTC (permalink / raw)
To: ml
[-- 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: 4359 bytes --]
From 0a449ecf3b13af7291404e781343b4c217fabbfe 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/2] 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 c4a1facbec8028a515858fdec1a2d789343aed12 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 2/2] 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 | 34 ++++++++++++++++------------------
1 file changed, 16 insertions(+), 18 deletions(-)
diff --git a/srcpkgs/kicad/template b/srcpkgs/kicad/template
index 8368993a5e6..3ba95326569 100644
--- a/srcpkgs/kicad/template
+++ b/srcpkgs/kicad/template
@@ -6,31 +6,29 @@ 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_DEST=/${py3_sitelib}
+ -DwxWidgets_CONFIG_OPTIONS='--prefix=${XBPS_CROSS_BASE}'"
fi
-
-pre_configure() {
- if [ "$CROSS_BUILD" ]; then
- CXXFLAGS+=" $(wx-config --cxxflags)"
- fi
-}
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: Switch KiCad to python3
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-22667@inbox.vuxu.org>
` (10 preceding siblings ...)
2020-07-06 15:26 ` [PR PATCH] [Updated] " ericonr
@ 2020-07-20 4:00 ` ericonr
2020-07-20 22:34 ` ericonr
` (5 subsequent siblings)
17 siblings, 0 replies; 18+ messages in thread
From: ericonr @ 2020-07-20 4:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 185 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/22667#issuecomment-660788361
Comment:
@Piraty would you mind doing a final review?
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: Switch KiCad to python3
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-22667@inbox.vuxu.org>
` (11 preceding siblings ...)
2020-07-20 4:00 ` ericonr
@ 2020-07-20 22:34 ` ericonr
2020-07-20 22:34 ` ericonr
` (4 subsequent siblings)
17 siblings, 0 replies; 18+ messages in thread
From: ericonr @ 2020-07-20 22:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 252 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/22667#issuecomment-661390982
Comment:
1. It was revbumped for libressl, thanks
2. spice I don't think so, occt is a somewhat heavy library, at 130MB
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: Switch KiCad to python3
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-22667@inbox.vuxu.org>
` (12 preceding siblings ...)
2020-07-20 22:34 ` ericonr
@ 2020-07-20 22:34 ` ericonr
2020-07-22 15:40 ` [PR PATCH] [Updated] " ericonr
` (3 subsequent siblings)
17 siblings, 0 replies; 18+ messages in thread
From: ericonr @ 2020-07-20 22:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 265 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/22667#issuecomment-661390982
Comment:
1. It was revbumped for libressl, thanks for spotting
2. spice I don't think so, occt is a somewhat heavy library, at 130MB
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: [PR PATCH] [Updated] Switch KiCad to python3
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-22667@inbox.vuxu.org>
` (13 preceding siblings ...)
2020-07-20 22:34 ` ericonr
@ 2020-07-22 15:40 ` ericonr
2020-07-22 15:41 ` ericonr
` (2 subsequent siblings)
17 siblings, 0 replies; 18+ messages in thread
From: ericonr @ 2020-07-22 15:40 UTC (permalink / raw)
To: ml
[-- 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: 4445 bytes --]
From 0a449ecf3b13af7291404e781343b4c217fabbfe 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/2] 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 879c043092e0ae190a31f765cb0164fe3d4cac66 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 2/2] 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 | 36 +++++++++++++++++-------------------
1 file changed, 17 insertions(+), 19 deletions(-)
diff --git a/srcpkgs/kicad/template b/srcpkgs/kicad/template
index 8368993a5e6..b92f051f004 100644
--- a/srcpkgs/kicad/template
+++ b/srcpkgs/kicad/template
@@ -1,36 +1,34 @@
# Template file for 'kicad'
pkgname=kicad
version=5.1.6
-revision=2
+revision=3
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_DEST=/${py3_sitelib}
+ -DwxWidgets_CONFIG_OPTIONS='--prefix=${XBPS_CROSS_BASE}'"
fi
-
-pre_configure() {
- if [ "$CROSS_BUILD" ]; then
- CXXFLAGS+=" $(wx-config --cxxflags)"
- fi
-}
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: Switch KiCad to python3
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-22667@inbox.vuxu.org>
` (14 preceding siblings ...)
2020-07-22 15:40 ` [PR PATCH] [Updated] " ericonr
@ 2020-07-22 15:41 ` ericonr
2020-07-27 19:31 ` [PR PATCH] [Updated] " ericonr
2020-07-27 19:31 ` ericonr
17 siblings, 0 replies; 18+ messages in thread
From: ericonr @ 2020-07-22 15:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 219 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/22667#issuecomment-662527652
Comment:
@Piraty I had understood it, but somehow my force push didn't get here. Sorry.
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: [PR PATCH] [Updated] Switch KiCad to python3
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-22667@inbox.vuxu.org>
` (15 preceding siblings ...)
2020-07-22 15:41 ` ericonr
@ 2020-07-27 19:31 ` ericonr
2020-07-27 19:31 ` ericonr
17 siblings, 0 replies; 18+ messages in thread
From: ericonr @ 2020-07-27 19:31 UTC (permalink / raw)
To: ml
[-- 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: 4849 bytes --]
From 0a449ecf3b13af7291404e781343b4c217fabbfe 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/2] 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 4bb79ca2434c963e4e9a88336c6ba4800d792992 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 2/2] 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).
- Add update file: without one, it couldn't find versions. Also ignore
development version *99*.
[ci skip]
---
srcpkgs/kicad/template | 36 +++++++++++++++++-------------------
srcpkgs/kicad/update | 2 ++
2 files changed, 19 insertions(+), 19 deletions(-)
create mode 100644 srcpkgs/kicad/update
diff --git a/srcpkgs/kicad/template b/srcpkgs/kicad/template
index 8368993a5e6..b92f051f004 100644
--- a/srcpkgs/kicad/template
+++ b/srcpkgs/kicad/template
@@ -1,36 +1,34 @@
# Template file for 'kicad'
pkgname=kicad
version=5.1.6
-revision=2
+revision=3
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_DEST=/${py3_sitelib}
+ -DwxWidgets_CONFIG_OPTIONS='--prefix=${XBPS_CROSS_BASE}'"
fi
-
-pre_configure() {
- if [ "$CROSS_BUILD" ]; then
- CXXFLAGS+=" $(wx-config --cxxflags)"
- fi
-}
diff --git a/srcpkgs/kicad/update b/srcpkgs/kicad/update
new file mode 100644
index 00000000000..2060b2060cb
--- /dev/null
+++ b/srcpkgs/kicad/update
@@ -0,0 +1,2 @@
+site="https://gitlab.com/kicad/code/kicad/-/tags"
+ignore="*99*"
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: Switch KiCad to python3
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-22667@inbox.vuxu.org>
` (16 preceding siblings ...)
2020-07-27 19:31 ` [PR PATCH] [Updated] " ericonr
@ 2020-07-27 19:31 ` ericonr
17 siblings, 0 replies; 18+ messages in thread
From: ericonr @ 2020-07-27 19:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 159 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/22667#issuecomment-664594380
Comment:
Added update file.
^ permalink raw reply [flat|nested] 18+ messages in thread