kicad{,-library}: Upgrade to 9.0.2 (#24319)
This commit is contained in:
stahta01
GitHub
parent
335e106710
commit
7a04b83222
@ -6,7 +6,7 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}-footprints"
|
||||
"${MINGW_PACKAGE_PREFIX}-${_realname}-symbols"
|
||||
"${MINGW_PACKAGE_PREFIX}-${_realname}-templates"
|
||||
"${MINGW_PACKAGE_PREFIX}-${_realname}-packages3D")
|
||||
pkgver=9.0.1
|
||||
pkgver=9.0.2
|
||||
pkgrel=1
|
||||
pkgdesc="Support libraries for KiCad (mingw-w64)"
|
||||
arch=('any')
|
||||
@ -25,10 +25,10 @@ source=("https://gitlab.com/kicad/libraries/kicad-footprints/-/archive/${pkgver}
|
||||
"https://gitlab.com/kicad/libraries/kicad-symbols/-/archive/${pkgver}/kicad-symbols-${pkgver}.tar.bz2"
|
||||
"https://gitlab.com/kicad/libraries/kicad-templates/-/archive/${pkgver}/kicad-templates-${pkgver}.tar.bz2"
|
||||
"https://gitlab.com/kicad/libraries/kicad-packages3D/-/archive/${pkgver}/kicad-packages3D-${pkgver}.tar.bz2")
|
||||
sha256sums=('4645f6aca471b7bc9098a99f9729277ae2a489d27f1a99fde2ed346abf287bd9'
|
||||
'f7f6b978d10b5cf8434eb7149f073b42b510adddbf004ecd90458a07de76939a'
|
||||
'd6149b2d109ea5ba3a457fb744393c40c2474de52b2a5045d4f08118d78b8d1b'
|
||||
'3b1933735052a3948285a3a932802eb7100aa43a292dff197976aca2cb0459ab')
|
||||
sha256sums=('e95e015287d68491c17b63f800a3db7639c151d2e8ec432561c8c8b2d1afadd0'
|
||||
'3a15138ac603937f8e144b045908823c6ddf0274e71a8c9745a68894b4be594c'
|
||||
'0e23c346f5fdfbff873c388eabe2dc8dfef9794fd40b3ba392255f02f8e3ba06'
|
||||
'5d969971df4957972fb0aadae5bd03c4d654f6aacf7a95d972f49ac56ea6aee4')
|
||||
|
||||
build() {
|
||||
declare -a _extra_config
|
||||
|
||||
@ -1,28 +1,28 @@
|
||||
From b207fb6c15dc5ebdabe22a9985cb2ecf39daaf9f Mon Sep 17 00:00:00 2001
|
||||
From 1bf5972d7e1413b9910260faf4d3e18fdfb94389 Mon Sep 17 00:00:00 2001
|
||||
From: Kreijstal <rainb@tfwno.gf>
|
||||
Date: Tue, 25 Feb 2025 10:23:52 +0100
|
||||
Subject: [PATCH] Weird bug where clang requires explicit json definitions
|
||||
Date: Wed, 21 May 2025 07:55:57 -0400
|
||||
Subject: Weird bug where clang requires explicit json definitions
|
||||
|
||||
Patch updated by Tim Stahlhut
|
||||
---
|
||||
common/settings/bom_settings.cpp | 3 +-
|
||||
common/settings/bom_settings.cpp | 2 +-
|
||||
common/settings/json_settings.cpp | 1 +
|
||||
kicad/tools/kicad_manager_control.cpp | 2 +-
|
||||
kicad/tools/kicad_manager_control.cpp | 1 +
|
||||
kicad/update_manager.cpp | 2 +-
|
||||
libs/core/include/core/json_serializers.h | 62 ++++++++++++++++++++++-
|
||||
5 files changed, 65 insertions(+), 5 deletions(-)
|
||||
5 files changed, 65 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/common/settings/bom_settings.cpp b/common/settings/bom_settings.cpp
|
||||
index 69d7fdbe81..8db15dfd97 100644
|
||||
index e4d7143903..0015d76efb 100644
|
||||
--- a/common/settings/bom_settings.cpp
|
||||
+++ b/common/settings/bom_settings.cpp
|
||||
@@ -17,10 +17,9 @@
|
||||
* You should have received a copy of the GNU General Public License along
|
||||
@@ -18,9 +18,9 @@
|
||||
* with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
-
|
||||
|
||||
+#include <core/json_serializers.h>
|
||||
#include <settings/bom_settings.h>
|
||||
#include <nlohmann/json.hpp>
|
||||
#include <json_common.h>
|
||||
-#include <core/json_serializers.h>
|
||||
#include <wx/translation.h>
|
||||
|
||||
@ -40,20 +40,19 @@ index 7d946df47d..159e0e09a5 100644
|
||||
#include <settings/json_settings_internals.h>
|
||||
#include <settings/nested_settings.h>
|
||||
diff --git a/kicad/tools/kicad_manager_control.cpp b/kicad/tools/kicad_manager_control.cpp
|
||||
index 4401cf82b5..91be5e24a5 100644
|
||||
index 5461ee1e1f..fa0e931afa 100644
|
||||
--- a/kicad/tools/kicad_manager_control.cpp
|
||||
+++ b/kicad/tools/kicad_manager_control.cpp
|
||||
@@ -17,7 +17,7 @@
|
||||
* You should have received a copy of the GNU General Public License along
|
||||
@@ -18,6 +18,7 @@
|
||||
* with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
-
|
||||
|
||||
+#include <core/json_serializers.h>
|
||||
#include <wildcards_and_files_ext.h>
|
||||
#include <env_vars.h>
|
||||
#include <executable_names.h>
|
||||
diff --git a/kicad/update_manager.cpp b/kicad/update_manager.cpp
|
||||
index d854a73a75..47556598b0 100644
|
||||
index 932db293f5..4856a9c956 100644
|
||||
--- a/kicad/update_manager.cpp
|
||||
+++ b/kicad/update_manager.cpp
|
||||
@@ -28,6 +28,7 @@
|
||||
@ -67,19 +66,19 @@ index d854a73a75..47556598b0 100644
|
||||
@@ -39,7 +40,6 @@
|
||||
#include <dialogs/dialog_update_notice.h>
|
||||
|
||||
#include <nlohmann/json.hpp>
|
||||
#include <json_common.h>
|
||||
-#include <core/json_serializers.h>
|
||||
|
||||
#include <wx/log.h>
|
||||
#include <wx/event.h>
|
||||
diff --git a/libs/core/include/core/json_serializers.h b/libs/core/include/core/json_serializers.h
|
||||
index b5079fc209..285e951c89 100644
|
||||
index 17b1057de9..302cb060f8 100644
|
||||
--- a/libs/core/include/core/json_serializers.h
|
||||
+++ b/libs/core/include/core/json_serializers.h
|
||||
@@ -25,6 +25,7 @@
|
||||
#define JSON_SERIALIZERS_H_
|
||||
|
||||
#include <nlohmann/json.hpp>
|
||||
#include <json_common.h>
|
||||
+#include <wx/gdicmn.h>
|
||||
#include <wx/string.h>
|
||||
#include <optional>
|
||||
@ -154,5 +153,3 @@ index b5079fc209..285e951c89 100644
|
||||
\ No newline at end of file
|
||||
+#endif // JSON_SERIALIZERS_H_
|
||||
--
|
||||
2.43.0
|
||||
|
||||
|
||||
@ -10,8 +10,8 @@ _realname=kicad
|
||||
pkgbase=mingw-w64-${_realname}
|
||||
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
|
||||
"${MINGW_PACKAGE_PREFIX}-${_realname}-meta")
|
||||
pkgver=9.0.1
|
||||
pkgrel=4
|
||||
pkgver=9.0.2
|
||||
pkgrel=1
|
||||
pkgdesc="Software for the creation of electronic schematic diagrams and printed circuit board artwork (mingw-w64)"
|
||||
arch=(any)
|
||||
mingw_arch=('ucrt64' 'clang64')
|
||||
@ -71,19 +71,17 @@ source=(
|
||||
'002-ki-6.0-cmake-fixes-for-MINGW-CLANG.patch'
|
||||
'003-ki-6.0-code-fixes-for-GNUC-CLANG.patch'
|
||||
'004-fix-loading-ngspice-dll.patch'
|
||||
'005-clang-fmt-workaround.patch'
|
||||
'006-ki-6.0-rewrite-kiwin32_rc_for_clang.patch'
|
||||
'007-llvm-libcxx-19.patch'
|
||||
'009-clang-needs-explicit-json-implementations.patch'
|
||||
)
|
||||
sha256sums=('92c43ef5dead38d315bf765e7ba4474ccf368046189c9fe7ca5ab39a53960999'
|
||||
sha256sums=('a184642b085f446e1709e373ea2b12872295ad5b3cc2ef894af155928d7f8e0d'
|
||||
'2924a86849c02aecd21cded0bd2069353fca33c3364f9b41f9bfdd80e19085cf'
|
||||
'd8d5f4bdd0aa6d8a907710c523f6f95840636cb2ef69e5275c6ed4966f134353'
|
||||
'f35a96c2393c21c266dbcd42616df64f9ee13b2423478bf6de029a3ad4e0ee8a'
|
||||
'bc7ad66d81d56dcfc237dfffe31fff58addff98622f65f64c45df11f70088c37'
|
||||
'3155b9515ec7c094221441ce337c566c346bf76bb7aa42e86660cfdfb599e307'
|
||||
'5531acad48988772e4453f42ac749f4001170e4be892d3f224b37e0e606ab5ab'
|
||||
'3b0249e26dd1fb8f6c9626c93f4ab634f65a8f258fa527566a715cb4a4e49403')
|
||||
'7523f89100db3dd594c10ab76ec002359c4505c7fa6f7de3e2eb71acd651a242')
|
||||
|
||||
# Helper macros to help make tasks easier #
|
||||
apply_patch_with_msg() {
|
||||
@ -101,7 +99,6 @@ prepare() {
|
||||
002-ki-6.0-cmake-fixes-for-MINGW-CLANG.patch \
|
||||
003-ki-6.0-code-fixes-for-GNUC-CLANG.patch \
|
||||
004-fix-loading-ngspice-dll.patch \
|
||||
005-clang-fmt-workaround.patch \
|
||||
006-ki-6.0-rewrite-kiwin32_rc_for_clang.patch \
|
||||
007-llvm-libcxx-19.patch \
|
||||
009-clang-needs-explicit-json-implementations.patch
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user