Updated Kicad

This commit is contained in:
Torsten Kurbad
2024-05-04 22:05:10 +02:00
parent 3670dc7348
commit a523e9d008
15 changed files with 44 additions and 62 deletions
+2 -3
View File
@@ -1,4 +1,3 @@
AUX kicad-7.0.0-werror.patch 682 BLAKE2B 268cf848679ffb5b5aa2389a6392986f908c64861fb6908a864ae41d788f8ac10a21d30b7a20b98409cad7f57191958f9d95d448be7c8070806c585c03d7ce8a SHA512 c30b9a080cc74687b44fb5e547d746c4e3298096e9ffa1bf5a7a2b477efb8d05db8adad7255d6b92eb2c00f739e4fcd79b9c198b3122265d26edc1db5cb4ee5e
DIST kicad-7.0.9.tar.bz2 43964032 BLAKE2B 78f7ad1409a60e9d577c97b57745e5aaa4c104ff8b7beeee6bcd4bedac2aa05b1fb4362ccb8a9ec01a322d420214a44bda30b0695a4bf02ea001f733c8671c7d SHA512 373f744d1295a04862cb9997541c3180ef3f11cd313b4bf8ff31024fe2dca1cbb5b0b15bc72f645a50fd78a0f9c4c840c8ed826e3df8b107d0d172c4c9020f2d
EBUILD kicad-7.0.9.ebuild 4176 BLAKE2B d0fb5c9a2c445fe056dd46ca9c11de274c44a6169cca3b0bb115c218b122b6bf43b49f9c05ad7565a1058b7a47b64bf23c9150f7caef7c724a6b6be3873874bf SHA512 12526591febb7c328252ab32b2b3520540db0fa0fc7bd1bd42d2476eb2c0e12d9fe2420fdca9d350c464deaded48c8798f926b882cc862068ac2a774b6b4e6c6
DIST kicad-8.0.2.tar.bz2 72713030 BLAKE2B ba47a16b5c435970a45aef9988a5f6d218df043a5ce3547a191991ef63620125989e6218e97266a62c76ece604248bdf0652a10d423346fe3648c8ba240651c4 SHA512 192bcd494f00eccc430ddf9e9034f252bae177f06da81e730fb82f000a58bac9201d49ecba93c3bd17608b6df6a944beea85849050e306e11c1abfbd0028ff4a
EBUILD kicad-8.0.2.ebuild 4437 BLAKE2B d97a81e37f42b0f68be095a4662c73dbcdaed9de4707f49dccec9bad8cfe7c88b577ce7241a4aea831b674753a4bc37570bef8ded4ac8592d350466d947374b3 SHA512 cb4639175d6a547643e40b54e71b6cff07e024bf16f85163cf1b5fb5d3b9193e21680e7e1f30770570d012a59af35ed7368c5ae2ff07c3a8e531e34c1f71646d
MISC metadata.xml 765 BLAKE2B ca4295c6a975ed0161e0e19d6faffa585001c65bb1b6c53659d63c22e10aa1856840752182e3f9108b11b582105691f6d03f3a63ee52fd5ea875b6ba3049e379 SHA512 4af8f8ba855e6c5dfc6e4f34ba1efb0705fb92dffb9fcc6196457a43ebca11da4b1fa752a6bba02ce3bbb7bfbbeeb5a5f8cedfb055378d67f622014ba3240768
@@ -1,21 +0,0 @@
From 04fc6081bd3d6575d00589f71150ab796778a9c9 Mon Sep 17 00:00:00 2001
From: Matthew Smith <matthew@gentoo.org>
Date: Mon, 20 Feb 2023 17:53:50 +0000
Subject: [PATCH] build: Remove Werror flag from clipper2
Bug: https://bugs.gentoo.org/895014
--- a/thirdparty/clipper2/CMakeLists.txt
+++ b/thirdparty/clipper2/CMakeLists.txt
@@ -27,7 +27,7 @@ target_compile_definitions(clipper2 PUBLIC USINGZ)
if (MSVC)
target_compile_options(clipper2 PRIVATE /W4 /WX)
else()
- target_compile_options(clipper2 PRIVATE -Wall -Wextra -Wpedantic -Werror)
+ target_compile_options(clipper2 PRIVATE -Wall -Wextra -Wpedantic)
target_link_libraries(clipper2 PUBLIC -lm)
endif()
--
2.39.2
@@ -1,9 +1,9 @@
# Copyright 1999-2023 Gentoo Authors
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
PYTHON_COMPAT=( python3_{9..11} )
PYTHON_COMPAT=( python3_{10..11} )
WX_GTK_VER="3.2-gtk3"
inherit check-reqs cmake optfeature python-single-r1 toolchain-funcs wxwidgets xdg-utils
@@ -28,23 +28,28 @@ fi
# BSD for bundled pybind
LICENSE="GPL-2+ GPL-3+ Boost-1.0 BSD"
SLOT="0"
IUSE="doc examples nls openmp"
IUSE="doc examples nls openmp telemetry test"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RESTRICT="!test? ( test )"
# Contains bundled pybind but it's patched for wx
# See https://gitlab.com/kicad/code/kicad/-/commit/74e4370a9b146b21883d6a2d1df46c7a10bd0424
# Depend on opencascade:0 to get unslotted variant (so we know path to it), bug #833301
# Depend wxGTK version needs to be limited due to switch from EGL to GLX, bug #911120
COMMON_DEPEND="
app-crypt/libsecret
dev-db/unixODBC
dev-libs/boost:=[context,nls]
dev-libs/libgit2:=
media-libs/freeglut
media-libs/glew:0=
>=media-libs/glm-0.9.9.1
media-libs/mesa[X(+)]
net-misc/curl
>=sci-libs/opencascade-7.3.0:0=
>=sci-libs/opencascade-7.5.0:0=
<sci-libs/opencascade-7.8.0:0=
>=x11-libs/cairo-1.8.8:=
>=x11-libs/pixman-0.30
>sci-electronics/ngspice-27[shared]
@@ -52,19 +57,22 @@ COMMON_DEPEND="
>=x11-libs/wxGTK-3.2.2.1-r3:${WX_GTK_VER}[X,opengl]
$(python_gen_cond_dep '
dev-libs/boost:=[context,nls,python,${PYTHON_USEDEP}]
~dev-python/wxpython-4.2.0:*[${PYTHON_USEDEP}]
>=dev-python/wxpython-4.2.0:*[${PYTHON_USEDEP}]
')
${PYTHON_DEPS}
nls? (
sys-devel/gettext
)
test? (
media-gfx/cairosvg
)
"
DEPEND="${COMMON_DEPEND}"
RDEPEND="${COMMON_DEPEND}
sci-electronics/electronics-menu
"
BDEPEND=">=dev-lang/swig-4.0
doc? ( app-doc/doxygen )"
doc? ( app-text/doxygen )"
if [[ ${PV} == 9999 ]] ; then
# x11-misc-util/macros only required on live ebuilds
@@ -73,10 +81,6 @@ fi
CHECKREQS_DISK_BUILD="1500M"
PATCHES=(
"${FILESDIR}"/${PN}-7.0.0-werror.patch
)
pkg_setup() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
@@ -115,6 +119,11 @@ src_configure() {
-DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade
-DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/opencascade
-DKICAD_USE_SENTRY="$(usex telemetry)"
-DKICAD_SPICE_QA="$(usex test)"
-DKICAD_BUILD_QA_TESTS="$(usex test)"
)
cmake_src_configure
@@ -129,7 +138,8 @@ src_compile() {
src_test() {
# Test cannot find library in Portage's sandbox. Let's create a link so test can run.
ln -s "${BUILD_DIR}/eeschema/_eeschema.kiface" "${BUILD_DIR}/qa/eeschema/_eeschema.kiface" || die
mkdir -p "${BUILD_DIR}/qa/eeschema/" || die
dosym "${BUILD_DIR}/eeschema/_eeschema.kiface" "${BUILD_DIR}/qa/eeschema/_eeschema.kiface" || die
# LD_LIBRARY_PATH is there to help it pick up the just-built libraries
LD_LIBRARY_PATH="${BUILD_DIR}/3d-viewer/3d_cache/sg:${LD_LIBRARY_PATH}" cmake_src_test