Re: [PR PATCH] [Updated] update singular to 4.3.0

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

[-- Attachment #1: Type: text/plain, Size: 421 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/35012

update singular to 4.3.0
This now builds fine without patches also on newer musl.

@tornaria Does it solve the issue with doctests in sage?


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

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

From 11351cb479dc389ffbaaa582f4a0c7b565a2bc56 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 12 Jan 2022 16:33:19 +0100
Subject: [PATCH] singular: update to 4.3.0

---
 common/shlibs                                 | 10 ++---
 .../patches/upstream_omalloc_new_musl.patch   | 40 -------------------
 .../patches/upstream_polys_test_musl.patch    | 22 ----------
 srcpkgs/singular/template                     |  7 ++--
 4 files changed, 9 insertions(+), 70 deletions(-)
 delete mode 100644 srcpkgs/singular/patches/upstream_omalloc_new_musl.patch
 delete mode 100644 srcpkgs/singular/patches/upstream_polys_test_musl.patch

diff --git a/common/shlibs b/common/shlibs
index f5e92014becc..5bd12cc87081 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4065,11 +4065,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.2.1.so singular-4.2.1_1
-libfactory-4.2.1.so singular-4.2.1_1
-libpolys-4.2.1.so singular-4.2.1_1
-libomalloc-0.9.6.so singular-4.2.1_1
-libsingular_resources-4.2.1.so singular-4.2.1_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
 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/patches/upstream_omalloc_new_musl.patch b/srcpkgs/singular/patches/upstream_omalloc_new_musl.patch
deleted file mode 100644
index 354603bb2c44..000000000000
--- a/srcpkgs/singular/patches/upstream_omalloc_new_musl.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From e1643135645a3cc97af8659018defd2b8617bb4e Mon Sep 17 00:00:00 2001
-From: Hans Schoenemann <hannes@mathematik.uni-kl.de>
-Date: Thu, 23 Sep 2021 10:57:25 +0200
-Subject: [PATCH] omalloc: fix alignment stuff for "make check"
-
----
- omalloc/omtTest.c | 6 ------
- omalloc/omtTest.h | 2 +-
- 2 files changed, 1 insertion(+), 7 deletions(-)
-
-diff --git a/omalloc/omtTest.c b/omalloc/omtTest.c
-index 715fbb113c..75c8cdb210 100644
---- a/omalloc/omtTest.c
-+++ b/omalloc/omtTest.c
-@@ -70,12 +70,6 @@ void omtTestDebug(omMemCell cell)
-   }
- 
-   is_size = omSizeOfAddr(cell->addr);
--  if (!OM_IS_ALIGNED(is_size))
--  {
--    omReportError(omError_Unknown, omError_NoError, OM_FLR,
--                  "is_size == %u is unaligned", is_size);
--    return;
--  }
-   if (is_size < size)
-   {
-     omReportError(omError_Unknown, omError_NoError, OM_FLR,
-diff --git a/omalloc/omtTest.h b/omalloc/omtTest.h
-index a579d88011..6faa099c89 100644
---- a/omalloc/omtTest.h
-+++ b/omalloc/omtTest.h
-@@ -48,7 +48,7 @@ void TestFree(omMemCell cell);
- 
- #define IS_STICKY_BIN(spec) (spec & 1)
- // #define IS_STICKY_BIN(spec) (0)
--#define GET_SIZE(spec)      (spec & ((((unsigned long) 1) << 14) -1))
-+#define GET_SIZE(spec)      OM_ALIGN_SIZE((spec & ((((unsigned long) 1) << 14) -1)))
- #define SET_SIZE(spec, size) spec = ((spec & ~((((unsigned long) 1) << 14) -1)) | (size))
- #define IS_ALIGNED(spec)    (spec & (((unsigned long) 1) << 15))
- #define IS_ZERO(spec)       (spec & (((unsigned long) 1) << 16))
diff --git a/srcpkgs/singular/patches/upstream_polys_test_musl.patch b/srcpkgs/singular/patches/upstream_polys_test_musl.patch
deleted file mode 100644
index 73ee062e2f89..000000000000
--- a/srcpkgs/singular/patches/upstream_polys_test_musl.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 6e2383111a18b2fa2d3421045625d1d424eb1e25 Mon Sep 17 00:00:00 2001
-From: Hans Schoenemann <hannes@mathematik.uni-kl.de>
-Date: Mon, 20 Sep 2021 15:13:36 +0200
-Subject: [PATCH] fix: make check: polys_test
-
----
- libpolys/tests/polys_test.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libpolys/tests/polys_test.h b/libpolys/tests/polys_test.h
-index 5526aa5a6b..5b4c561238 100644
---- a/libpolys/tests/polys_test.h
-+++ b/libpolys/tests/polys_test.h
-@@ -2481,7 +2481,7 @@ class PolysTestSuite : public CxxTest::TestSuite
-     {
-       for (int qi = 0; qi <= 100; qi++)
-       {
--        int c = rand() % 1000000;
-+        int c = rand() % 1000000+1; /* c must not be 0 */
-         poly qterm = p_ISet(c, r); p_SetExp(qterm, 1, qi, r);
-         p_Setm(qterm, r);
-         number qtermAsN = toFractionNumber(qterm, cf);
diff --git a/srcpkgs/singular/template b/srcpkgs/singular/template
index d3af1c8b919b..55f806b23620 100644
--- a/srcpkgs/singular/template
+++ b/srcpkgs/singular/template
@@ -1,6 +1,6 @@
 # Template file for 'singular'
 pkgname=singular
-version=4.2.1
+version=4.3.0
 revision=1
 build_style=gnu-configure
 configure_args="--with-readline=ncurses
@@ -18,8 +18,9 @@ short_desc="Computer algebra system for polynomial computations"
 maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://www.singular.uni-kl.de"
-distfiles="https://service.mathematik.uni-kl.de/ftp/pub/Math/Singular/src/${version//./-}/singular-${version}.tar.gz"
-checksum=28a56df84f85b116e0068ffecf92fbe08fc27bd4c5ba902997f1a367db0bfe8d
+# distfiles="https://service.mathematik.uni-kl.de/ftp/pub/Math/Singular/src/${version//./-}/singular-${version}.tar.gz"
+distfiles="ftp://jim.mathematik.uni-kl.de/pub/Math/Singular/SOURCES/${version//./-}/singular-${version}.tar.gz"
+checksum=6524425e7e86eab2a98ee7df6da8895541166cca1dad106d1ef056239234133c
 
 if [ -z "$CROSS_BUILD" ]; then
 	makedepends+=" ntl-devel"