From: PoroCYon <PoroCYon@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] kicad: update to 6.0.0
Date: Sun, 16 Jan 2022 17:37:52 +0100 [thread overview]
Message-ID: <20220116163752.1cZ9XaRT00J4si8H7f0ZcPiMVmjSi07vaqr1gUGd8yI@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-34917@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1231 bytes --]
There is an updated pull request by PoroCYon against master on the void-packages repository
https://github.com/PoroCYon/void-packages kicad-600
https://github.com/void-linux/void-packages/pull/34917
kicad: update to 6.0.0
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**/**briefly**: I opened a project of mine, looked around and made some minor edits, tried the main components (schematic editor, PCB editor, 3D viewer), but I didn't test *all* features (scripting, gerber output with weird contents, SPICE integration, ...).
[ci skip] because `kicad-packages3D` is humongous, and KiCAD itself takes a long while to build, and all other packages are trivial (only assets). (Should I split up the PR?)
#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc
- I did **not** build this PR locally for these architectures as I don't have any of these machines (thus cannot test it) and cross-compiling would take too long.
So, preferably, a few other people should test this PR as well.
A patch file from https://github.com/void-linux/void-packages/pull/34917.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-kicad-600-34917.patch --]
[-- Type: text/x-diff, Size: 9165 bytes --]
From dcf7bfe200b3719981a038fbeece23a850297a72 Mon Sep 17 00:00:00 2001
From: PoroCYon <porocyon@titandemo.org>
Date: Fri, 7 Jan 2022 03:38:45 +0100
Subject: [PATCH] kicad: update to 6.0.1
---
srcpkgs/kicad-doc/template | 15 ------------
| 6 ++---
srcpkgs/kicad-i18n/template | 15 ------------
srcpkgs/kicad-library/template | 2 +-
srcpkgs/kicad-packages3D/template | 6 ++---
srcpkgs/kicad-symbols/template | 4 ++--
srcpkgs/kicad-templates/template | 4 ++--
srcpkgs/kicad/patches/disable-warnings.patch | 24 ++++++++------------
srcpkgs/kicad/template | 16 ++++++-------
9 files changed, 29 insertions(+), 63 deletions(-)
delete mode 100644 srcpkgs/kicad-doc/template
delete mode 100644 srcpkgs/kicad-i18n/template
diff --git a/srcpkgs/kicad-doc/template b/srcpkgs/kicad-doc/template
deleted file mode 100644
index 398cb7c5c0f2..000000000000
--- a/srcpkgs/kicad-doc/template
+++ /dev/null
@@ -1,15 +0,0 @@
-# Template file for 'kicad-doc'
-pkgname=kicad-doc
-version=5.1.11
-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/${pkgname}-${version}.tar.gz"
-checksum=3ce13d43c29e9eab502575b765a9be077e4d478b6e9d829c01739a7575a83512
-
-do_install() {
- vmkdir usr/
- vcopy share/ usr/
-}
--git a/srcpkgs/kicad-footprints/template b/srcpkgs/kicad-footprints/template
index 53ee1dad0c2e..aa8062df6655 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.11
+version=6.0.1
revision=1
build_style=cmake
depends="kicad"
@@ -9,9 +9,9 @@ maintainer="Urs Schulz <voidpkgs@ursschulz.de>"
license="CC-BY-SA-4.0"
homepage="http://kicad.org"
distfiles="https://gitlab.com/kicad/libraries/${pkgname}/-/archive/${version}/${pkgname}-${version}.tar.gz"
-checksum=320cae2d830cfb4ff50f187f36c9e7c3c1565fbd6ea5b064e98ec44891ea8b9e
+checksum=c2b825f346b5eb60faaa7b39c64855c47d80e1ef950e4df08c58e843783bc9a6
post_install() {
# otherwise KiCad will complain about a missing library when launched
- touch $DESTDIR/usr/share/kicad/modules/Connector_Multicomp.pretty/.empty
+ touch $DESTDIR/usr/share/kicad/footprints/Connector_Multicomp.pretty/.empty
}
diff --git a/srcpkgs/kicad-i18n/template b/srcpkgs/kicad-i18n/template
deleted file mode 100644
index 67d31370545f..000000000000
--- a/srcpkgs/kicad-i18n/template
+++ /dev/null
@@ -1,15 +0,0 @@
-# Template file for 'kicad-i18n'
-pkgname=kicad-i18n
-version=5.1.11
-revision=1
-_commit=0ad3d7e469e31c8868ad83f90e22a9c18f16aa1f
-wrksrc="${pkgname}-${version}-${_commit}"
-build_style=cmake
-hostmakedepends="gettext"
-depends="kicad"
-short_desc="KiCad localization files"
-maintainer="Urs Schulz <voidpkgs@ursschulz.de>"
-license="CC-BY-SA-4.0"
-homepage="http://kicad.org"
-distfiles="https://gitlab.com/kicad/code/${pkgname}/-/archive/${version}/kicad-${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=2cbde9705f945be3b9796d981aea0dbc70a3f24796c9156e337b8014868be4e9
diff --git a/srcpkgs/kicad-library/template b/srcpkgs/kicad-library/template
index b8bb109976e7..ab472215f802 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.11
+version=6.0.1
revision=1
build_style=meta
depends="kicad-footprints>=${version} kicad-packages3D>=${version}
diff --git a/srcpkgs/kicad-packages3D/template b/srcpkgs/kicad-packages3D/template
index 3bd516bb4859..bc7dfc81abc6 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.11
+version=6.0.1
revision=1
build_style=cmake
depends="kicad"
@@ -8,5 +8,5 @@ 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/${pkgname}/-/archive/${version}/${pkgname}-${version}.tar.gz"
-checksum=5ef77e1762fa8e8042f061dd2baa2bcb8934fe80c154f8b7e3c7a8cf474927d9
+distfiles="https://gitlab.com/kicad/libraries/${pkgname}/-/archive/${version}/${pkgname}-${version}.tar.bz2"
+checksum=caf3359cf474b4f71fa2b62a5128d594f92285a92817adbcd6be99f199ac36da
diff --git a/srcpkgs/kicad-symbols/template b/srcpkgs/kicad-symbols/template
index a5c8b3ebcb59..4580597c8f23 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.11
+version=6.0.1
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.org"
distfiles="https://gitlab.com/kicad/libraries/${pkgname}/-/archive/${version}/${pkgname}-${version}.tar.gz"
-checksum=f0877ff30e3f17be1ba17f33895a45998b4c08d62a48c51a25626ce7e269b098
+checksum=56593ff7dfae14ce4e5afa2b0477a8fb832dbf5ae81abec831ebbae7568f0433
diff --git a/srcpkgs/kicad-templates/template b/srcpkgs/kicad-templates/template
index 7cfe95f73be5..9d3319894ca4 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.11
+version=6.0.1
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.org"
distfiles="https://gitlab.com/kicad/libraries/${pkgname}/-/archive/${version}/${pkgname}-${version}.tar.gz"
-checksum=66272a39f624f5efa494b6bde2c10f3553167dbae5f52ca14a786bfc002b7961
+checksum=590d77e693d9f54d740e75f8e504e02227da44461f3ef3e69ff2ef9c3d6d78ee
diff --git a/srcpkgs/kicad/patches/disable-warnings.patch b/srcpkgs/kicad/patches/disable-warnings.patch
index e59a54172441..7a7e7a2193e6 100644
--- a/srcpkgs/kicad/patches/disable-warnings.patch
+++ b/srcpkgs/kicad/patches/disable-warnings.patch
@@ -1,17 +1,13 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 21bebddbb1..956de85b13 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -197,12 +197,6 @@ perform_feature_checks()
- if( CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
- include(CheckCXXCompilerFlag)
+--- a/CMakeModules/Warnings.cmake
++++ b/CMakeModules/Warnings.cmake
+@@ -38,13 +38,6 @@
+ set( WARN_FLAGS_CXX "-Wall" )
-- CHECK_CXX_COMPILER_FLAG("-Wsuggest-override" COMPILER_SUPPORTS_WSUGGEST_OVERRIDE)
+
+- # Warn about missing override specifiers
+- CHECK_CXX_COMPILER_FLAG( "-Wsuggest-override" COMPILER_SUPPORTS_WSUGGEST_OVERRIDE )
-
-- if(COMPILER_SUPPORTS_WSUGGEST_OVERRIDE)
-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wsuggest-override")
+- if( COMPILER_SUPPORTS_WSUGGEST_OVERRIDE )
+- set( WARN_FLAGS_CXX "${WARN_FLAGS_CXX} -Wsuggest-override" )
+- message( STATUS "Enabling warning -Wsuggest-override" )
- endif()
--
- CHECK_CXX_COMPILER_FLAG("-Wvla" COMPILER_SUPPORTS_WVLA)
-
- if(COMPILER_SUPPORTS_WVLA)
diff --git a/srcpkgs/kicad/template b/srcpkgs/kicad/template
index ba9934bf70c2..34217d0f16e2 100644
--- a/srcpkgs/kicad/template
+++ b/srcpkgs/kicad/template
@@ -1,18 +1,18 @@
# Template file for 'kicad'
pkgname=kicad
-version=5.1.11
-revision=4
+version=6.0.1
+revision=1
build_style=cmake
build_helper=cmake-wxWidgets-gtk3
-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
+configure_args="-DKICAD_SCRIPTING=ON -DKICAD_SCRIPTING_MODULES=ON
+ -DKICAD_SCRIPTING_WXPYTHON=ON -DKICAD_SCRIPTING_ACTION_MENU=ON
-DKICAD_SCRIPTING_PYTHON3=ON -DKICAD_SCRIPTING_WXPYTHON_PHOENIX=ON
-DwxWidgets_CONFIG_EXECUTABLE=$WX_CONFIG
-DKICAD_USE_OCC=$(vopt_if occt ON OFF) -DKICAD_SPICE=$(vopt_if spice ON OFF)"
-hostmakedepends="pkg-config swig wxWidgets-gtk3-devel python3"
+hostmakedepends="pkg-config swig wxWidgets-gtk3-devel python3 tar"
makedepends="wxWidgets-gtk3-devel wxPython4 python3-devel glew-devel cairo-devel
- openssl-devel boost-devel libcurl-devel glm libgomp-devel
+ openssl-devel boost-devel libcurl-devel glm libgomp-devel libfreeglut-devel
+ gtk+3-devel libcurl-devel
$(vopt_if occt occt-devel) $(vopt_if spice ngspice-devel)"
depends="wxPython4"
short_desc="Electronic schematic and PCB design software"
@@ -20,7 +20,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
license="GPL-3.0-or-later"
homepage="http://kicad.org"
distfiles="https://gitlab.com/kicad/code/${pkgname}/-/archive/${version}/kicad-${version}.tar.gz"
-checksum=32751a375bb117d51c07dde29cf3eea01cd9ff77336740e2728cb5f36bb48374
+checksum=946173455db986cc79050a8c1983193690f14eb538785b21c1584d5999b864e4
python_version=3
build_options="spice occt"
next prev parent reply other threads:[~2022-01-16 16:37 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-07 2:47 [PR PATCH] " PoroCYon
2022-01-07 18:52 ` unspecd
2022-01-07 23:07 ` [PR PATCH] [Updated] " PoroCYon
2022-01-07 23:10 ` PoroCYon
2022-01-16 8:43 ` lemmi
2022-01-16 8:44 ` lemmi
2022-01-16 16:37 ` PoroCYon [this message]
2022-01-16 16:38 ` PoroCYon
2022-01-16 17:48 ` kicad: update to 6.0.1 PoroCYon
2022-01-16 18:35 ` [PR REVIEW] " ericonr
2022-01-16 18:35 ` ericonr
2022-01-16 18:35 ` ericonr
2022-01-16 23:33 ` PoroCYon
2022-01-16 23:39 ` PoroCYon
2022-01-17 0:55 ` [PR PATCH] [Updated] " PoroCYon
2022-01-17 0:57 ` PoroCYon
2022-01-17 4:47 ` [PR REVIEW] " ericonr
2022-01-17 17:17 ` [PR PATCH] [Updated] " PoroCYon
2022-01-23 22:23 ` PoroCYon
2022-01-26 17:26 ` foopub
2022-01-26 17:34 ` foopub
2022-01-27 0:32 ` PoroCYon
2022-01-27 1:05 ` PoroCYon
2022-01-27 13:53 ` [PR PATCH] [Updated] " PoroCYon
2022-01-28 6:27 ` [PR PATCH] [Closed]: " ericonr
2022-01-28 8:00 ` ericonr
2022-01-29 1:12 ` foopub
2022-01-29 1:12 ` foopub
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=20220116163752.1cZ9XaRT00J4si8H7f0ZcPiMVmjSi07vaqr1gUGd8yI@z \
--to=porocyon@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).