Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] singular: update to 4.3.1p2 (fix gcc 12 build)
@ 2022-10-10 14:47 dkwo
  2022-10-10 18:08 ` [PR PATCH] [Updated] " dkwo
                   ` (15 more replies)
  0 siblings, 16 replies; 17+ messages in thread
From: dkwo @ 2022-10-10 14:47 UTC (permalink / raw)
  To: ml

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

There is a new 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: 1590 bytes --]

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

---
 srcpkgs/singular/template | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/singular/template b/srcpkgs/singular/template
index f23659ef5d83..441a5ba56134 100644
--- a/srcpkgs/singular/template
+++ b/srcpkgs/singular/template
@@ -1,7 +1,10 @@
 # Template file for 'singular'
 pkgname=singular
-version=4.3.0
+_patchver=p2
+_majver=4.3.1
+version=${_majver}${_patchver}
 revision=1
+wrksrc=singular-${_majver}
 build_style=gnu-configure
 configure_args="--with-readline=ncurses
 	--enable-gfanlib
@@ -15,11 +18,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"

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PR PATCH] [Updated] singular: update to 4.3.1p2 (fix gcc 12 build)
  2022-10-10 14:47 [PR PATCH] singular: update to 4.3.1p2 (fix gcc 12 build) dkwo
@ 2022-10-10 18:08 ` dkwo
  2022-10-10 19:01 ` tornaria
                   ` (14 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: dkwo @ 2022-10-10 18:08 UTC (permalink / raw)
  To: ml

[-- 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: 3080 bytes --]

From c3b0a33ec06b1487c484de4a359f3484dc92b272 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 | 11 +++++++----
 2 files changed, 12 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..441a5ba56134 100644
--- a/srcpkgs/singular/template
+++ b/srcpkgs/singular/template
@@ -1,7 +1,10 @@
 # Template file for 'singular'
 pkgname=singular
-version=4.3.0
+_patchver=p2
+_majver=4.3.1
+version=${_majver}${_patchver}
 revision=1
+wrksrc=singular-${_majver}
 build_style=gnu-configure
 configure_args="--with-readline=ncurses
 	--enable-gfanlib
@@ -15,11 +18,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 d7e723cee2ed5407d0aa064e3addc8727e078d7b 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

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: singular: update to 4.3.1p2 (fix gcc 12 build)
  2022-10-10 14:47 [PR PATCH] singular: update to 4.3.1p2 (fix gcc 12 build) dkwo
  2022-10-10 18:08 ` [PR PATCH] [Updated] " dkwo
@ 2022-10-10 19:01 ` tornaria
  2022-10-10 19:47 ` dkwo
                   ` (13 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: tornaria @ 2022-10-10 19:01 UTC (permalink / raw)
  To: ml

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

New comment by tornaria on void-packages repository

https://github.com/void-linux/void-packages/pull/39866#issuecomment-1273701772

Comment:
Just as a heads up: I'm working on updating sage to 9.7. Maybe it's worth doing all in one swipe?

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: singular: update to 4.3.1p2 (fix gcc 12 build)
  2022-10-10 14:47 [PR PATCH] singular: update to 4.3.1p2 (fix gcc 12 build) dkwo
  2022-10-10 18:08 ` [PR PATCH] [Updated] " dkwo
  2022-10-10 19:01 ` tornaria
@ 2022-10-10 19:47 ` dkwo
  2022-10-10 20:31 ` tornaria
                   ` (12 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: dkwo @ 2022-10-10 19:47 UTC (permalink / raw)
  To: ml

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

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/39866#issuecomment-1273741607

Comment:
Sure, that's fine with me.
Just incorporate this one there?

Also perhaps have a look at the python3.11 update,
I think it's also updating sage.


^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: singular: update to 4.3.1p2 (fix gcc 12 build)
  2022-10-10 14:47 [PR PATCH] singular: update to 4.3.1p2 (fix gcc 12 build) dkwo
                   ` (2 preceding siblings ...)
  2022-10-10 19:47 ` dkwo
@ 2022-10-10 20:31 ` tornaria
  2022-10-10 20:37 ` dkwo
                   ` (11 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: tornaria @ 2022-10-10 20:31 UTC (permalink / raw)
  To: ml

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

New comment by tornaria on void-packages repository

https://github.com/void-linux/void-packages/pull/39866#issuecomment-1273792233

Comment:
> Sure, that's fine with me. Just incorporate this one there?

Sure, I will.

Just FYI, a few doctest failures in sagemath 9.5 are expected, mostly safe to ignore. Right now I have all doctests passing with sagemath 9.7 + a few patches (less than in 9.5). However, that's using matplotlib 3.5.3. I haven't yet started working on matplotlib 3.6 (which causes most of the failures you have here, #39857 is a first step that I'm yet to test, but I'm not sure that will be enough).

I will include this in my sagemath PR, together with other updates I've been doing (some of which work ok independently of sagemath, others like singular need rebuild of sagemath).

> Also perhaps have a look at the python3.11 update, I think it's also updating sage.

Sure, but locking sagemath update to python update seems more difficult. OTOH locking singular and sagemath seems more reasonable (unless you have a pressing reason to update singular, if so don't wait for me).

Anyway, maybe worth testing the sagemath update with python 3.11 just to make sure everything works.

BTW, the stupid limit recent python imposed on "int(s)" is also causing a few failures but they will go away with sagemath 9.7 (they just disable the limit).

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: singular: update to 4.3.1p2 (fix gcc 12 build)
  2022-10-10 14:47 [PR PATCH] singular: update to 4.3.1p2 (fix gcc 12 build) dkwo
                   ` (3 preceding siblings ...)
  2022-10-10 20:31 ` tornaria
@ 2022-10-10 20:37 ` dkwo
  2022-10-10 21:23 ` tornaria
                   ` (10 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: dkwo @ 2022-10-10 20:37 UTC (permalink / raw)
  To: ml

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

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/39866#issuecomment-1273796991

Comment:
I'm not in a hurry, the main reason I wanted to update is for the gcc12 update,
which fails at building previous singular versions.

Please link your sage PR here once available, and I'll close this.


^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: singular: update to 4.3.1p2 (fix gcc 12 build)
  2022-10-10 14:47 [PR PATCH] singular: update to 4.3.1p2 (fix gcc 12 build) dkwo
                   ` (4 preceding siblings ...)
  2022-10-10 20:37 ` dkwo
@ 2022-10-10 21:23 ` tornaria
  2022-10-10 21:28 ` [PR PATCH] [Updated] " dkwo
                   ` (9 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: tornaria @ 2022-10-10 21:23 UTC (permalink / raw)
  To: ml

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

New comment by tornaria on void-packages repository

https://github.com/void-linux/void-packages/pull/39866#issuecomment-1273832793

Comment:
BTW, you could do something like this:
```diff
diff --git a/srcpkgs/singular/template b/srcpkgs/singular/template
index 441a5ba561..824345b27f 100644
--- a/srcpkgs/singular/template
+++ b/srcpkgs/singular/template
@@ -1,9 +1,8 @@
 # Template file for 'singular'
 pkgname=singular
-_patchver=p2
-_majver=4.3.1
-version=${_majver}${_patchver}
+version=4.3.1p2
 revision=1
+_majver=${version%p*}
 wrksrc=singular-${_majver}
 build_style=gnu-configure
 configure_args="--with-readline=ncurses
```
to avoid the xlint complain. I believe it is mandatory to have the full expanded version string in 'version=...' so that it can be easily parsed with grep and sed from templates (just grep "^version=", etc.). The `${version%p*}` thing should work ok for versions with a patchlevel as for versions without it.

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PR PATCH] [Updated] singular: update to 4.3.1p2 (fix gcc 12 build)
  2022-10-10 14:47 [PR PATCH] singular: update to 4.3.1p2 (fix gcc 12 build) dkwo
                   ` (5 preceding siblings ...)
  2022-10-10 21:23 ` tornaria
@ 2022-10-10 21:28 ` dkwo
  2022-10-10 21:37 ` tornaria
                   ` (8 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: dkwo @ 2022-10-10 21:28 UTC (permalink / raw)
  To: ml

[-- 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

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: singular: update to 4.3.1p2 (fix gcc 12 build)
  2022-10-10 14:47 [PR PATCH] singular: update to 4.3.1p2 (fix gcc 12 build) dkwo
                   ` (6 preceding siblings ...)
  2022-10-10 21:28 ` [PR PATCH] [Updated] " dkwo
@ 2022-10-10 21:37 ` tornaria
  2022-10-10 21:43 ` [PR PATCH] [Updated] " dkwo
                   ` (7 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: tornaria @ 2022-10-10 21:37 UTC (permalink / raw)
  To: ml

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

New comment by tornaria on void-packages repository

https://github.com/void-linux/void-packages/pull/39866#issuecomment-1273841557

Comment:
Also: 
```
srcpkgs/singular/template:9: variable set continuation should start with a single space
srcpkgs/singular/template:10: variable set continuation should start with a single space
srcpkgs/singular/template:11: variable set continuation should start with a single space
srcpkgs/singular/template:12: variable set continuation should start with a single space
srcpkgs/singular/template:13: variable set continuation should start with a single space
srcpkgs/singular/template:14: variable set continuation should start with a single space
srcpkgs/singular/template:15: variable set continuation should start with a single space
srcpkgs/singular/template:16: variable set continuation should start with a single space
```
but that's with a patch to xlint that I've just realized I didn't submit upstream :facepalm: 

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PR PATCH] [Updated] singular: update to 4.3.1p2 (fix gcc 12 build)
  2022-10-10 14:47 [PR PATCH] singular: update to 4.3.1p2 (fix gcc 12 build) dkwo
                   ` (7 preceding siblings ...)
  2022-10-10 21:37 ` tornaria
@ 2022-10-10 21:43 ` dkwo
  2022-10-10 21:50 ` tornaria
                   ` (6 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: dkwo @ 2022-10-10 21:43 UTC (permalink / raw)
  To: ml

[-- 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: 3359 bytes --]

From b3c746a6ca5b079488eeb5da0233843bd662c071 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 | 26 ++++++++++++++------------
 2 files changed, 19 insertions(+), 17 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..a30beef915d2 100644
--- a/srcpkgs/singular/template
+++ b/srcpkgs/singular/template
@@ -1,25 +1,27 @@
 # 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
-	--enable-Singular
-	--enable-factory
-	--disable-doc
-	--disable-polymake
-	--without-python
-	--with-libparse
-	ac_cv_lib_cddgmp_dd_free_global_constants=yes"
+ --enable-gfanlib
+ --enable-Singular
+ --enable-factory
+ --disable-doc
+ --disable-polymake
+ --without-python
+ --with-libparse
+ ac_cv_lib_cddgmp_dd_free_global_constants=yes"
 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 a3b3b973469801fb2ace7ac7e6634bbad50a3772 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

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: singular: update to 4.3.1p2 (fix gcc 12 build)
  2022-10-10 14:47 [PR PATCH] singular: update to 4.3.1p2 (fix gcc 12 build) dkwo
                   ` (8 preceding siblings ...)
  2022-10-10 21:43 ` [PR PATCH] [Updated] " dkwo
@ 2022-10-10 21:50 ` tornaria
  2022-10-11 13:47 ` dkwo
                   ` (5 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: tornaria @ 2022-10-10 21:50 UTC (permalink / raw)
  To: ml

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

New comment by tornaria on void-packages repository

https://github.com/void-linux/void-packages/pull/39866#issuecomment-1273841557

Comment:
Also: 
```
srcpkgs/singular/template:9: variable set continuation should start with a single space
srcpkgs/singular/template:10: variable set continuation should start with a single space
srcpkgs/singular/template:11: variable set continuation should start with a single space
srcpkgs/singular/template:12: variable set continuation should start with a single space
srcpkgs/singular/template:13: variable set continuation should start with a single space
srcpkgs/singular/template:14: variable set continuation should start with a single space
srcpkgs/singular/template:15: variable set continuation should start with a single space
srcpkgs/singular/template:16: variable set continuation should start with a single space
```
but that's with a patch to xlint that I've just realized I didn't submit upstream :facepalm: 

Edit: it's now https://github.com/leahneukirchen/xtools/pull/266.

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: singular: update to 4.3.1p2 (fix gcc 12 build)
  2022-10-10 14:47 [PR PATCH] singular: update to 4.3.1p2 (fix gcc 12 build) dkwo
                   ` (9 preceding siblings ...)
  2022-10-10 21:50 ` tornaria
@ 2022-10-11 13:47 ` dkwo
  2022-10-12 11:27 ` leahneukirchen
                   ` (4 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: dkwo @ 2022-10-11 13:47 UTC (permalink / raw)
  To: ml

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

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/39866#issuecomment-1274714212

Comment:
Done.

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: singular: update to 4.3.1p2 (fix gcc 12 build)
  2022-10-10 14:47 [PR PATCH] singular: update to 4.3.1p2 (fix gcc 12 build) dkwo
                   ` (10 preceding siblings ...)
  2022-10-11 13:47 ` dkwo
@ 2022-10-12 11:27 ` leahneukirchen
  2022-10-12 12:08 ` tornaria
                   ` (3 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: leahneukirchen @ 2022-10-12 11:27 UTC (permalink / raw)
  To: ml

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

New comment by leahneukirchen on void-packages repository

https://github.com/void-linux/void-packages/pull/39866#issuecomment-1276007209

Comment:
Do you want this merged now or as part of later Sage update?

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: singular: update to 4.3.1p2 (fix gcc 12 build)
  2022-10-10 14:47 [PR PATCH] singular: update to 4.3.1p2 (fix gcc 12 build) dkwo
                   ` (11 preceding siblings ...)
  2022-10-12 11:27 ` leahneukirchen
@ 2022-10-12 12:08 ` tornaria
  2022-10-12 12:16 ` leahneukirchen
                   ` (2 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: tornaria @ 2022-10-12 12:08 UTC (permalink / raw)
  To: ml

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

New comment by tornaria on void-packages repository

https://github.com/void-linux/void-packages/pull/39866#issuecomment-1276054743

Comment:
> Do you want this merged now or as part of later Sage update?

It's a matter of taste: merging this now will force rebuild of sagemath-9.5. Then the update to sagemath-9.7 will force rebuild of this (due to updating flintlib, which is a dependency of singular). I think the main interest of this update is to support gcc12.

I expect to be done with sagemath-9.7 by the weekend, so I'd rather wait and do all together.

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: singular: update to 4.3.1p2 (fix gcc 12 build)
  2022-10-10 14:47 [PR PATCH] singular: update to 4.3.1p2 (fix gcc 12 build) dkwo
                   ` (12 preceding siblings ...)
  2022-10-12 12:08 ` tornaria
@ 2022-10-12 12:16 ` leahneukirchen
  2022-10-12 14:50 ` dkwo
  2022-10-12 14:50 ` [PR PATCH] [Closed]: " dkwo
  15 siblings, 0 replies; 17+ messages in thread
From: leahneukirchen @ 2022-10-12 12:16 UTC (permalink / raw)
  To: ml

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

New comment by leahneukirchen on void-packages repository

https://github.com/void-linux/void-packages/pull/39866#issuecomment-1276066673

Comment:
Ok. As long as we don't need to wait for Python 3.11.

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: singular: update to 4.3.1p2 (fix gcc 12 build)
  2022-10-10 14:47 [PR PATCH] singular: update to 4.3.1p2 (fix gcc 12 build) dkwo
                   ` (13 preceding siblings ...)
  2022-10-12 12:16 ` leahneukirchen
@ 2022-10-12 14:50 ` dkwo
  2022-10-12 14:50 ` [PR PATCH] [Closed]: " dkwo
  15 siblings, 0 replies; 17+ messages in thread
From: dkwo @ 2022-10-12 14:50 UTC (permalink / raw)
  To: ml

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

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/39866#issuecomment-1276308230

Comment:
Sure, let's do it in sagemath pr then.

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PR PATCH] [Closed]: singular: update to 4.3.1p2 (fix gcc 12 build)
  2022-10-10 14:47 [PR PATCH] singular: update to 4.3.1p2 (fix gcc 12 build) dkwo
                   ` (14 preceding siblings ...)
  2022-10-12 14:50 ` dkwo
@ 2022-10-12 14:50 ` dkwo
  15 siblings, 0 replies; 17+ messages in thread
From: dkwo @ 2022-10-12 14:50 UTC (permalink / raw)
  To: ml

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

There's a closed pull request on the void-packages repository

singular: update to 4.3.1p2 (fix gcc 12 build)
https://github.com/void-linux/void-packages/pull/39866

Description:
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 

^ permalink raw reply	[flat|nested] 17+ messages in thread

end of thread, other threads:[~2022-10-12 14:50 UTC | newest]

Thread overview: 17+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-10-10 14:47 [PR PATCH] singular: update to 4.3.1p2 (fix gcc 12 build) dkwo
2022-10-10 18:08 ` [PR PATCH] [Updated] " dkwo
2022-10-10 19:01 ` tornaria
2022-10-10 19:47 ` dkwo
2022-10-10 20:31 ` tornaria
2022-10-10 20:37 ` dkwo
2022-10-10 21:23 ` tornaria
2022-10-10 21:28 ` [PR PATCH] [Updated] " dkwo
2022-10-10 21:37 ` tornaria
2022-10-10 21:43 ` [PR PATCH] [Updated] " dkwo
2022-10-10 21:50 ` tornaria
2022-10-11 13:47 ` dkwo
2022-10-12 11:27 ` leahneukirchen
2022-10-12 12:08 ` tornaria
2022-10-12 12:16 ` leahneukirchen
2022-10-12 14:50 ` dkwo
2022-10-12 14:50 ` [PR PATCH] [Closed]: " dkwo

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).