Re: [PR PATCH] [Updated] ngspice: update to 35 and fix issue with binary not built/installed

[mtboehlke <mtboehlke@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1689 bytes --]

There is an updated pull request by mtboehlke against master on the void-packages repository

https://github.com/mtboehlke/void-packages master
https://github.com/void-linux/void-packages/pull/32403

ngspice: update to 35 and fix issue with binary not built/installed
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->
close #32251

(edited PR title to be more clear)


A patch file from https://github.com/void-linux/void-packages/pull/32403.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-32403.patch --]
[-- Type: text/x-diff, Size: 3346 bytes --]

From e74e08544f804d04edf2ff46b83f9080d03e03bf Mon Sep 17 00:00:00 2001
From: Mat Boehlke <mtboehlke@gmail.com>
Date: Sun, 29 Aug 2021 17:58:28 -0500
Subject: [PATCH] ngspice: update to 35

Also fixes issue with ngspice binary not being packaged.
---
 srcpkgs/ngspice/patches/windows-only.patch | 15 ---------
 srcpkgs/ngspice/template                   | 38 +++++++++++++++++++---
 2 files changed, 34 insertions(+), 19 deletions(-)
 delete mode 100644 srcpkgs/ngspice/patches/windows-only.patch

diff --git a/srcpkgs/ngspice/patches/windows-only.patch b/srcpkgs/ngspice/patches/windows-only.patch
deleted file mode 100644
index 8a9ead11e31f..000000000000
--- a/srcpkgs/ngspice/patches/windows-only.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-libshlwapi is Windows-only
-
-diff --git src/xspice/cmpp/Makefile.in src/xspice/cmpp/Makefile.in
-index b450e8c..2ea8716 100644
---- a/src/xspice/cmpp/Makefile.in
-+++ b/src/xspice/cmpp/Makefile.in
-@@ -753,7 +753,7 @@ ifs_yacc.c : ifs_yacc.y
- 
- @CROSS_COMPILING_TRUE@build/cmpp$(BUILD_EXEEXT) : $(BUILD_CMPP_FILES)
- @CROSS_COMPILING_TRUE@	$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) \
--@CROSS_COMPILING_TRUE@		$(AM_CPPFLAGS) $(LDFLAGS_FOR_BUILD) -o $@ $^ -lshlwapi
-+@CROSS_COMPILING_TRUE@		$(AM_CPPFLAGS) $(LDFLAGS_FOR_BUILD) -o $@ $^
- 
- @CROSS_COMPILING_TRUE@distclean-local:
- @CROSS_COMPILING_TRUE@	-rm -rf build
diff --git a/srcpkgs/ngspice/template b/srcpkgs/ngspice/template
index 05beffd8f841..e7d786828310 100644
--- a/srcpkgs/ngspice/template
+++ b/srcpkgs/ngspice/template
@@ -1,19 +1,49 @@
 # Template file for 'ngspice'
 pkgname=ngspice
-version=33
+version=35
 revision=1
 build_style=gnu-configure
-configure_args="--with-readline=yes --with-ngshared --enable-xspice --enable-cider"
+configure_args="--enable-xspice --enable-cider"
 hostmakedepends="bison byacc"
 makedepends="readline-devel libX11-devel libXaw-devel"
+checkdepends="perl"
 short_desc="Mixed Mode Mixed Level Circuit Simulator based on Spice3F5"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="http://ngspice.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/ngspice/ng-spice-rework/${version}/${pkgname}-${version}.tar.gz"
-checksum=b99db66cc1c57c44e9af1ef6ccb1dcbc8ae1df3e35acf570af578f606f8541f1
+checksum=c1b7f5c276db579acb3f0a7afb64afdeb4362289a6cab502d4ca302d6e5279ec
 
-post_install() {
+# ngshared binary and shared library can't be built in the same pass
+# --ngshared builds the shared library, and readline should only be enabled for the binary
+# see: https://github.com/imr/ngspice/commit/b86c85f85bbba6e45dc030af3e853edf8b9cfa3d
+do_configure() {
+	mkdir build
+	cd build
+	../configure --with-readline=yes $configure_args
+	mkdir ../build-lib
+	cd ../build-lib
+	../configure --with-ngshared $configure_args
+}
+
+do_build() {
+	make -C build $makejobs
+	make -C build-lib $makejobs
+}
+
+# Starting with v34, some tests fail with "No compatability mode selected!"
+# Solution is to add this line to a .spiceinit file in the home directory,
+# see: https://sourceforge.net/p/ngspice/bugs/554/#b513
+do_check() {
+	export HOME="${PWD}/.home_dir"
+	install -d "$HOME"
+	printf 'set ngbehavior=mc\n' > "${HOME}/.spiceinit"
+	make -C build check
+}
+
+do_install() {
+	make DESTDIR=${DESTDIR} -C build install
+	make DESTDIR=${DESTDIR} -C build-lib install
 	vlicense COPYING
 }