Drop merged patch

5 files changed, 8 insertions, 72 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b175137b6c5b..24fb4e66577d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = sagemath-git
 	pkgdesc = Open Source Mathematics Software, free alternative to Magma, Maple, Mathematica, and Matlab
-	pkgver = 10.0.rc1.r2.g4140517848
+	pkgver = 10.1.beta1.r0.g3202f6515c
 	pkgrel = 1
 	url = http://www.sagemath.org
 	arch = x86_64
@@ -102,14 +102,12 @@ pkgbase = sagemath-git
 	source = sagemath-optional-packages.patch
 	source = latte-count.patch
 	source = test-optional.patch
-	source = sagemath-linbox-1.7.patch
 	source = sagemath-bliss-0.77.patch
 	source = sagemath-tdlib-0.9.patch
 	sha256sums = SKIP
 	sha256sums = 8a5b935d2fd8815489713db6497e9d44aefd61e8553e8cd4acc2cb1adf625ccc
-	sha256sums = bd188af45ce31579b82407adee8e9bf6033a996f7ea6e328fabca526f31c08ba
-	sha256sums = 4484bd38b273e7fcc3d54bcd38e1ed3cdade12f3e9dc79235b011ef69e17c10c
-	sha256sums = fbc87b62c73d20aa12fced28f5d68dc2b3ec7cc9123be424226321195bf2b3b4
+	sha256sums = 5cd2f88965d7ebab9dfab6f5c2040d363a4a5ae41230219cc7070b907381da5a
+	sha256sums = dab5b12d85ddc023f7aff9d886cff8c4bbde903034aeb47aba21caa46352a91d
 	sha256sums = 1a578528bab7be3970954fdfa033afa69fe753da1bab3f41693b0e05e3c849cd
 	sha256sums = 56a83abecf2ff5a500442adc7a50abbb70006037dd39c39dcdb04b3ca9fb51e2
 
diff --git a/PKGBUILD b/PKGBUILD
index 723812c19099..68200a7776b4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 # Contributor: Stefan Husmann <stefan-husmann at t-online dot de>
 
 pkgname=sagemath-git
-pkgver=10.0.rc1.r2.g4140517848
+pkgver=10.1.beta1.r0.g3202f6515c
 pkgrel=1
 pkgdesc='Open Source Mathematics Software, free alternative to Magma, Maple, Mathematica, and Matlab'
 arch=(x86_64)
@@ -59,14 +59,12 @@ source=(git+https://github.com/sagemath/sage#branch=develop
         sagemath-optional-packages.patch
         latte-count.patch
         test-optional.patch
-        sagemath-linbox-1.7.patch
         sagemath-bliss-0.77.patch
         sagemath-tdlib-0.9.patch)
 sha256sums=('SKIP'
             '8a5b935d2fd8815489713db6497e9d44aefd61e8553e8cd4acc2cb1adf625ccc'
-            'bd188af45ce31579b82407adee8e9bf6033a996f7ea6e328fabca526f31c08ba'
-            '4484bd38b273e7fcc3d54bcd38e1ed3cdade12f3e9dc79235b011ef69e17c10c'
-            'fbc87b62c73d20aa12fced28f5d68dc2b3ec7cc9123be424226321195bf2b3b4'
+            '5cd2f88965d7ebab9dfab6f5c2040d363a4a5ae41230219cc7070b907381da5a'
+            'dab5b12d85ddc023f7aff9d886cff8c4bbde903034aeb47aba21caa46352a91d'
             '1a578528bab7be3970954fdfa033afa69fe753da1bab3f41693b0e05e3c849cd'
             '56a83abecf2ff5a500442adc7a50abbb70006037dd39c39dcdb04b3ca9fb51e2')
 
@@ -79,8 +77,6 @@ prepare(){
   cd sage
 
 # Upstream patches
-# Fix build with linbox 1.7 https://trac.sagemath.org/ticket/32959
-  patch -p1 -i ../sagemath-linbox-1.7.patch
 # Fix build with bliss 0.77 https://trac.sagemath.org/ticket/33010
   patch -p1 -i ../sagemath-bliss-0.77.patch
 
diff --git a/latte-count.patch b/latte-count.patch
index c3e5845a8633..8493f8ca14ed 100644
--- a/latte-count.patch
+++ b/latte-count.patch
@@ -2,7 +2,7 @@ diff --git a/src/sage/features/latte.py b/src/sage/features/latte.py
 index 63d227fd35..040a5cf1f9 100644
 --- a/src/sage/features/latte.py
 +++ b/src/sage/features/latte.py
-@@ -21,7 +21,7 @@ from . import Executable, Feature, FeatureTestResult
+@@ -34,7 +34,7 @@ from . import Executable, Feature, FeatureTestResult
              sage: isinstance(Latte_count(), Latte_count)
              True
          """
diff --git a/sagemath-linbox-1.7.patch b/sagemath-linbox-1.7.patch
deleted file mode 100644
index 6cbbc874c9d6..000000000000
--- a/sagemath-linbox-1.7.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff --git a/src/sage/libs/linbox/conversion.pxd b/src/sage/libs/linbox/conversion.pxd
-index 7794c9e..1753277 100644
---- a/src/sage/libs/linbox/conversion.pxd
-+++ b/src/sage/libs/linbox/conversion.pxd
-@@ -177,9 +177,8 @@ cdef inline Vector_integer_dense new_sage_vector_integer_dense(P, DenseVector_in
-     - v -- linbox vector
-     """
-     cdef Vector_integer_dense res = P()
--    cdef cppvector[Integer] * vec = &v.refRep()
-     cdef size_t i
-     for i in range(<size_t> res._degree):
--        mpz_set(res._entries[i], vec[0][i].get_mpz_const())
-+        mpz_set(res._entries[i], v.getEntry(i).get_mpz_const())
- 
-     return res
-diff --git a/src/sage/libs/linbox/linbox.pxd b/src/sage/libs/linbox/linbox.pxd
-index 9112d15..dcc4829 100644
---- a/src/sage/libs/linbox/linbox.pxd
-+++ b/src/sage/libs/linbox/linbox.pxd
-@@ -32,7 +32,7 @@ cdef extern from "linbox/matrix/dense-matrix.h":
-         ctypedef Modular_double Field
-         ctypedef double Element
-         DenseMatrix_Modular_double(Field F, size_t m, size_t n)
--        DenseMatrix_Modular_double(Field F, Element*, size_t m, size_t n)
-+        DenseMatrix_Modular_double(Field F, size_t m, size_t n, Element*)
-         void setEntry(size_t i, size_t j, Element& a)
-         Element &getEntry(size_t i, size_t j)
- 
-@@ -42,7 +42,7 @@ cdef extern from "linbox/matrix/dense-matrix.h":
-         ctypedef Modular_float Field
-         ctypedef float Element
-         DenseMatrix_Modular_float(Field F, size_t m, size_t n)
--        DenseMatrix_Modular_float(Field F, Element*, size_t m, size_t n)
-+        DenseMatrix_Modular_float(Field F, size_t m, size_t n, Element*)
-         void setEntry(size_t i, size_t j, Element& a)
-         Element &getEntry(size_t i, size_t j)
- 
-@@ -101,7 +101,6 @@ cdef extern from "linbox/vector/vector.h":
-         DenseVector_integer (Field &F)
-         DenseVector_integer (Field &F, long& m)
-         DenseVector_integer (Field &F, cppvector[Integer]&)
--        cppvector[Element]& refRep()
-         size_t size()
-         void resize(size_t)
-         void resize(size_t n, const Element&)
-diff --git a/src/sage/matrix/matrix_modn_dense_template.pxi b/src/sage/matrix/matrix_modn_dense_template.pxi
-index 010365d..3d60726 100644
---- a/src/sage/matrix/matrix_modn_dense_template.pxi
-+++ b/src/sage/matrix/matrix_modn_dense_template.pxi
-@@ -221,7 +221,7 @@ cdef inline linbox_echelonize_efd(celement modulus, celement* entries, Py_ssize_
-         return 0,[]
- 
-     cdef ModField *F = new ModField(<long>modulus)
--    cdef DenseMatrix *A = new DenseMatrix(F[0], <ModField.Element*>entries,<Py_ssize_t>nrows, <Py_ssize_t>ncols)
-+    cdef DenseMatrix *A = new DenseMatrix(F[0], <Py_ssize_t>nrows, <Py_ssize_t>ncols, <ModField.Element*>entries)
-     cdef Py_ssize_t r = reducedRowEchelonize(A[0])
-     cdef Py_ssize_t i,j
-     for i in range(nrows):
diff --git a/test-optional.patch b/test-optional.patch
index 82e9fbde52da..a88fb7d544a5 100644
--- a/test-optional.patch
+++ b/test-optional.patch
@@ -2,7 +2,7 @@ diff --git a/src/sage/doctest/control.py b/src/sage/doctest/control.py
 index 2d93841e50..937e20cd2e 100644
 --- a/src/sage/doctest/control.py
 +++ b/src/sage/doctest/control.py
-@@ -414,10 +414,6 @@ class DocTestController(SageObject):
+@@ -415,10 +415,6 @@ class DocTestController(SageObject):
                  # that the package is actually installed).
                  if 'optional' in options.optional:
                      options.optional.discard('optional')