update to ngspice 44.2

Author: Kreijstal

mingw-w64-ngspice/PKGBUILD

@@ -4,7 +4,7 @@
 _realname=ngspice
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=42
+pkgver=44.2
 pkgrel=1
 pkgdesc="Mixed-level/Mixed-signal circuit simulator based on Spice3f5, Cider1b1, and Xspice (mingw-w64)"
 arch=('any')
@@ -24,6 +24,7 @@ depends=(
   "${MINGW_PACKAGE_PREFIX}-fftw"
   "${MINGW_PACKAGE_PREFIX}-gcc-libs"
   "${MINGW_PACKAGE_PREFIX}-omp"
+  "${MINGW_PACKAGE_PREFIX}-ncurses"
 )
 makedepends=(
   "${MINGW_PACKAGE_PREFIX}-cc"
@@ -32,16 +33,19 @@ makedepends=(
 install="${_realname}-${MSYSTEM}.install"
 source=(
   "https://downloads.sourceforge.net/project/${_realname}/ng-spice-rework/${pkgver}/${_realname}-${pkgver}.tar.gz"
-  "https://downloads.sourceforge.net/project/${_realname}/ng-spice-rework/${pkgver}/${_realname}-doc-${pkgver}.tar.gz"
+  "https://downloads.sourceforge.net/project/${_realname}/ng-spice-rework/${pkgver}/${_realname}-doc-${pkgver%%.*}.tar.gz"
   "no-explicit-lstdc++.patch"
+  "curses.patch"
 )
-sha256sums=('737fe3846ab2333a250dfadf1ed6ebe1860af1d8a5ff5e7803c772cc4256e50a'
-            'bb971b1553d2ab19a9188f00fa14eb84b24bff6d1fbe0a7e16ffa1147ce6a9a4'
-            '57f0f6e79faead15b0e1338a32c414b851997edb716467e8c0bc9a10df423582')
+sha256sums=('e7dadfb7bd5474fd22409c1e5a67acdec19f77e597df68e17c5549bc1390d7fd'
+            '6dce369c3001d121404f88a2c5eac1ba01c46d7c70a1034ec53f1ff007ec7321'
+            '57f0f6e79faead15b0e1338a32c414b851997edb716467e8c0bc9a10df423582'
+            'ea53179ecfd2d6c00fb83219d286d760f0f96b07138ed81eb5a2e4a883e8601d')
 
 prepare() {
   cd "${srcdir}/${_realname}-${pkgver}"
   patch -Np1 -i "${srcdir}/no-explicit-lstdc++.patch"
+  patch -Np1 -i "${srcdir}/curses.patch"
   autoreconf -fiv
 }
 
@@ -56,6 +60,7 @@ build() {
     --enable-openmp
     --enable-xspice
     --enable-cider
+    --without-x
   )
 
   # FS#45230, create so lib
@@ -70,7 +75,7 @@ build() {
     --host=${MINGW_CHOST} \
     "${_common_flags[@]}" \
     --with-ngshared
-  make
+  make -j
 
   mkdir -p "${srcdir}/build-static-${MSYSTEM}" && cd "${srcdir}/build-static-${MSYSTEM}"
 
@@ -79,14 +84,14 @@ build() {
   ../${_realname}-${pkgver}/configure \
     "${_common_flags[@]}" \
     --with-wingui
-  make
+  make -j
 
   mkdir -p "${srcdir}/build-console-${MSYSTEM}" && cd "${srcdir}/build-console-${MSYSTEM}"
 
   LDFLAGS+=" -lgdi32"
   ../${_realname}-${pkgver}/configure \
-    "${_common_flags[@]}"
-  make
+    "${_common_flags[@]}" 
+  make -j
 }
 
 package() {

mingw-w64-ngspice/curses.patch

@@ -0,0 +1,58 @@
+--- ngspice-44.2a/configure.ac	2025-01-11 13:35:18.000000000 +0100
++++ ngspice-44.2b/configure.ac	2025-02-03 17:42:18.995267000 +0100
+@@ -1280,6 +1280,40 @@ else
+                 AC_CHECK_LIB([readline], [readline],
+                     [LIBS="$LIBS -lreadline"],
+                     [AC_MSG_ERROR([Couldn't find readline libraries.])])
++
++# Check for curses.h using pkg-config or manual paths
++PKG_CHECK_MODULES_STATIC([NCURSES], [ncursesw], [
++    # If pkg-config found ncursesw, use its flags
++    AC_SUBST([CURSES_CFLAGS], ["$NCURSES_CFLAGS"])
++    AC_SUBST([CURSES_LIBS], ["$NCURSES_LIBS"])
++    AC_DEFINE([HAVE_CURSES_H], [1], [Define if curses.h is available])
++
++    # Force the compiler to use the ncursesw include path for all subsequent checks
++    CPPFLAGS="$CPPFLAGS $NCURSES_CFLAGS"
++], [
++    # Fallback if pkg-config fails
++    AC_MSG_WARN([pkg-config for ncursesw failed. Trying manual detection...])
++
++    # Manually check for ncurses/curses.h and set flags
++    AC_CHECK_HEADER([ncurses/curses.h], [
++        CURSES_CFLAGS="-I/ucrt64/include/ncurses"
++        CURSES_LIBS="-lncursesw"
++        AC_SUBST([CURSES_CFLAGS])
++        AC_SUBST([CURSES_LIBS])
++        AC_DEFINE([HAVE_CURSES_H], [1], [Define if curses.h is available])
++
++        # Force the compiler to use this include path
++        CPPFLAGS="$CPPFLAGS $CURSES_CFLAGS"
++    ], [
++        AC_MSG_ERROR([ncurses/curses.h not found in /ucrt64/include/ncurses. Install ncurses!])
++    ])
++])
++
++# Now check for curses.h using the updated CPPFLAGS
++AC_CHECK_HEADERS([curses.h], [], [
++    AC_MSG_WARN([curses.h not found, but ncurses/curses.h is available.])
++])
++
+             fi
+         else
+     # Especially defined for macOS (Big Sur), with readline installed from Brew
+diff --git a/src/xspice/verilog/Makefile.am b/src/xspice/verilog/Makefile.am
+index 262d63384..1a298cff0 100644
+--- a/src/xspice/verilog/Makefile.am
++++ b/src/xspice/verilog/Makefile.am
+@@ -45,7 +45,9 @@
+ install-exec-hook:
+ 	cd $(DESTDIR)$(pkglibdir); \
+ 	rm -f ivlng*a libvvp* ; \
+-	mv ivlngvpi.* ivlng.vpi
++	if [ -f ivlngvpi.* ]; then \
++            mv ivlngvpi.* ivlng.vpi; \
++        fi
+ 
+ uninstall-hook:
+ 	rm -f $(DESTDIR)$(pkglibdir)/ivlng.vpi $(DESTDIR)$(pkglibdir)/ivlng.so