diff options
| author | root <root@alpha.trunkmasters.com> | 2026-09-02 03:04:44 -0500 |
|---|---|---|
| committer | root <root@alpha.trunkmasters.com> | 2026-09-02 03:04:44 -0500 |
| commit | db7f283451256f94921bd723861f0e82ed7157f2 (patch) | |
| tree | 938785cb5ae699af0bf0839b6e9c6a0eb776d6e0 /sci-electronics | |
| parent | 8d04041d08ac162ab85e05cce67bc70c471bcb33 (diff) | |
| download | baldeagleos-repo-db7f283451256f94921bd723861f0e82ed7157f2.tar.gz baldeagleos-repo-db7f283451256f94921bd723861f0e82ed7157f2.tar.xz baldeagleos-repo-db7f283451256f94921bd723861f0e82ed7157f2.zip | |
Adding metadata
Diffstat (limited to 'sci-electronics')
| -rw-r--r-- | sci-electronics/kicad/files/kicad-10.0.0-fix-clang-build.patch | 95 | ||||
| -rw-r--r-- | sci-electronics/kicad/kicad-10.0.0-r1.ebuild | 1 | ||||
| -rw-r--r-- | sci-electronics/kicad/kicad-10.0.3.ebuild | 1 | ||||
| -rw-r--r-- | sci-electronics/kicad/kicad-10.0.5.ebuild | 1 | ||||
| -rw-r--r-- | sci-electronics/kicad/kicad-9.0.9-r1.ebuild | 1 |
5 files changed, 99 insertions, 0 deletions
diff --git a/sci-electronics/kicad/files/kicad-10.0.0-fix-clang-build.patch b/sci-electronics/kicad/files/kicad-10.0.0-fix-clang-build.patch new file mode 100644 index 000000000000..131872e268af --- /dev/null +++ b/sci-electronics/kicad/files/kicad-10.0.0-fix-clang-build.patch @@ -0,0 +1,95 @@ +From b370c92fcad556dd50f0e584ac2bad5845072c93 Mon Sep 17 00:00:00 2001 +From: aokblast <i19780219111@kimo.com> +Date: Wed, 26 Aug 2026 16:58:20 +0000 +Subject: [PATCH] Fix libcxx build on Linux + +--- + include/json_common.h | 8 +++++--- + thirdparty/compoundfilereader/compoundfilereader.h | 8 ++++---- + thirdparty/nanodbc/nanodbc/nanodbc.cpp | 6 +++--- + 3 files changed, 12 insertions(+), 10 deletions(-) + +diff --git a/include/json_common.h b/include/json_common.h +index 5c042b97190..75d6d90d05a 100644 +--- a/include/json_common.h ++++ b/include/json_common.h +@@ -21,7 +21,7 @@ + #define JSON_COMMON_H + + /*********************************************************************************************************************** +- * If we are compiling on Apple with Clang >= 17, the version of LLVM no longer includes a generic template for ++ * If we are compiling against libc++ >= 19, the version of LLVM no longer includes a generic template for + * char_traits for char types which are not specified in the C++ standard. We define our own here for types required by + * the JSON library. + * +@@ -33,8 +33,10 @@ + * + **********************************************************************************************************************/ + +-#ifdef __APPLE__ +-#if __clang_major__ >= 17 ++#include <version> ++ ++#if defined( _LIBCPP_VERSION ) ++#if _LIBCPP_VERSION >= 190102 + + #include <wx/unichar.h> + +diff --git a/thirdparty/compoundfilereader/compoundfilereader.h b/thirdparty/compoundfilereader/compoundfilereader.h +index 9d04a1cfd73..c5fa2c54839 100644 +--- a/thirdparty/compoundfilereader/compoundfilereader.h ++++ b/thirdparty/compoundfilereader/compoundfilereader.h +@@ -39,7 +39,7 @@ + #include <functional> + + /*********************************************************************************************************************** +- * If we are compiling on Apple with Clang >= 17, the version of LLVM no longer includes a generic template for ++ * If we are compiling against libc++ >= 19, the version of LLVM no longer includes a generic template for + * char_traits for char types which are not specified in the C++ standard. We define our own here for types required by + * the JSON library. + * +@@ -51,8 +51,8 @@ + * + **********************************************************************************************************************/ + +-#ifdef __APPLE__ +-#if __clang_major__ >= 17 ++#if defined( _LIBCPP_VERSION ) ++#if _LIBCPP_VERSION >= 190102 + + template <> + struct std::char_traits<uint16_t> +@@ -655,4 +655,4 @@ private: + const PROPERTY_SET_STREAM_HDR* m_hdr; + }; + +-} +\ No newline at end of file ++} +diff --git a/thirdparty/nanodbc/nanodbc/nanodbc.cpp b/thirdparty/nanodbc/nanodbc/nanodbc.cpp +index 04f86025e45..038b393950e 100644 +--- a/thirdparty/nanodbc/nanodbc/nanodbc.cpp ++++ b/thirdparty/nanodbc/nanodbc/nanodbc.cpp +@@ -157,7 +157,7 @@ using nanodbc::wide_string; + * + * KICAD-SPECIFIC ADDITION + * +- * If we are compiling on Apple with Clang >= 17, the version of LLVM no longer includes a generic template for ++ * If we are compiling against libc++ >= 19, the version of LLVM no longer includes a generic template for + * char_traits for char types which are not specified in the C++ standard. We define our own here for types required by + * the database library. + * +@@ -169,8 +169,8 @@ using nanodbc::wide_string; + * + **********************************************************************************************************************/ + +-#ifdef __APPLE__ +-#if __clang_major__ >= 17 ++#if defined( _LIBCPP_VERSION ) ++#if _LIBCPP_VERSION >= 190102 + + template <> + struct std::char_traits<NANODBC_SQLCHAR> +-- +GitLab + diff --git a/sci-electronics/kicad/kicad-10.0.0-r1.ebuild b/sci-electronics/kicad/kicad-10.0.0-r1.ebuild index 8e2956755b95..8a41530c42a8 100644 --- a/sci-electronics/kicad/kicad-10.0.0-r1.ebuild +++ b/sci-electronics/kicad/kicad-10.0.0-r1.ebuild @@ -124,6 +124,7 @@ src_unpack() { } PATCHES=( + "${FILESDIR}"/${PN}-10.0.0-fix-clang-build.patch "${FILESDIR}"/${P}-fix-cmake4-compat.patch # Bug 970924 "${FILESDIR}"/${PN}-10.0.0-qa-gerbview-underlink.patch # Bug 980747 ) diff --git a/sci-electronics/kicad/kicad-10.0.3.ebuild b/sci-electronics/kicad/kicad-10.0.3.ebuild index 66a7f731ecc5..2776ac7e54be 100644 --- a/sci-electronics/kicad/kicad-10.0.3.ebuild +++ b/sci-electronics/kicad/kicad-10.0.3.ebuild @@ -125,6 +125,7 @@ src_unpack() { } PATCHES=( + "${FILESDIR}"/${PN}-10.0.0-fix-clang-build.patch "${FILESDIR}"/${PN}-10.0.0-fix-cmake4-compat.patch # Bug 970924 "${FILESDIR}"/${PN}-10.0.0-qa-gerbview-underlink.patch # Bug 980747 ) diff --git a/sci-electronics/kicad/kicad-10.0.5.ebuild b/sci-electronics/kicad/kicad-10.0.5.ebuild index edbe28ed40ff..ae8389254788 100644 --- a/sci-electronics/kicad/kicad-10.0.5.ebuild +++ b/sci-electronics/kicad/kicad-10.0.5.ebuild @@ -125,6 +125,7 @@ src_unpack() { } PATCHES=( + "${FILESDIR}"/${PN}-10.0.0-fix-clang-build.patch "${FILESDIR}"/${PN}-10.0.0-fix-cmake4-compat.patch # Bug 970924 "${FILESDIR}"/${PN}-10.0.0-qa-gerbview-underlink.patch # Bug 980747 ) diff --git a/sci-electronics/kicad/kicad-9.0.9-r1.ebuild b/sci-electronics/kicad/kicad-9.0.9-r1.ebuild index a177c81f223e..710b5d11c786 100644 --- a/sci-electronics/kicad/kicad-9.0.9-r1.ebuild +++ b/sci-electronics/kicad/kicad-9.0.9-r1.ebuild @@ -121,6 +121,7 @@ src_unpack() { } 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 |
