Re: [PR PATCH] [Updated] singular: update to 4.3.1p2 (fix gcc 12 build)

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

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

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

https://github.com/dkwo/void-packages singu
https://github.com/void-linux/void-packages/pull/39866

singular: update to 4.3.1p2 (fix gcc 12 build)
I tested the changes in this PR: built and checked on x86_64 using the gcc 12 PR.
(Even the non-musl version had the same failure with gcc 12.)
Had to use patchversion p2 otherwise it would still fail (with different errors).
@tornaria @leahneukirchen @Duncaen 

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

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

From 2448a6f20d17463574df162198c740d5e2b6dec0 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Mon, 10 Oct 2022 10:14:06 -0400
Subject: [PATCH 1/2] singular: update to 4.3.1p2 (fix gcc 12 build)

---
 common/shlibs             | 10 +++++-----
 srcpkgs/singular/template | 10 ++++++----
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 9f95ac87a7ea..54141e4cd4ba 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4055,11 +4055,11 @@ libumfpack.so.5 SuiteSparse-5.10.1_1
 libecl.so.21.2 ecl-21.2.1_1
 libecm.so.1 ecm-7.0.4_3
 libcliquer.so.1 cliquer-1.22_1
-libSingular-4.3.0.so singular-4.3.0_1
-libfactory-4.3.0.so singular-4.3.0_1
-libpolys-4.3.0.so singular-4.3.0_1
-libomalloc-0.9.6.so singular-4.3.0_1
-libsingular_resources-4.3.0.so singular-4.3.0_1
+libSingular-4.3.1.so singular-4.3.1p2_1
+libfactory-4.3.1.so singular-4.3.1p2_1
+libpolys-4.3.1.so singular-4.3.1p2_1
+libomalloc-0.9.6.so singular-4.3.1p2_1
+libsingular_resources-4.3.1.so singular-4.3.1p2_1
 libbrial.so.3 brial-1.2.10_1
 libbrial_groebner.so.3 brial-1.2.10_1
 libm4ri-0.0.20200125.so m4ri-20200125_1
diff --git a/srcpkgs/singular/template b/srcpkgs/singular/template
index f23659ef5d83..824345b27fb3 100644
--- a/srcpkgs/singular/template
+++ b/srcpkgs/singular/template
@@ -1,7 +1,9 @@
 # Template file for 'singular'
 pkgname=singular
-version=4.3.0
+version=4.3.1p2
 revision=1
+_majver=${version%p*}
+wrksrc=singular-${_majver}
 build_style=gnu-configure
 configure_args="--with-readline=ncurses
 	--enable-gfanlib
@@ -15,11 +17,11 @@ configure_args="--with-readline=ncurses
 hostmakedepends="perl tar doxygen"
 makedepends="flintlib-devel cddlib-devel readline-devel graphviz"
 short_desc="Computer algebra system for polynomial computations"
-maintainer="dkwo <nicolopiazzalunga@gmail.com>"
+maintainer="dkwo <npiazza@disroot.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.singular.uni-kl.de"
-distfiles="https://www.singular.uni-kl.de/ftp/pub/Math/Singular/SOURCES/${version//./-}/singular-${version}.tar.gz"
-checksum=74f38288203720e3f280256f2f8deb94030dd032b4237d844652aff0faab36e7
+distfiles="https://www.singular.uni-kl.de/ftp/pub/Math/Singular/SOURCES/${_majver//./-}/singular-${version}.tar.gz"
+checksum=95814bba0f0bd0290cd9799ec1d2ecc6f4c8a4e6429d9a02eb7f9c4e5649682a
 
 if [ -z "$CROSS_BUILD" ]; then
 	makedepends+=" ntl-devel"

From d4389084aaf874f521def203a88f8e38acc50bd0 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Mon, 10 Oct 2022 14:08:38 -0400
Subject: [PATCH 2/2] sagemath: revbump for singular

---
 srcpkgs/sagemath/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sagemath/template b/srcpkgs/sagemath/template
index 0d793262d572..0edc5ba368cf 100644
--- a/srcpkgs/sagemath/template
+++ b/srcpkgs/sagemath/template
@@ -1,7 +1,7 @@
 # Template file for 'sagemath'
 pkgname=sagemath
 version=9.5
-revision=2
+revision=3
 wrksrc=sage-$version
 build_wrksrc=pkgs/sagemath-standard
 build_style=python3-module