Cleanup and python 3.13
This commit is contained in:
Mario Fetka
@@ -1,5 +1,4 @@
|
||||
AUX kicad-7.0.0-werror.patch 682 BLAKE2B 268cf848679ffb5b5aa2389a6392986f908c64861fb6908a864ae41d788f8ac10a21d30b7a20b98409cad7f57191958f9d95d448be7c8070806c585c03d7ce8a SHA512 c30b9a080cc74687b44fb5e547d746c4e3298096e9ffa1bf5a7a2b477efb8d05db8adad7255d6b92eb2c00f739e4fcd79b9c198b3122265d26edc1db5cb4ee5e
|
||||
AUX kicad-8.0.1-libgit2.patch 1329 BLAKE2B 2e9b8f5d498b60feafdbf658b05350611e67b6449412c5e8b5b2d0a3b3bacc04ced8a6f5a7d3333221c36756b43ddfe95e41f6e98fca6fe010022bc8495d71c7 SHA512 1842a255ebfea314b6880ccd00f4a9693cf288e8dec09a51e8f9da42b14e602e4bf668deadcbf216c05a1f4650723db01e2df3033ed29c6df9a7c2c8a3a5f2eb
|
||||
DIST kicad-8.0.2.tar.bz2 72713030 BLAKE2B ba47a16b5c435970a45aef9988a5f6d218df043a5ce3547a191991ef63620125989e6218e97266a62c76ece604248bdf0652a10d423346fe3648c8ba240651c4 SHA512 192bcd494f00eccc430ddf9e9034f252bae177f06da81e730fb82f000a58bac9201d49ecba93c3bd17608b6df6a944beea85849050e306e11c1abfbd0028ff4a
|
||||
EBUILD kicad-8.0.2-r1.ebuild 4477 BLAKE2B e80525202782c7e7e58d976a0b495150e3d8ba9b4073c9dac854933ad22973927c6dea3fd39099928f675ce866979ef094e182334cd5e9c5e03c26a03f5ba5a5 SHA512 7c1b65eb3ef115346140cabea04ab4f64f791872bd999136e32bba2a1c2c172c70a3757b17412826f32c2793c80d7d60050f47630e50bcd7c032e592fef0c152
|
||||
DIST kicad-9.0.0-protobuf-30.patch 1054 BLAKE2B 64d084b9ed97a283e3a9cb32721ce0c90fc13555a71c07dcfd0878a20f43660a00e17fd45d2250b1cf421acd43214de6b8c4906f90726652ebd46254e8db06b2 SHA512 0453efd6b94ba5dee94b3aed3d5108ed1bed342f549225caceb236de418f426f24784728c3c81eb46182bf8ff9e20e4dc7dd6c95b09cc7a199c51d383bde010d
|
||||
DIST kicad-9.0.0.tar.bz2 128194997 BLAKE2B b5083fbe6bd219711c0ddf1204c283ac588829a24cc46c9e4e93300f046c6a3d890a2924cda803ae41920b74bbc5f16804317a8babc68d6c3b191b5d8cd23b42 SHA512 3b6d346d9a8d42c0ed9185427a99d78fbd9d789170aed6b9a7c6983eb58e69a1c20a7ea1b98769aa3d8121f641ca05cd8540e67f33448da2f6202f4abbc6de16
|
||||
EBUILD kicad-9.0.0-r1.ebuild 6033 BLAKE2B b54d3add11cc68d7db3c74ba51b45438e19dbb7791876dfe1d2a17d207d6ad899ccde2460dc3316b1a01b8de2ec4c0c35dc4d63dca65d863c78fffd42b4a2e39 SHA512 21af63084bf24635456c8edf0a0c248700fef34915a9ead0ac41925857d8a6c242cc57c0015d70f9c46040a7fe9b917d30e687f0c447e593e29127fb3f0a8cbf
|
||||
MISC metadata.xml 811 BLAKE2B 4f2150b49b1bebf73aa3440ae1ace1624ce02e022d361051e895a18d28f2ab802fed04c94552b36fc0265335a1eacd5d3a7c407fc88f0c4f7de9e4fa6afa6c5f SHA512 c09c2143516f361a8553ab5c44ffa47c77c7a8dbf53596dfe9ba81378c1a7e3aee8378353950cd8805b675d0a29444848fddd4acfe107a54e3f56e87183a1c6c
|
||||
|
||||
@@ -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,36 +0,0 @@
|
||||
From: Huang Rui <vowstar@gmail.com>
|
||||
Date: Fri, 22 Mar 2024 18:18:40 +0800
|
||||
Subject: [PATCH] libgit2-1.8.0 compatibility: adjusted parent pointer type
|
||||
|
||||
- Adjusted parent pointer type in git_commit_create call for compatibility
|
||||
with libgit2 1.8.0 and above.
|
||||
- Included preprocessor checks to maintain support for versions older than
|
||||
1.8.0.
|
||||
- Ensures consistent function behavior across different libgit2 versions.
|
||||
|
||||
Fixes https://gitlab.com/kicad/code/kicad/-/issues/17536
|
||||
Signed-off-by: Huang Rui <vowstar@gmail.com>
|
||||
---
|
||||
kicad/project_tree_pane.cpp | 7 +++++++
|
||||
1 file changed, 7 insertions(+)
|
||||
|
||||
--- a/kicad/project_tree_pane.cpp
|
||||
+++ b/kicad/project_tree_pane.cpp
|
||||
@@ -2233,7 +2233,14 @@ void PROJECT_TREE_PANE::onGitCommit( wxCommandEvent& aEvent )
|
||||
}
|
||||
|
||||
git_oid oid;
|
||||
+ // Check if the libgit2 library version is 1.8.0 or higher
|
||||
+#if ( LIBGIT2_VER_MAJOR > 1 ) || ( LIBGIT2_VER_MAJOR == 1 && LIBGIT2_VER_MINOR >= 8 )
|
||||
+ // For libgit2 version 1.8.0 and above
|
||||
+ git_commit* const parents[1] = { parent };
|
||||
+#else
|
||||
+ // For libgit2 versions older than 1.8.0
|
||||
const git_commit* parents[1] = { parent };
|
||||
+#endif
|
||||
|
||||
if( git_commit_create( &oid, repo, "HEAD", author, author, nullptr, commit_msg.mb_str(), tree,
|
||||
1, parents ) != 0 )
|
||||
--
|
||||
2.44.0
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
# Copyright 1999-2024 Gentoo Authors
|
||||
# Copyright 1999-2025 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
PYTHON_COMPAT=( python3_{10..12} )
|
||||
PYTHON_COMPAT=( python3_{10..13} )
|
||||
WX_GTK_VER="3.2-gtk3"
|
||||
|
||||
inherit check-reqs cmake flag-o-matic optfeature python-single-r1 toolchain-funcs wxwidgets xdg-utils
|
||||
@@ -11,22 +11,42 @@ inherit check-reqs cmake flag-o-matic optfeature python-single-r1 toolchain-func
|
||||
DESCRIPTION="Electronic Schematic and PCB design tools"
|
||||
HOMEPAGE="https://www.kicad.org"
|
||||
|
||||
if [[ ${PV} == 9999 ]]; then
|
||||
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 -> ${P}.tar.bz2"
|
||||
S="${WORKDIR}/${PN}-${MY_PV}"
|
||||
SRC_URI="https://gitlab.com/kicad/code/${PN}/-/archive/${MY_PV}/${MY_P}.tar.bz2"
|
||||
SRC_URI+="
|
||||
https://gitlab.com/kicad/code/kicad/-/commit/5774338af2e22e1ff541ad9ab368e459e2a2add2.patch -> ${PN}-9.0.0-protobuf-30.patch
|
||||
"
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
if [[ ${PV} != *_rc* ]] ; then
|
||||
KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
|
||||
KEYWORDS="amd64"
|
||||
fi
|
||||
fi
|
||||
|
||||
# BSD for bundled pybind
|
||||
LICENSE="GPL-2+ GPL-3+ Boost-1.0 BSD"
|
||||
# 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"
|
||||
|
||||
@@ -43,6 +63,8 @@ COMMON_DEPEND="
|
||||
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
|
||||
@@ -66,6 +88,7 @@ COMMON_DEPEND="
|
||||
media-gfx/cairosvg
|
||||
)
|
||||
"
|
||||
|
||||
DEPEND="${COMMON_DEPEND}"
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
sci-electronics/electronics-menu
|
||||
@@ -80,6 +103,10 @@ fi
|
||||
|
||||
CHECKREQS_DISK_BUILD="1500M"
|
||||
|
||||
PATCHES=(
|
||||
"${DISTDIR}/${P}-protobuf-30.patch" # drop in 9.0.1
|
||||
)
|
||||
|
||||
pkg_setup() {
|
||||
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
|
||||
|
||||
@@ -141,7 +168,12 @@ src_compile() {
|
||||
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
|
||||
dosym "${BUILD_DIR}/eeschema/_eeschema.kiface" "${BUILD_DIR}/qa/eeschema/_eeschema.kiface" || die
|
||||
ln -s "${BUILD_DIR}/eeschema/_eeschema.kiface" "${BUILD_DIR}/qa/eeschema/_eeschema.kiface" || die
|
||||
|
||||
export CMAKE_SKIP_TESTS=(
|
||||
qa_pcbnew
|
||||
qa_cli
|
||||
)
|
||||
|
||||
# LD_LIBRARY_PATH is there to help it pick up the just-built libraries
|
||||
LD_LIBRARY_PATH="${BUILD_DIR}/common:${BUILD_DIR}/common/gal:${BUILD_DIR}/3d-viewer/3d_cache/sg:${LD_LIBRARY_PATH}" \
|
||||
Reference in New Issue
Block a user