diff --git a/mingw-w64-kicad/004-fix-loading-ngspice-dll.patch b/mingw-w64-kicad/004-fix-loading-ngspice-dll.patch new file mode 100644 index 0000000000..b093ef9d3d --- /dev/null +++ b/mingw-w64-kicad/004-fix-loading-ngspice-dll.patch @@ -0,0 +1,11 @@ +--- a/cmake/Findngspice.cmake ++++ b/cmake/Findngspice.cmake +@@ -102,7 +102,7 @@ + endif() + endif() + +-if( WIN32 AND MSYS ) ++if( MINGW ) + # NGSPICE_LIBRARY points to libngspice.dll.a on Windows, + # but the goal is to find out the DLL name. + # Note: libngspice-0.dll or libngspice-1.dll must be in a executable path diff --git a/mingw-w64-kicad/PKGBUILD b/mingw-w64-kicad/PKGBUILD index ba20abdd36..927b96987b 100644 --- a/mingw-w64-kicad/PKGBUILD +++ b/mingw-w64-kicad/PKGBUILD @@ -8,13 +8,16 @@ _realname=kicad _wx_basever=3.2 pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") -pkgver=7.0.9 -pkgrel=2 +pkgver=7.0.10 +pkgrel=1 pkgdesc="Software for the creation of electronic schematic diagrams and printed circuit board artwork (mingw-w64)" arch=(any) mingw_arch=('mingw64' 'ucrt64' 'clang64') url="https://www.kicad.org/" msys2_repository_url="https://gitlab.com/kicad/code/kicad" +msys2_references=( + 'archlinux: kicad' +) license=("spdx:GPL-3.0-or-later") groups=("${MINGW_PACKAGE_PREFIX}-eda") conflicts=(${MINGW_PACKAGE_PREFIX}-${_realname}-git) @@ -59,12 +62,14 @@ source=( '001-Kicad-manager-build-the-PLUGIN_CONTENT_MANAGER-only-on-request.patch' '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' '006-ki-6.0-rewrite-kiwin32_rc_for_clang.patch' ) -sha256sums=('45322e7495cbf0b6bba70b8fb8b58fdafa408d4d8473209fd1c5e8bad5a818f7' +sha256sums=('7af2315dd79a05724ef41c25e2af4e05433be29bbeb8b58b3004a97304f49180' 'a7c41a4f9e04926f0103dbe6702e42681ed1e59ceadca1ec116a8af081597a2a' '2924a86849c02aecd21cded0bd2069353fca33c3364f9b41f9bfdd80e19085cf' 'd8d5f4bdd0aa6d8a907710c523f6f95840636cb2ef69e5275c6ed4966f134353' + 'f35a96c2393c21c266dbcd42616df64f9ee13b2423478bf6de029a3ad4e0ee8a' 'e03dbb58409145c8fb54991d8259f14bc0ba6b21abca24f9b914ec354c9df89c') # Helper macros to help make tasks easier # @@ -85,6 +90,7 @@ prepare() { apply_patch_with_msg \ 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 \ 006-ki-6.0-rewrite-kiwin32_rc_for_clang.patch } @@ -113,6 +119,7 @@ build() { -DPYTHON_EXECUTABLE="${MINGW_PREFIX}"/bin/python.exe \ -DPYTHON_INCLUDE_DIR=$("${MINGW_PREFIX}"/bin/python.exe -c "from sysconfig import get_paths as gp; print(gp()[\"include\"])") \ -DPYTHON_ROOT_DIR="${MINGW_PREFIX}" \ + -DNGSPICE_ROOT_DIR=${MINGW_PREFIX} \ ../${_realname}-${pkgver} "${MINGW_PREFIX}"/bin/cmake.exe --build .