Github messages for voidlinux
 help / color / mirror / Atom feed
From: classabbyamp <classabbyamp@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] kicad: update to 8.0.0, adopt.
Date: Tue, 27 Feb 2024 22:48:46 +0100	[thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-48973@inbox.vuxu.org> (raw)

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

There is a new pull request by classabbyamp against master on the void-packages repository

https://github.com/classabbyamp/void-packages update/kicad
https://github.com/void-linux/void-packages/pull/48973

kicad: update to 8.0.0, adopt.
combine templates because they should all be synced anyways

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**


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

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

From f987b02771f4298cb649d8e08ef5491d657b4734 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
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            | 131 ++++++++++++++++++++++++------
 13 files changed, 113 insertions(+), 106 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 00000000000000..e01819c8ab8b03
--- /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 956efa4a9b12b6..00000000000000
--- 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 <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/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 00000000000000..e01819c8ab8b03
--- /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 1b46c88a68b27b..00000000000000
--- 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 <voidpkgs@ursschulz.de>"
-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 00000000000000..e01819c8ab8b03
--- /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 93984947b15426..00000000000000
--- 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 <voidpkgs@ursschulz.de>"
-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 00000000000000..e01819c8ab8b03
--- /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 c9b5122b9ea9a7..00000000000000
--- 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 <voidpkgs@ursschulz.de>"
-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 00000000000000..e01819c8ab8b03
--- /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 8691c59119fa3d..00000000000000
--- 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 <voidpkgs@ursschulz.de>"
-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 00000000000000..e01819c8ab8b03
--- /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 2f415827a7dd3c..00000000000000
--- 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 <voidpkgs@ursschulz.de>"
-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 ec85c0ad05c21e..3cb43ddf7f64e4 100644
--- a/srcpkgs/kicad/template
+++ b/srcpkgs/kicad/template
@@ -1,46 +1,52 @@
 # Template file for 'kicad'
 pkgname=kicad
-version=7.0.8
+version=8.0.0
 revision=1
 build_style=cmake
-build_helper=cmake-wxWidgets-gtk3
+build_helper="cmake-wxWidgets-gtk3"
+build_wrksrc="${pkgname}-${version}"
 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)"
+ -DKICAD_USE_EGL=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 <ericonr@disroot.org>"
+maintainer="classabbyamp <void@placeviolette.net>"
 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
 
-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"
+#nocross="execute lemon during build"
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" wxPython"
@@ -49,3 +55,80 @@ if [ "$CROSS_BUILD" ]; then
 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"
+}

             reply	other threads:[~2024-02-27 21:48 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-02-27 21:48 classabbyamp [this message]
2024-02-27 22:54 ` [PR PATCH] [Updated] " classabbyamp
2024-02-27 22:55 ` classabbyamp
2024-02-28  2:39 ` [PR REVIEW] " sgn
2024-02-28  2:39 ` sgn
2024-02-28  2:39 ` [PR PATCH] [Updated] " sgn
2024-02-28  3:04 ` classabbyamp
2024-02-28  4:26 ` [PR REVIEW] " sgn
2024-02-28  4:26 ` [PR PATCH] [Updated] " sgn
2024-02-28  7:51 ` classabbyamp
2024-02-29 10:13 ` [PR PATCH] [Closed]: " classabbyamp

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-48973@inbox.vuxu.org \
    --to=classabbyamp@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).