Date: Tuesday, February 21, 2017 @ 09:01:02 Author: arojas Revision: 213281
singular 4.1.0.p2 rebuild Added: sagemath/trunk/sagemath-singular-4.1.0.p2.patch Modified: sagemath/trunk/PKGBUILD ----------------------------------+ PKGBUILD | 9 ++++++--- sagemath-singular-4.1.0.p2.patch | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2017-02-21 09:00:53 UTC (rev 213280) +++ PKGBUILD 2017-02-21 09:01:02 UTC (rev 213281) @@ -10,7 +10,7 @@ pkgbase=sagemath pkgname=(sagemath sagemath-jupyter) pkgver=7.5.1 -pkgrel=6 +pkgrel=7 pkgdesc="Open Source Mathematics Software, free alternative to Magma, Maple, Mathematica, and Matlab" arch=(i686 x86_64) url="http://www.sagemath.org"; @@ -35,7 +35,7 @@ source=("$pkgname-$pkgver.tar.gz::https://github.com/sagemath/sage/archive/$pkgver.tar.gz"; env.patch skip-check.patch cython-sys-path.patch is-package-installed.patch package.patch jupyter-path.patch test-optional.patch ecm-7.patch increase-rtol.patch sagemath-gslcblas.patch r-no-readline.patch - sagemath-no-anal.h.patch sagemath-planarity3.patch fes02.patch) + sagemath-no-anal.h.patch sagemath-planarity3.patch fes02.patch sagemath-singular-4.1.0.p2.patch) sha256sums=('3cd9af3e3bfd7f5cc966b7c36168d04b9a1213aa9a7af3286b5d53d40e7653e3' '9dba04ff13626a7b6c338a8b18a6c27d343f68a547a218533cf773af3dae6635' 'b02b3d2d5620ca20f96adb62b6fef05e4676c0a60983310a1450fdf3d923cb04' @@ -50,7 +50,8 @@ 'ef9f401fa84fe1772af9efee6816643534f2896da4c23b809937b19771bdfbbf' '8126c92a5fc15738c4f7982aadb5a4033230fc2d5da05af9133a96ad1181419e' 'a1c562ebe4538d672404ca3ac2e954a3c955afeb7463f7b4fe6eaa6fa74fe5c7' - 'a39da083c038ada797ffc5bedc9ba47455a3f77057d42f86484ae877ef9172ea') + 'a39da083c038ada797ffc5bedc9ba47455a3f77057d42f86484ae877ef9172ea' + 'e1912afec58b834fac3b9161c2d5a1794bb618126c6bd7a4be85c834231360e7') prepare(){ cd sage-$pkgver @@ -78,6 +79,8 @@ patch -p1 -i ../r-no-readline.patch # fix build with planarity 3 (Debian) patch -p2 -i ../sagemath-planarity3.patch +# fix build with Singular 4.1.0-p2 + patch -p0 -i ../sagemath-singular-4.1.0.p2.patch # Upstream patches # fix build against libfes 0.2 http://trac.sagemath.org/ticket/15209 Added: sagemath-singular-4.1.0.p2.patch =================================================================== --- sagemath-singular-4.1.0.p2.patch (rev 0) +++ sagemath-singular-4.1.0.p2.patch 2017-02-21 09:01:02 UTC (rev 213281) @@ -0,0 +1,33 @@ +--- src/sage/libs/singular/decl.pxd.orig 2017-02-21 07:58:27.088118954 +0000 ++++ src/sage/libs/singular/decl.pxd 2017-02-21 07:59:01.794846500 +0000 +@@ -484,8 +484,8 @@ + + ring *rDefault(int char , int nvars, char **names) + ring *rDefault(const n_Procs_s* cf, int nvars, char **names) +- ring *rDefault(int ch , int nvars, char **names,int ord_size, int *ord, int *block0, int *block1, int **wvhdl) +- ring *rDefault(const n_Procs_s* cf, int nvars, char **names,int ord_size, int *ord, int *block0, int *block1, int **wvhdl) ++ ring *rDefault(int ch , int nvars, char **names,int ord_size, rRingOrder_t *ord, int *block0, int *block1, int **wvhdl) ++ ring *rDefault(const n_Procs_s* cf, int nvars, char **names,int ord_size, rRingOrder_t *ord, int *block0, int *block1, int **wvhdl) + + + +--- src/sage/libs/singular/ring.pyx.orig 2017-02-21 07:24:23.197906897 +0000 ++++ src/sage/libs/singular/ring.pyx 2017-02-21 07:29:23.731763098 +0000 +@@ -21,7 +21,7 @@ + from sage.libs.singular.decl cimport number, poly, ring, currRing + from sage.libs.singular.decl cimport rChangeCurrRing, rCopy0, rComplete, rDelete, idInit + from sage.libs.singular.decl cimport omAlloc0, omStrDup, omAlloc, omAlloc0Bin, sip_sring_bin, rnumber_bin +-from sage.libs.singular.decl cimport ringorder_dp, ringorder_Dp, ringorder_lp, ringorder_rp, ringorder_ds, ringorder_Ds, ringorder_ls, ringorder_M, ringorder_C, ringorder_wp, ringorder_Wp, ringorder_ws, ringorder_Ws, ringorder_a ++from sage.libs.singular.decl cimport ringorder_dp, ringorder_Dp, ringorder_lp, ringorder_rp, ringorder_ds, ringorder_Ds, ringorder_ls, ringorder_M, ringorder_C, ringorder_wp, ringorder_Wp, ringorder_ws, ringorder_Ws, ringorder_a, rRingOrder_t + from sage.libs.singular.decl cimport p_Copy, prCopyR + from sage.libs.singular.decl cimport n_unknown, n_Zp, n_Q, n_R, n_GF, n_long_R, n_algExt,n_transExt,n_long_C, n_Z, n_Zn, n_Znm, n_Z2m, n_CF + from sage.libs.singular.decl cimport n_coeffType, cfInitCharProc +@@ -165,7 +165,7 @@ + ## q q : GF(q=p^n) *names TRUE (todo) + + _wvhdl = <int **>omAlloc0((nblcks + 2) * sizeof(int *)) +- _order = <int *>omAlloc0((nblcks + 2) * sizeof(int)) ++ _order = <rRingOrder_t *>omAlloc0((nblcks + 2) * sizeof(int)) + _block0 = <int *>omAlloc0((nblcks + 2) * sizeof(int)) + _block1 = <int *>omAlloc0((nblcks + 2) * sizeof(int)) +
