Date: Tuesday, December 13, 2022 @ 17:28:45 Author: arojas Revision: 1358936
upgpkg: sagemath 9.7-4: Rebuild with singular 4.3.1.p3 Added: sagemath/trunk/sagemath-singular-4.3.1.p3.patch Modified: sagemath/trunk/PKGBUILD ----------------------------------+ PKGBUILD | 10 +++++++--- sagemath-singular-4.3.1.p3.patch | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-12-13 16:55:33 UTC (rev 1358935) +++ PKGBUILD 2022-12-13 17:28:45 UTC (rev 1358936) @@ -7,7 +7,7 @@ pkgname=sagemath pkgver=9.7 -pkgrel=3 +pkgrel=4 pkgdesc='Open Source Mathematics Software, free alternative to Magma, Maple, Mathematica, and Matlab' arch=(x86_64) url='http://www.sagemath.org' @@ -62,7 +62,8 @@ sagemath-gap-4.12.patch sagemath-ipywidgets-8.patch sagemath-tdlib-0.9.patch - sagemath-pari-2.15.patch) + sagemath-pari-2.15.patch + sagemath-singular-4.3.1.p3.patch) sha256sums=('9f26f14aa322e3cf38a71835b12ac34b23026b467f74d54b064c5d025e76fbfd' 'eee5fa15d8c7be7e009166dbde3ea24bb10d7793dc12880516f278f86b1a6694' 'bd188af45ce31579b82407adee8e9bf6033a996f7ea6e328fabca526f31c08ba' @@ -73,7 +74,8 @@ '84c1700e285ab1d94d16d0a602417a414447d8a23ac2e55a093285cc4bd2916d' 'bdf56f85b608da12074780271ae134b02a03278f7b53a183f6dd97d8d72073e0' '56a83abecf2ff5a500442adc7a50abbb70006037dd39c39dcdb04b3ca9fb51e2' - '8930fcfc0ec8dc2c49c7bc1e853dbc33d8bf8fc0508f22f28980858b7264048f') + '8930fcfc0ec8dc2c49c7bc1e853dbc33d8bf8fc0508f22f28980858b7264048f' + '66e363c15580aa6102e10e50ce249e91ff5d5d27c0b89c1a71edf11da3607d6f') prepare(){ cd sage-$pkgver @@ -101,6 +103,8 @@ patch -p1 -i ../latte-count.patch # update to tdlib 0.9 (Fedora) patch -p1 -i ../sagemath-tdlib-0.9.patch +# fix build with singular 4.3.1.p3 + patch -p1 -i ../sagemath-singular-4.3.1.p3.patch cd build/pkgs/sagelib ./bootstrap Added: sagemath-singular-4.3.1.p3.patch =================================================================== --- sagemath-singular-4.3.1.p3.patch (rev 0) +++ sagemath-singular-4.3.1.p3.patch 2022-12-13 17:28:45 UTC (rev 1358936) @@ -0,0 +1,35 @@ +diff --git a/src/sage/libs/singular/decl.pxd b/src/sage/libs/singular/decl.pxd +index 8e3ac314b6..747a6b1e2f 100644 +--- a/src/sage/libs/singular/decl.pxd ++++ b/src/sage/libs/singular/decl.pxd +@@ -574,7 +574,7 @@ cdef extern from "singular/Singular/libsingular.h": + + # gets a component out of a polynomial vector + +- poly *pTakeOutComp1(poly **, int) ++ poly *pTakeOutComp(poly **, int) + + # deep copy p + +diff --git a/src/sage/rings/polynomial/multi_polynomial_libsingular.pyx b/src/sage/rings/polynomial/multi_polynomial_libsingular.pyx +index 4dad016b33..1dc8950434 100644 +--- a/src/sage/rings/polynomial/multi_polynomial_libsingular.pyx ++++ b/src/sage/rings/polynomial/multi_polynomial_libsingular.pyx +@@ -193,7 +193,7 @@ from sage.libs.singular.decl cimport ( + p_IsUnit, p_IsOne, p_Series, p_Head, idInit, fast_map_common_subexp, id_Delete, + p_IsHomogeneous, p_Homogen, p_Totaldegree,pLDeg1_Totaldegree, singclap_pdivide, singclap_factorize, + idLift, IDELEMS, On, Off, SW_USE_CHINREM_GCD, SW_USE_EZGCD, +- p_LmIsConstant, pTakeOutComp1, singclap_gcd, pp_Mult_qq, p_GetMaxExp, ++ p_LmIsConstant, pTakeOutComp, singclap_gcd, pp_Mult_qq, p_GetMaxExp, + pLength, kNF, p_Neg, p_Minus_mm_Mult_qq, p_Plus_mm_Mult_qq, + pDiff, singclap_resultant, p_Normalize, + prCopyR, prCopyR_NoSort) +@@ -4567,7 +4567,7 @@ cdef class MPolynomial_libsingular(MPolynomial): + l = [] + for i from 0 <= i < IDELEMS(res): + for j from 1 <= j <= IDELEMS(_I): +- l.append( new_MP(parent, pTakeOutComp1(&res.m[i], j)) ) ++ l.append( new_MP(parent, pTakeOutComp(&res.m[i], j)) ) + + id_Delete(&fI, r) + id_Delete(&_I, r)
