From 64fe772c6e3c8c01d08f4f5cf7883449012f6b72 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Tue, 27 Feb 2024 16:47:26 -0500 Subject: [PATCH] kicad: update to 8.0.0, adopt. combine templates because they should all be synced anyways --- srcpkgs/kicad-doc | 1 + srcpkgs/kicad-doc/template | 23 ------ srcpkgs/kicad-footprints | 1 + srcpkgs/kicad-footprints/template | 12 --- srcpkgs/kicad-library | 1 + srcpkgs/kicad-library/template | 11 --- srcpkgs/kicad-packages3D | 1 + srcpkgs/kicad-packages3D/template | 12 --- srcpkgs/kicad-symbols | 1 + srcpkgs/kicad-symbols/template | 12 --- srcpkgs/kicad-templates | 1 + srcpkgs/kicad-templates/template | 12 --- srcpkgs/kicad/template | 133 +++++++++++++++++++++++------- 13 files changed, 110 insertions(+), 111 deletions(-) create mode 120000 srcpkgs/kicad-doc delete mode 100644 srcpkgs/kicad-doc/template create mode 120000 srcpkgs/kicad-footprints delete mode 100644 srcpkgs/kicad-footprints/template create mode 120000 srcpkgs/kicad-library delete mode 100644 srcpkgs/kicad-library/template create mode 120000 srcpkgs/kicad-packages3D delete mode 100644 srcpkgs/kicad-packages3D/template create mode 120000 srcpkgs/kicad-symbols delete mode 100644 srcpkgs/kicad-symbols/template create mode 120000 srcpkgs/kicad-templates delete mode 100644 srcpkgs/kicad-templates/template diff --git a/srcpkgs/kicad-doc b/srcpkgs/kicad-doc new file mode 120000 index 0000000000000..e01819c8ab8b0 --- /dev/null +++ b/srcpkgs/kicad-doc @@ -0,0 +1 @@ +kicad \ No newline at end of file diff --git a/srcpkgs/kicad-doc/template b/srcpkgs/kicad-doc/template deleted file mode 100644 index 956efa4a9b12b..0000000000000 --- a/srcpkgs/kicad-doc/template +++ /dev/null @@ -1,23 +0,0 @@ -# Template file for 'kicad-doc' -pkgname=kicad-doc -version=7.0.8 -revision=1 -short_desc="KiCad documentation" -maintainer="Érico Nogueira " -license="GPL-3.0-or-later, CC-BY-3.0" -homepage="http://kicad.org" -distfiles="https://kicad-downloads.s3.cern.ch/docs/kicad-doc-${version}.tar.gz" -checksum=923752b5667f76cb4b3a9cbd00c14f36f1bf8cd3930d273c25d67331412f954b - -if [ "$XBPS_WORDSIZE" != "$XBPS_TARGET_WORDSIZE" ]; then - broken="kicad not available" -fi - -if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - broken="kicad not available" -fi - -do_install() { - vmkdir usr/ - vcopy share/ usr/ -} diff --git a/srcpkgs/kicad-footprints b/srcpkgs/kicad-footprints new file mode 120000 index 0000000000000..e01819c8ab8b0 --- /dev/null +++ b/srcpkgs/kicad-footprints @@ -0,0 +1 @@ +kicad \ No newline at end of file diff --git a/srcpkgs/kicad-footprints/template b/srcpkgs/kicad-footprints/template deleted file mode 100644 index 1b46c88a68b27..0000000000000 --- a/srcpkgs/kicad-footprints/template +++ /dev/null @@ -1,12 +0,0 @@ -# Template file for 'kicad-footprints' -pkgname=kicad-footprints -version=7.0.8 -revision=1 -build_style=cmake -depends="kicad" -short_desc="Kicad footprint libraries" -maintainer="Urs Schulz " -license="CC-BY-SA-4.0" -homepage="http://kicad.org" -distfiles="https://gitlab.com/kicad/libraries/kicad-footprints/-/archive/${version}/kicad-footprints-${version}.tar.gz" -checksum=d9ffd194cdac5ffd67f5b99ee22581c7361ebd44daded7ef6530f4091a60fa4a diff --git a/srcpkgs/kicad-library b/srcpkgs/kicad-library new file mode 120000 index 0000000000000..e01819c8ab8b0 --- /dev/null +++ b/srcpkgs/kicad-library @@ -0,0 +1 @@ +kicad \ No newline at end of file diff --git a/srcpkgs/kicad-library/template b/srcpkgs/kicad-library/template deleted file mode 100644 index 93984947b1542..0000000000000 --- a/srcpkgs/kicad-library/template +++ /dev/null @@ -1,11 +0,0 @@ -# Template file for 'kicad-library' -pkgname=kicad-library -version=7.0.8 -revision=1 -build_style=meta -depends="kicad-footprints>=${version} kicad-packages3D>=${version} - kicad-symbols>=${version} kicad-templates>=${version}" -short_desc="Kicad libraries" -maintainer="Urs Schulz " -license="CC-BY-SA-4.0" -homepage="http://kicad.org" diff --git a/srcpkgs/kicad-packages3D b/srcpkgs/kicad-packages3D new file mode 120000 index 0000000000000..e01819c8ab8b0 --- /dev/null +++ b/srcpkgs/kicad-packages3D @@ -0,0 +1 @@ +kicad \ No newline at end of file diff --git a/srcpkgs/kicad-packages3D/template b/srcpkgs/kicad-packages3D/template deleted file mode 100644 index c9b5122b9ea9a..0000000000000 --- a/srcpkgs/kicad-packages3D/template +++ /dev/null @@ -1,12 +0,0 @@ -# Template file for 'kicad-packages3D' -pkgname=kicad-packages3D -version=7.0.8 -revision=1 -build_style=cmake -depends="kicad" -short_desc="Kicad 3D model libraries" -maintainer="Urs Schulz " -license="CC-BY-SA-4.0" -homepage="http://kicad.org" -distfiles="https://gitlab.com/kicad/libraries/kicad-packages3D/-/archive/${version}/kicad-packages3D-${version}.tar.gz" -checksum=4805e099284aaca4794cd2d80dda33c40d115f6ce735ff66ed296ebed5ec7697 diff --git a/srcpkgs/kicad-symbols b/srcpkgs/kicad-symbols new file mode 120000 index 0000000000000..e01819c8ab8b0 --- /dev/null +++ b/srcpkgs/kicad-symbols @@ -0,0 +1 @@ +kicad \ No newline at end of file diff --git a/srcpkgs/kicad-symbols/template b/srcpkgs/kicad-symbols/template deleted file mode 100644 index 8691c59119fa3..0000000000000 --- a/srcpkgs/kicad-symbols/template +++ /dev/null @@ -1,12 +0,0 @@ -# Template file for 'kicad-symbols' -pkgname=kicad-symbols -version=7.0.8 -revision=1 -build_style=cmake -depends="kicad" -short_desc="Kicad symbol libraries" -maintainer="Urs Schulz " -license="CC-BY-SA-4.0" -homepage="http://kicad.org" -distfiles="https://gitlab.com/kicad/libraries/kicad-symbols/-/archive/${version}/kicad-symbols-${version}.tar.gz" -checksum=c1ff50eb578fa34dbd8d7498dc2f65f5a9ac691df0753f624631911604250767 diff --git a/srcpkgs/kicad-templates b/srcpkgs/kicad-templates new file mode 120000 index 0000000000000..e01819c8ab8b0 --- /dev/null +++ b/srcpkgs/kicad-templates @@ -0,0 +1 @@ +kicad \ No newline at end of file diff --git a/srcpkgs/kicad-templates/template b/srcpkgs/kicad-templates/template deleted file mode 100644 index 2f415827a7dd3..0000000000000 --- a/srcpkgs/kicad-templates/template +++ /dev/null @@ -1,12 +0,0 @@ -# Template file for 'kicad-templates' -pkgname=kicad-templates -version=7.0.8 -revision=1 -build_style=cmake -depends="kicad" -short_desc="Kicad templates" -maintainer="Urs Schulz " -license="CC-BY-SA-4.0" -homepage="http://kicad.org" -distfiles="https://gitlab.com/kicad/libraries/kicad-templates/-/archive/${version}/kicad-templates-${version}.tar.gz" -checksum=5bb487a1bbe664da578b37c123d551be75e108edde8e78e8c06c981260b66629 diff --git a/srcpkgs/kicad/template b/srcpkgs/kicad/template index ec85c0ad05c21..f58d1024cd0c0 100644 --- a/srcpkgs/kicad/template +++ b/srcpkgs/kicad/template @@ -1,51 +1,126 @@ # Template file for 'kicad' pkgname=kicad -version=7.0.8 +version=8.0.0 revision=1 build_style=cmake -build_helper=cmake-wxWidgets-gtk3 -configure_args="-DKICAD_SCRIPTING_WXPYTHON=ON - -DKICAD_BUILD_I18N=ON -DKICAD_I18N_UNIX_STRICT_PATH=ON - -DwxWidgets_CONFIG_EXECUTABLE=$WX_CONFIG -DKICAD_USE_EGL=ON - -DKICAD_USE_OCC=$(vopt_if occt ON OFF) -DKICAD_SPICE=$(vopt_if spice ON OFF)" +build_helper="cmake-wxWidgets-gtk3 qemu python3" +build_wrksrc="${pkgname}-${version}" +configure_args="-DKICAD_SCRIPTING_WXPYTHON=ON -DKICAD_USE_EGL=ON + -DKICAD_BUILD_I18N=ON -DKICAD_I18N_UNIX_STRICT_PATH=ON" hostmakedepends="pkg-config swig wxWidgets-gtk3-devel tar gettext - python3 python3-setuptools" + python3 python3-setuptools ruby-asciidoctor po4a" makedepends="wxWidgets-gtk3-devel wxPython python3-devel glew-devel cairo-devel boost-devel libcurl-devel glm libgomp-devel libfreeglut-devel - gtk+3-devel unixodbc-devel - $(vopt_if occt occt-devel) $(vopt_if spice ngspice-devel)" + gtk+3-devel unixodbc-devel occt-devel ngspice-devel libgit2-devel + libsecret-devel" depends="wxPython" short_desc="Electronic schematic and PCB design software" -maintainer="Érico Nogueira " +maintainer="classabbyamp " license="GPL-3.0-or-later" homepage="http://kicad.org" -distfiles="https://gitlab.com/kicad/code/kicad/-/archive/${version}/kicad-${version}.tar.gz" -checksum=734e8e1de21f6015bc41b2b79cc9e1aefdda5e6ff111a269191cebe0894a5c45 +distfiles="https://gitlab.com/kicad/code/kicad/-/archive/${version}/kicad-${version}.tar.gz + https://gitlab.com/kicad/services/kicad-doc/-/archive/${version}/kicad-doc-${version}.tar.gz + https://gitlab.com/kicad/libraries/kicad-templates/-/archive/${version}/kicad-templates-${version}.tar.gz + https://gitlab.com/kicad/libraries/kicad-symbols/-/archive/${version}/kicad-symbols-${version}.tar.gz + https://gitlab.com/kicad/libraries/kicad-footprints/-/archive/${version}/kicad-footprints-${version}.tar.gz + https://gitlab.com/kicad/libraries/kicad-packages3D/-/archive/${version}/kicad-packages3D-${version}.tar.gz" +checksum="9b8cc1ab7de9d7f913223dbb2fe1be61c254fe478921d4c1fa5f60f30bb6efa7 + cf1db5bb4d1f33d239250804ca18a0a0d9d14fefe30a48c7258b919f729fdb4c + f373cd9a28c9c94146a69a4a9e7eae88f601117f89d4ed44de84f7f35615e691 + 6e2d76df42c46d830f54fc1a760455c8fc849592f43b6804a35863eaca0eaf22 + c674e624def9a550514765d295266945379267d8196908ef6ebba92eff2fe299 + d9e59a50a43b02b19e2564e73110c1ca461494986171b10f6b0a389acd8cf778" python_version=3 replaces="kicad-i18n>=0" +patch_args="-Np1 -d ${build_wrksrc}" # one test appears to be flaky # https://gitlab.com/kicad/code/kicad/-/blob/7.0.0/qa/unittests/eeschema/test_netlist_exporter_spice.h#L195-197 -make_check=ci-skip +#make_check=ci-skip -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 [ "$XBPS_WORDSIZE" != "$XBPS_TARGET_WORDSIZE" ]; then - broken="pybind: Python config failure: Python is 64-bit, chosen compiler is 32-bit" -fi - -if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - broken="common/libgal.a(draw_panel_gal.cpp.o)" -fi - -nocross="execute lemon during build" +# if [ "$XBPS_WORDSIZE" != "$XBPS_TARGET_WORDSIZE" ]; then +# broken="pybind: Python config failure: Python is 64-bit, chosen compiler is 32-bit" +# fi if [ "$CROSS_BUILD" ]; then hostmakedepends+=" wxPython" - configure_args+=" -DPYTHON_DEST=/${py3_sitelib} - -DwxWidgets_CONFIG_OPTIONS='--prefix=${XBPS_CROSS_BASE}'" + configure_args+=" -DPYTHON_DEST=/${py3_sitelib}" fi CXXFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" + +post_configure() { + for subpkg in doc footprints packages3D symbols templates; do + msg_normal "${pkgname}-${subpkg}-${version}_${revision}: running do_configure ...\n" + ( + build_wrksrc="${pkgname}-${subpkg}-${version}" + configure_args="-DBUILD_FORMATS=html" + cd "../${build_wrksrc}" && do_configure + ) + done +} + +post_build() { + for subpkg in doc footprints packages3D symbols templates; do + msg_normal "${pkgname}-${subpkg}-${version}_${revision}: running do_build ...\n" + ( + cd "../${pkgname}-${subpkg}-${version}" && do_build + ) + done +} + +kicad-doc_package() { + short_desc+=" - documentation" + license="GPL-3.0-or-later, CC-BY-3.0" + depends="kicad>=${version}" + pkg_install() { + cd "../${pkgname}-${version}/build" && \ + DESTDIR="${PKGDESTDIR}" ninja install + } +} + +kicad-footprints_package() { + short_desc+=" - footprint libraries" + license="CC-BY-SA-4.0" + depends="kicad>=${version}" + pkg_install() { + cd "../${pkgname}-${version}/build" && \ + DESTDIR="${PKGDESTDIR}" ninja install + } +} + +kicad-packages3D_package() { + short_desc+=" - 3D model libraries" + license="CC-BY-SA-4.0" + depends="kicad>=${version}" + pkg_install() { + cd "../${pkgname}-${version}/build" && \ + DESTDIR="${PKGDESTDIR}" ninja install + } +} + +kicad-symbols_package() { + short_desc+=" - schematic symbol libraries" + license="CC-BY-SA-4.0" + depends="kicad>=${version}" + pkg_install() { + cd "../${pkgname}-${version}/build" && \ + DESTDIR="${PKGDESTDIR}" ninja install + } +} + +kicad-templates_package() { + short_desc+=" - project templates" + license="CC-BY-SA-4.0" + depends="kicad>=${version}" + pkg_install() { + cd "../${pkgname}-${version}/build" && \ + DESTDIR="${PKGDESTDIR}" ninja install + } +} + +kicad-library_package() { + short_desc+=" - all libraries" + depends="kicad-footprints>=${version} kicad-packages3D>=${version} + kicad-symbols>=${version} kicad-templates>=${version}" + build_style="meta" +}