Skip to content

Commit 8196287

Browse files
committed
Update kicad
1 parent 343eeab commit 8196287

File tree

3 files changed

+85
-7
lines changed

3 files changed

+85
-7
lines changed
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
From a32e4ee101e840d3b8b2e0506aaad4064bfb7b88 Mon Sep 17 00:00:00 2001
2+
From: kreijstal <[email protected]>
3+
Date: Mon, 24 Feb 2025 23:35:51 +0100
4+
Subject: [PATCH] MSVC!=WIN32
5+
6+
---
7+
libs/kiplatform/CMakeLists.txt | 4 ++--
8+
1 file changed, 2 insertions(+), 2 deletions(-)
9+
10+
diff --git a/libs/kiplatform/CMakeLists.txt b/libs/kiplatform/CMakeLists.txt
11+
index 04aa3bd8..29b4ce76 100644
12+
--- a/libs/kiplatform/CMakeLists.txt
13+
+++ b/libs/kiplatform/CMakeLists.txt
14+
@@ -132,8 +132,8 @@ if( APPLE )
15+
)
16+
endif()
17+
18+
-if( MSVC )
19+
+if( WIN32 )
20+
add_dependencies( kiplatform
21+
version_header
22+
)
23+
-endif()
24+
\ No newline at end of file
25+
+endif()
26+
--
27+
2.48.1
28+

mingw-w64-kicad/PKGBUILD

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ _wx_basever=3.2
99
_realname=kicad
1010
pkgbase=mingw-w64-${_realname}
1111
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
12-
pkgver=8.0.6
13-
pkgrel=4
12+
pkgver=9.0.0
13+
pkgrel=1
1414
pkgdesc="Software for the creation of electronic schematic diagrams and printed circuit board artwork (mingw-w64)"
1515
arch=(any)
16-
mingw_arch=('mingw64' 'ucrt64' 'clang64')
16+
mingw_arch=('ucrt64' 'clang64') #mingw64 was deprecated by kicad
1717
url="https://www.kicad.org/"
1818
msys2_repository_url="https://gitlab.com/kicad/code/kicad"
1919
msys2_references=(
@@ -32,6 +32,8 @@ depends=(
3232
"${MINGW_PACKAGE_PREFIX}-freeglut"
3333
"${MINGW_PACKAGE_PREFIX}-glew"
3434
"${MINGW_PACKAGE_PREFIX}-glm"
35+
"${MINGW_PACKAGE_PREFIX}-nng"
36+
"${MINGW_PACKAGE_PREFIX}-protobuf"
3537
"${MINGW_PACKAGE_PREFIX}-kicad-footprints"
3638
"${MINGW_PACKAGE_PREFIX}-kicad-symbols"
3739
"${MINGW_PACKAGE_PREFIX}-libgit2"
@@ -71,15 +73,17 @@ source=(
7173
'005-clang-fmt-workaround.patch'
7274
'006-ki-6.0-rewrite-kiwin32_rc_for_clang.patch'
7375
'007-llvm-libcxx-19.patch'
76+
'008-fix-version-header-dependency.patch'
7477
)
75-
sha256sums=('f808ecb7ff588d9f6c70ec5938072c28ededaaed37fb7b4fe5eaaea57253f06c'
78+
sha256sums=('628b5fbdf6a4bab5ec5f5fe3e1a314229deb389dc4db87d6637f04899df3f067'
7679
'3c51482f1e452e37e75c06a65996aa5d631a93e82fbef7dd8274ae8ebbd53601'
7780
'2924a86849c02aecd21cded0bd2069353fca33c3364f9b41f9bfdd80e19085cf'
7881
'd8d5f4bdd0aa6d8a907710c523f6f95840636cb2ef69e5275c6ed4966f134353'
7982
'f35a96c2393c21c266dbcd42616df64f9ee13b2423478bf6de029a3ad4e0ee8a'
8083
'bc7ad66d81d56dcfc237dfffe31fff58addff98622f65f64c45df11f70088c37'
8184
'3155b9515ec7c094221441ce337c566c346bf76bb7aa42e86660cfdfb599e307'
82-
'5531acad48988772e4453f42ac749f4001170e4be892d3f224b37e0e606ab5ab')
85+
'5531acad48988772e4453f42ac749f4001170e4be892d3f224b37e0e606ab5ab'
86+
'2ce8ff7710c64616bdc160cfe7e4079778520c21d2500840dbf74d6f79276727')
8387

8488
# Helper macros to help make tasks easier #
8589
apply_patch_with_msg() {
@@ -94,13 +98,13 @@ prepare() {
9498
cd ${_realname}-${pkgver}
9599

96100
apply_patch_with_msg \
97-
001-fix-build-with-fmt-11.patch \
98101
002-ki-6.0-cmake-fixes-for-MINGW-CLANG.patch \
99102
003-ki-6.0-code-fixes-for-GNUC-CLANG.patch \
100103
004-fix-loading-ngspice-dll.patch \
101104
005-clang-fmt-workaround.patch \
102105
006-ki-6.0-rewrite-kiwin32_rc_for_clang.patch \
103-
007-llvm-libcxx-19.patch
106+
007-llvm-libcxx-19.patch \
107+
008-fix-version-header-dependency.patch
104108
}
105109

106110
build() {

mingw-w64-nng/PKGBUILD

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
_realname=nng
2+
pkgbase=mingw-w64-${_realname}
3+
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
4+
pkgver=1.10.1
5+
pkgrel=1
6+
pkgdesc="A lightweight, broker-less library (mingw-w64)"
7+
arch=('any')
8+
mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
9+
url='https://nng.nanomsg.org/'
10+
license=('spdx:MIT')
11+
depends=("${MINGW_PACKAGE_PREFIX}-wolfssl")
12+
makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
13+
"${MINGW_PACKAGE_PREFIX}-ninja"
14+
"${MINGW_PACKAGE_PREFIX}-cc")
15+
source=("https://github.com/nanomsg/nng/archive/refs/tags/v${pkgver}.tar.gz")
16+
sha512sums=('79d5d176e96591951379150c632322553fb96c62a254a1366303bb491612f84f7b07a7c9e1e1391173d3beb673c4568be3553cc7002165fc9832d738cc0d9a54')
17+
18+
build() {
19+
declare -a extra_config
20+
if check_option "debug" "n"; then
21+
extra_config+=("-DCMAKE_BUILD_TYPE=Release")
22+
else
23+
extra_config+=("-CMAKE_BUILD_TYPE=Debug")
24+
fi
25+
26+
MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
27+
cmake \
28+
-GNinja \
29+
-DCMAKE_INSTALL_PREFIX="${MINGW_PREFIX}" \
30+
"${extra_config[@]}" \
31+
-DBUILD_SHARED_LIBS=ON \
32+
-DNNG_ENABLE_TLS=ON \
33+
-DNNG_TLS_ENGINE=wolf \
34+
-DNNG_ENABLE_DOC=OFF \
35+
-DNNG_TESTS=OFF \
36+
-S "${_realname}-${pkgver}" \
37+
-B "build-${MSYSTEM}"
38+
39+
cmake --build "build-${MSYSTEM}"
40+
}
41+
42+
package() {
43+
DESTDIR="${pkgdir}" cmake --install "build-${MSYSTEM}"
44+
45+
install -Dm644 "${srcdir}/${_realname}-${pkgver}/LICENSE.txt" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE"
46+
}

0 commit comments

Comments
 (0)