Antonio Rojas pushed to branch main at Arch Linux / Packaging / Packages /
sagemath
Commits:
6daeafc7 by Antonio Rojas at 2024-11-13T10:18:16+01:00
upgpkg: 10.4-9: Fix types in eclib patch
- - - - -
3 changed files:
- .SRCINFO
- PKGBUILD
- eclib-20241112.patch
Changes:
=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
pkgbase = sagemath
pkgdesc = Open Source Mathematics Software, free alternative to Magma,
Maple, Mathematica, and Matlab
pkgver = 10.4
- pkgrel = 8
+ pkgrel = 9
url = http://www.sagemath.org
arch = x86_64
license = GPL-2.0-or-later
@@ -138,6 +138,6 @@ pkgbase = sagemath
sha256sums =
bed395c2150fa7d812b565021b0b10ce0f8b2b027a594d8f19bb3639bccf9018
sha256sums =
4705d3f67993b987d53275393be8718b7ce5a26f61c615ec54f32f8fe9aa466a
sha256sums =
aeb608a585cdd1b44608b3024f8ab8f7df19e3c6aeeb41fc3d05b687244e1a9d
- sha256sums =
0fb338b3733f8ee3ced7aa22b9fd6da0991ef8af30c0be43005b43e77eba657a
+ sha256sums =
702ef91be4049f7f533fae9d6799837114aacdee677f2d4889e4c7c415b5bd28
pkgname = sagemath
=====================================
PKGBUILD
=====================================
@@ -7,7 +7,7 @@
pkgname=sagemath
pkgver=10.4
-pkgrel=8
+pkgrel=9
pkgdesc='Open Source Mathematics Software, free alternative to Magma, Maple,
Mathematica, and Matlab'
arch=(x86_64)
url='http://www.sagemath.org'
@@ -145,7 +145,7 @@
sha256sums=('22b7e87978b7fe1935a4e06c0a3cc2bf0e65087feb67fa0f5b7b39a0b9206a08'
'bed395c2150fa7d812b565021b0b10ce0f8b2b027a594d8f19bb3639bccf9018'
'4705d3f67993b987d53275393be8718b7ce5a26f61c615ec54f32f8fe9aa466a'
'aeb608a585cdd1b44608b3024f8ab8f7df19e3c6aeeb41fc3d05b687244e1a9d'
- '0fb338b3733f8ee3ced7aa22b9fd6da0991ef8af30c0be43005b43e77eba657a')
+ '702ef91be4049f7f533fae9d6799837114aacdee677f2d4889e4c7c415b5bd28')
_pkgs=(standard
bliss
coxeter3
=====================================
eclib-20241112.patch
=====================================
@@ -1,5 +1,5 @@
diff --git a/src/sage/libs/eclib/__init__.pxd
b/src/sage/libs/eclib/__init__.pxd
-index d44d4fba865..a40c604159b 100644
+index d44d4fba865..84d1fc92275 100644
--- a/src/sage/libs/eclib/__init__.pxd
+++ b/src/sage/libs/eclib/__init__.pxd
@@ -55,7 +55,7 @@ cdef extern from "eclib/matrix.h":
@@ -7,7 +7,7 @@ index d44d4fba865..a40c604159b 100644
mat()
mat(mat m)
- scalar* get_entries()
-+ vec get_entries()
++ vector[scalar] get_entries()
scalar sub(long, long)
long nrows()
long ncols()
@@ -16,29 +16,28 @@ index d44d4fba865..a40c604159b 100644
smat()
smat(smat m)
- scalar* get_entries()
-+ svec get_entries()
++ vector[scalar] get_entries()
scalar sub(long, long)
long nrows()
long ncols()
diff --git a/src/sage/libs/eclib/mat.pyx b/src/sage/libs/eclib/mat.pyx
-index a5ef4f45c68..2b395819e7a 100644
+index a5ef4f45c68..1a50d8fd392 100644
--- a/src/sage/libs/eclib/mat.pyx
+++ b/src/sage/libs/eclib/mat.pyx
-@@ -2,7 +2,7 @@
- Cremona matrices
- """
+@@ -10,6 +10,7 @@ from sage.rings.integer_ring import ZZ
+ from sage.matrix.matrix_integer_sparse cimport Matrix_integer_sparse
+ from sage.matrix.matrix_integer_dense cimport Matrix_integer_dense
+ from sage.rings.integer cimport Integer
++from libcpp.vector cimport vector
--from sage.libs.eclib cimport scalar, addscalar
-+from sage.libs.eclib cimport vec, scalar, addscalar
- from sage.matrix.matrix_space import MatrixSpace
- from sage.rings.integer_ring import ZZ
-@@ -213,7 +213,7 @@ cdef class Matrix:
+ cdef class Matrix:
+@@ -213,7 +214,7 @@ cdef class Matrix:
"""
cdef long n = self.nrows()
cdef long i, j, k
- cdef scalar* v = <scalar*> self.M.get_entries() # coercion needed
to deal with const
-+ cdef vec v = <vec> self.M.get_entries() # coercion needed to deal
with const
++ cdef vector[scalar] v = <vector[scalar]> self.M.get_entries() #
coercion needed to deal with const
cdef Matrix_integer_dense Td
cdef Matrix_integer_sparse Ts
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/sagemath/-/commit/6daeafc767e275615cbb4edf9585067a5843f1b2
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/sagemath/-/commit/6daeafc767e275615cbb4edf9585067a5843f1b2
You're receiving this email because of your account on gitlab.archlinux.org.
