mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-11-21 22:47:14 -08:00
sci-electronics/kicad: Revert "Remove old"
Reverts: f8f1cdc9d7
Signed-off-by: Michał Górny <mgorny@gentoo.org>
This commit is contained in:
@@ -1,3 +1,4 @@
|
||||
DIST kicad-10.0.3.tar.bz2 225465490 BLAKE2B ff9f4203463bf31c95f9da224185a5203db11d054a85553ad243460035eb54796d899037152f7625a4531faae47d09d1eb352ffb2a74f26f152fa9868afc4c67 SHA512 784220e13637c32157daeeecb89f8db56861bc39f459d9add7e6e49e9cacd4503d486076fca35157cc58e7eb0ad0d365b6419bf7fe0fdfc55f2acb8a6f812925
|
||||
DIST kicad-10.0.5.tar.bz2 232792797 BLAKE2B 1f73607cada273972ad6029fd8ffb4d01b8d9646191cab9cdc57d7b6285754bf1806dec12d8e66e7d407a9ac6ccb0636c533db78766a5fed59493dc94ee65322 SHA512 58897802ba53585f09e7b7991028bcc8b8240a0917d9306f12a63242ce0fb8932cc229e99298b2addcc85486bdd48ac9bc09cde3162b90798538ae0dfe76bc87
|
||||
DIST kicad-10.0.8.tar.bz2 234885503 BLAKE2B 61c5d3604a85143323c75dd8a7cd5be465e8cfaf63e04a3b8a3111d2877b3c682e4681c444165a804ea55e5e0f6be545c90f22fa82ed182a1ee09345ad4aadbf SHA512 a01eeb8c1de9d63d6a231faacf5a924c72852fd95215a9bfc7eed3877455a53c703084a9707f3e362b0e1808519cff60382159c0bea2a64f920d4c029ee2b86c
|
||||
DIST kicad-9.0.9.tar.bz2 132155425 BLAKE2B 8283551d85c1e2911909be31dd2c3df66fede2140a27d3da12f77cb08edd41942ebe8e269bafe41df16d5201b612f8fe72480538efef89af7aa31aec3475ad3c SHA512 0078387092374e2fbb067920a185b4606f53b3056ba95251da0883605cf0fcee2f4d26b8df187b02927e6bde30a33b6b25291fa18bfee87f463de596106bddf7
|
||||
|
||||
@@ -0,0 +1,22 @@
|
||||
https://bugs.gentoo.org/970924
|
||||
|
||||
CMake >= 4.0 has removed compatibility with cmake_minimum_required
|
||||
versions less than 3.5. Bump the minimum versions in vendored
|
||||
thirdparty code to fix the build.
|
||||
|
||||
--- a/thirdparty/sentry-native/external/crashpad/third_party/zlib/zlib/CMakeLists.txt
|
||||
+++ b/thirdparty/sentry-native/external/crashpad/third_party/zlib/zlib/CMakeLists.txt
|
||||
@@ -1,4 +1,4 @@
|
||||
-cmake_minimum_required(VERSION 3.0)
|
||||
+cmake_minimum_required(VERSION 3.5)
|
||||
set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS ON)
|
||||
|
||||
project(zlib C)
|
||||
--- a/thirdparty/pybind11/tests/test_cmake_build/subdirectory_target/CMakeLists.txt
|
||||
+++ b/thirdparty/pybind11/tests/test_cmake_build/subdirectory_target/CMakeLists.txt
|
||||
@@ -1,4 +1,4 @@
|
||||
-cmake_minimum_required(VERSION 3.4)
|
||||
+cmake_minimum_required(VERSION 3.5)
|
||||
|
||||
# The `cmake_minimum_required(VERSION 3.4...3.18)` syntax does not work with
|
||||
# some versions of VS that have a patched CMake 3.11. This forces us to emulate
|
||||
@@ -0,0 +1,52 @@
|
||||
From: Huang Rui <vowstar@gmail.com>
|
||||
Date: Wed, 27 May 2026 00:00:00 +0800
|
||||
Subject: [PATCH] kicad: move KICAD_MANAGER_FRAME::GetCurrentFileName() out of header
|
||||
|
||||
The inline definition in kicad_manager_frame.h causes the compiler to
|
||||
emit a weak symbol for KICAD_MANAGER_FRAME::GetCurrentFileName() in
|
||||
every TU that includes the header (e.g. common/eda_base_frame.cpp,
|
||||
which needs the type for a static_cast). That weak symbol references
|
||||
the out-of-line KICAD_MANAGER_FRAME::GetProjectFileName(), defined in
|
||||
kicad/kicad_manager_frame.cpp.
|
||||
|
||||
When standalone tools like bitmap2component link only libcommon.a (not
|
||||
the kicad/ project-manager sources), the linker pulls in the weak
|
||||
GetCurrentFileName symbol from eda_base_frame.cpp.o and fails on the
|
||||
unresolved GetProjectFileName.
|
||||
|
||||
gcc <= 15 elided the weak symbol because nothing in those TUs used it.
|
||||
gcc 16 emits it, breaking the link with:
|
||||
|
||||
undefined reference to `KICAD_MANAGER_FRAME::GetProjectFileName() const'
|
||||
|
||||
Backports the kicad 10.x layout: declaration in the header, definition
|
||||
in the .cpp. Same body, no behavior change.
|
||||
--- a/kicad/kicad_manager_frame.h
|
||||
+++ b/kicad/kicad_manager_frame.h
|
||||
@@ -81,10 +81,7 @@
|
||||
*/
|
||||
void RecreateBaseLeftToolbar();
|
||||
|
||||
- wxString GetCurrentFileName() const override
|
||||
- {
|
||||
- return GetProjectFileName();
|
||||
- }
|
||||
+ wxString GetCurrentFileName() const override;
|
||||
|
||||
/**
|
||||
* @brief Creates a project and imports a non-KiCad Schematic and PCB
|
||||
--- a/kicad/kicad_manager_frame.cpp
|
||||
+++ b/kicad/kicad_manager_frame.cpp
|
||||
@@ -491,6 +491,12 @@
|
||||
}
|
||||
|
||||
|
||||
+wxString KICAD_MANAGER_FRAME::GetCurrentFileName() const
|
||||
+{
|
||||
+ return GetProjectFileName();
|
||||
+}
|
||||
+
|
||||
+
|
||||
const wxString KICAD_MANAGER_FRAME::GetProjectFileName() const
|
||||
{
|
||||
return Pgm().GetSettingsManager().IsProjectOpen() ? Prj().GetProjectFullName() :
|
||||
@@ -0,0 +1,27 @@
|
||||
https://bugs.gentoo.org/980747
|
||||
https://gitlab.com/kicad/code/kicad/-/merge_requests/2753
|
||||
|
||||
pcbcommon uses ConvertMarkdown2Html from markdown_lib, declare the
|
||||
dependency PUBLIC. qa_gerbview also needs the EDA_3D_VIEWER_SETTINGS
|
||||
typeinfo from 3d-viewer.
|
||||
|
||||
--- a/common/CMakeLists.txt
|
||||
+++ b/common/CMakeLists.txt
|
||||
@@ -870,6 +870,7 @@
|
||||
delaunator
|
||||
kimath
|
||||
kiplatform
|
||||
+ markdown_lib
|
||||
)
|
||||
|
||||
message( STATUS "Including 3Dconnexion SpaceMouse navigation support in pcbcommon" )
|
||||
--- a/qa/tests/gerbview/CMakeLists.txt
|
||||
+++ b/qa/tests/gerbview/CMakeLists.txt
|
||||
@@ -62,6 +62,7 @@
|
||||
target_link_libraries( qa_gerbview
|
||||
gerbview_kiface_objects
|
||||
pcbcommon
|
||||
+ 3d-viewer
|
||||
gal
|
||||
common
|
||||
gal
|
||||
@@ -0,0 +1,223 @@
|
||||
# Copyright 1999-2026 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
PYTHON_COMPAT=( python3_{11..14} )
|
||||
WX_GTK_VER="3.2-gtk3"
|
||||
|
||||
inherit check-reqs cmake flag-o-matic optfeature python-single-r1 toolchain-funcs wxwidgets xdg-utils
|
||||
|
||||
DESCRIPTION="Electronic Schematic and PCB design tools"
|
||||
HOMEPAGE="https://www.kicad.org"
|
||||
|
||||
if [[ ${PV} == *9999* ]]; then
|
||||
EGIT_REPO_URI="https://gitlab.com/kicad/code/kicad.git"
|
||||
inherit git-r3
|
||||
else
|
||||
MY_PV="${PV/_rc/-rc}"
|
||||
MY_P="${PN}-${MY_PV}"
|
||||
SRC_URI="https://gitlab.com/kicad/code/${PN}/-/archive/${MY_PV}/${MY_P}.tar.bz2"
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
if [[ ${PV} != *_rc* ]] ; then
|
||||
KEYWORDS="amd64 ~arm64 ~riscv ~x86"
|
||||
fi
|
||||
fi
|
||||
|
||||
# KiCAD is licensed under GPLv3 or later
|
||||
# As per LICENSES.README some components are under different, but GPL compatible license:
|
||||
# Licensed under Apache License, Version 2.0: portions of code in libs/kimath/include/math/util.h
|
||||
# Licensed under BOOSTv1: clipper, clipper2, libcontext, pegtl, picosha2, turtle
|
||||
# Licensed under ISC: portions of code in include/geometry/polygon_triangulation.h
|
||||
# Licensed under MIT: argparse, compoundfilereader, delaunator, fmt, json_schema_validator, magic_enum nanodbc,
|
||||
# nlohmann/json, nlohmann/fifo_map, pboettch/json-schema-validator, picoSHA2, rectpack2d,
|
||||
# sentry-native, thread-pool, tinyspline_lib
|
||||
# Licensed under MIT and BSD: glew
|
||||
# Licensed under BSD: pybind11
|
||||
# Licensed under BSD2: gzip-hpp
|
||||
# Licensed under GPLv2 (or later): dxflib, math_for_graphics, potrace,
|
||||
# SutherlandHodgmanClipPoly in thirdparty/other_math
|
||||
# Licensed under ZLib: nanosvg
|
||||
# Licensed in the public domain: lemon
|
||||
# Licensed under CC BY-SA 4.0: all the demo files provided in demos/*
|
||||
# Licensed under clause-3 BSD: ibis/kibis files in eeschema/sim/kibis
|
||||
# Licensed under CC0: uopamp.lib.spice in some directories in qa/data/eeschema/spice_netlists/
|
||||
LICENSE="GPL-2+ GPL-3+ Boost-1.0 BSD BSD-2 Apache-2.0 ISC MIT ZLIB CC-BY-SA-4.0 CC0-1.0"
|
||||
SLOT="0"
|
||||
IUSE="doc examples nls openmp 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
|
||||
# Depends on abseil-cpp via protobuf targets
|
||||
COMMON_DEPEND="
|
||||
app-crypt/libsecret
|
||||
dev-cpp/abseil-cpp:=
|
||||
dev-db/unixODBC
|
||||
dev-libs/boost:=[context,nls]
|
||||
dev-libs/libgit2:=
|
||||
>=dev-libs/protobuf-27.2:=[protobuf,protoc]
|
||||
>=dev-libs/nng-1.10.0:=
|
||||
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.5.0:0=
|
||||
>=x11-libs/cairo-1.8.8:=
|
||||
>=x11-libs/pixman-0.30
|
||||
>=sci-electronics/ngspice-27.1[shared]
|
||||
virtual/zlib:=
|
||||
x11-libs/wxGTK:${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}]
|
||||
')
|
||||
${PYTHON_DEPS}
|
||||
nls? (
|
||||
sys-devel/gettext
|
||||
)
|
||||
test? (
|
||||
media-gfx/cairosvg
|
||||
)
|
||||
"
|
||||
|
||||
DEPEND="${COMMON_DEPEND}"
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
sci-electronics/electronics-menu
|
||||
"
|
||||
BDEPEND="app-alternatives/ninja
|
||||
>=dev-lang/swig-4.0
|
||||
doc? ( app-text/doxygen )
|
||||
test? ( $(python_gen_cond_dep 'dev-python/pytest[${PYTHON_USEDEP}]') )"
|
||||
|
||||
if [[ ${PV} == 9999 ]] ; then
|
||||
# x11-misc-util/macros only required on live ebuilds
|
||||
BDEPEND+=" >=x11-misc/util-macros-1.18"
|
||||
fi
|
||||
|
||||
CHECKREQS_DISK_BUILD="1500M"
|
||||
|
||||
pkg_setup() {
|
||||
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
|
||||
|
||||
python-single-r1_pkg_setup
|
||||
setup-wxwidgets
|
||||
check-reqs_pkg_setup
|
||||
}
|
||||
|
||||
src_unpack() {
|
||||
if [[ ${PV} == 9999 ]]; then
|
||||
git-r3_src_unpack
|
||||
else
|
||||
default_src_unpack
|
||||
fi
|
||||
}
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-10.0.0-fix-clang-build.patch
|
||||
"${FILESDIR}"/${PN}-9.0.6-fix-cmake4-compat.patch # Bug 970924
|
||||
"${FILESDIR}"/${P}-gcc16-bitmap2component-link.patch
|
||||
"${FILESDIR}"/${PN}-9.0.9-qa-gerbview-underlink.patch # Bug 980747
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
filter-lto # Bug 927482
|
||||
cmake_src_prepare
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
xdg_environment_reset
|
||||
|
||||
local mycmakeargs=(
|
||||
-DKICAD_DOCS="${EPREFIX}/usr/share/doc/${PN}-doc-${PV}"
|
||||
|
||||
-DKICAD_SCRIPTING_WXPYTHON=ON
|
||||
-DKICAD_USE_EGL=OFF
|
||||
|
||||
-DKICAD_BUILD_I18N="$(usex nls)"
|
||||
-DKICAD_I18N_UNIX_STRICT_PATH="$(usex nls)"
|
||||
|
||||
-DPYTHON_DEST="$(python_get_sitedir)"
|
||||
-DPYTHON_EXECUTABLE="${PYTHON}"
|
||||
-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
|
||||
-DPYTHON_LIBRARY="$(python_get_library_path)"
|
||||
|
||||
-DKICAD_INSTALL_DEMOS="$(usex examples)"
|
||||
|
||||
-DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade
|
||||
-DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/opencascade
|
||||
|
||||
-DKICAD_SPICE_QA="$(usex test)"
|
||||
-DKICAD_BUILD_QA_TESTS="$(usex test)"
|
||||
)
|
||||
|
||||
if ! [[ ${PV} == *9999* ]]; then
|
||||
mycmakeargs+=(
|
||||
-DCMAKE_POLICY_DEFAULT_CMP0167="OLD"
|
||||
|
||||
# 939141
|
||||
-DCMAKE_DISABLE_FIND_PACKAGE_Git="yes"
|
||||
-DKICAD_VERSION="${PVR}"
|
||||
)
|
||||
fi
|
||||
|
||||
cmake_src_configure
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
cmake_src_compile
|
||||
if use doc; then
|
||||
cmake_src_compile doxygen-docs
|
||||
fi
|
||||
}
|
||||
|
||||
src_test() {
|
||||
# Test cannot find library in Portage's sandbox. Let's create a link so test can run.
|
||||
mkdir -p "${BUILD_DIR}/qa/eeschema/" || die
|
||||
ln -s "${BUILD_DIR}/eeschema/_eeschema.kiface" "${BUILD_DIR}/qa/eeschema/_eeschema.kiface" || die
|
||||
|
||||
export CMAKE_SKIP_TESTS=(
|
||||
qa_pcbnew
|
||||
qa_cli
|
||||
)
|
||||
|
||||
cmake_src_test
|
||||
}
|
||||
|
||||
src_install() {
|
||||
cmake_src_install
|
||||
python_optimize
|
||||
|
||||
dodoc doxygen/eagle-plugin-notes.txt
|
||||
|
||||
if use doc ; then
|
||||
cd doxygen || die
|
||||
dodoc -r out/html/.
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
optfeature "Component symbols library" sci-electronics/kicad-symbols
|
||||
optfeature "Component footprints library" sci-electronics/kicad-footprints
|
||||
optfeature "3D models of components " sci-electronics/kicad-packages3d
|
||||
optfeature "Project templates" sci-electronics/kicad-templates
|
||||
optfeature "Extended documentation" app-doc/kicad-doc
|
||||
optfeature "Creating 3D models of components" media-gfx/wings
|
||||
|
||||
xdg_desktop_database_update
|
||||
xdg_mimeinfo_database_update
|
||||
xdg_icon_cache_update
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
xdg_desktop_database_update
|
||||
xdg_mimeinfo_database_update
|
||||
xdg_icon_cache_update
|
||||
}
|
||||
Reference in New Issue
Block a user