Remove patched no longer needed with pari 2.11

3 files changed, 0 insertions, 37 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 39e43317759a..db62849aaac3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -103,13 +103,11 @@ pkgbase = sagemath-git
 	source = r-no-readline.patch
 	source = fes02.patch
 	source = sagemath-threejs.patch
-	source = sagemath-ignore-warnings.patch
 	source = sagemath-cremona.patch
 	source = sagemath-scipy-1.0.patch
 	source = sagemath-singular-4.1.1.patch
 	source = sagemath-lcalc-c++11.patch
 	source = sagemath-gap-4.8.patch
-	source = pari-ratpoints.patch::https://github.com/sagemath/sage/commit/83458400.patch
 	source = sagemath-cypari2.patch::https://git.sagemath.org/sage.git/patch?id=da380b32
 	source = sagemath-cddlib-0.94j.patch::https://git.sagemath.org/sage.git/patch?id=af0e6066
 	source = sagemath-eclib-20180710.patch
@@ -122,13 +120,11 @@ pkgbase = sagemath-git
 	sha256sums = afd0952b9bb8f52fd428eae36cf719a58ff85a894baae88cbb2124e043768cc7
 	sha256sums = 7fcb52e96935dccb0f958d37c2f4e3918392480b9af53e08562f6cba6c68cb94
 	sha256sums = 93b4cbdf7f36287ad643853b99e77011fcf5bdcd17514f3bf6d2bd74a1c82fd2
-	sha256sums = a4a6c87b46ff23b89608aca66d00427334502e8bfb5dfe68b94497d19be1c7ae
 	sha256sums = f801be68d043f317cc2a85a5ca059010b68eaeafa3bbf5c9148f2c154e2a707d
 	sha256sums = 17397b8e1843b013ef5d2e083369109f0719651edd8ef0c8493cb49e2bc4324a
 	sha256sums = af22e1834997cb2740818cd4ef8ede0367b0aa237305e89b178614f35bdfcef8
 	sha256sums = 5114c912f821900e5bfae1e2cfeb7984de946d0b23e1182b0bf15be1d803dfd0
 	sha256sums = 6917cb74e50ae965ea8d7c39577e5f0a5068e4b6a67b53fc6f219149a7d06584
-	sha256sums = e24ad879f6b2eb970778fc5e867bcbe0a6d393feca8f11f5cb8d07da1f024be9
 	sha256sums = 94847fc033fd36bc59217c8484d4cf48d0640ff35bb5ca5ffba88a8158c6dd44
 	sha256sums = 9a690bda83c280c0801f6d04353e8a909da80ccfee92e06d200ae6eb9be9a5a8
 	sha256sums = 182b0765d58494978bf27628bada8b42c95ef7eb2671b91ddf9c67608560c662
diff --git a/PKGBUILD b/PKGBUILD
index 7cebdcbe6a47..4cf879cd118f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -43,13 +43,11 @@ source=(git://git.sagemath.org/sage.git#branch=develop
         r-no-readline.patch
         fes02.patch
         sagemath-threejs.patch
-        sagemath-ignore-warnings.patch
         sagemath-cremona.patch
         sagemath-scipy-1.0.patch
         sagemath-singular-4.1.1.patch
         sagemath-lcalc-c++11.patch
         sagemath-gap-4.8.patch
-        pari-ratpoints.patch::"https://github.com/sagemath/sage/commit/83458400.patch"
         sagemath-cypari2.patch::"https://git.sagemath.org/sage.git/patch?id=da380b32"
         sagemath-cddlib-0.94j.patch::"https://git.sagemath.org/sage.git/patch?id=af0e6066"
         sagemath-eclib-20180710.patch)
@@ -62,13 +60,11 @@ sha256sums=('SKIP'
             'afd0952b9bb8f52fd428eae36cf719a58ff85a894baae88cbb2124e043768cc7'
             '7fcb52e96935dccb0f958d37c2f4e3918392480b9af53e08562f6cba6c68cb94'
             '93b4cbdf7f36287ad643853b99e77011fcf5bdcd17514f3bf6d2bd74a1c82fd2'
-            'a4a6c87b46ff23b89608aca66d00427334502e8bfb5dfe68b94497d19be1c7ae'
             'f801be68d043f317cc2a85a5ca059010b68eaeafa3bbf5c9148f2c154e2a707d'
             '17397b8e1843b013ef5d2e083369109f0719651edd8ef0c8493cb49e2bc4324a'
             'af22e1834997cb2740818cd4ef8ede0367b0aa237305e89b178614f35bdfcef8'
             '5114c912f821900e5bfae1e2cfeb7984de946d0b23e1182b0bf15be1d803dfd0'
             '6917cb74e50ae965ea8d7c39577e5f0a5068e4b6a67b53fc6f219149a7d06584'
-            'e24ad879f6b2eb970778fc5e867bcbe0a6d393feca8f11f5cb8d07da1f024be9'
             '94847fc033fd36bc59217c8484d4cf48d0640ff35bb5ca5ffba88a8158c6dd44'
             '9a690bda83c280c0801f6d04353e8a909da80ccfee92e06d200ae6eb9be9a5a8'
             '182b0765d58494978bf27628bada8b42c95ef7eb2671b91ddf9c67608560c662')
@@ -96,14 +92,10 @@ prepare(){
   patch -p1 -i ../sagemath-python3-notebook.patch
 # fix three.js plotting backend
   patch -p1 -i ../sagemath-threejs.patch
-# don't show PARI stack size increase or GLPK warnings during doctesting (Debian)
-  patch -p1 -i ../sagemath-ignore-warnings.patch
 # remove deprecated scipy parameters
   patch -p1 -i ../sagemath-scipy-1.0.patch
 # fix build with Singular 4.1.1
   patch -p1 -i ../sagemath-singular-4.1.1.patch
-# revert usage of development PARI features
-  patch -Rp1 -i ../pari-ratpoints.patch
 # don't force c++98 for lcalc (fixes build with NTL 11)
   patch -p1 -i ../sagemath-lcalc-c++11.patch
 # Adjust paths for gap-4.8
diff --git a/sagemath-ignore-warnings.patch b/sagemath-ignore-warnings.patch
deleted file mode 100644
index c1094d844bc5..000000000000
--- a/sagemath-ignore-warnings.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: Ignore warnings of PARI increasing the stack size when parsing doctests
- Since we can't patch PARI to not produce the warnings and we don't want to
- patch tons of doctests to expect the warnings, we patch the doctest parser
- to ignore them.
-Author: Tobias Hansen <thansen@debian.org>
---- sage/src/sage/doctest/parsing.py
-+++ sage/src/sage/doctest/parsing.py
-@@ -40,6 +40,8 @@
- 
- float_regex = re.compile('\s*([+-]?\s*((\d*\.?\d+)|(\d+\.?))([eE][+-]?\d+)?)')
- optional_regex = re.compile(r'(py2|py3|long time|not implemented|not tested|known bug)|([^ a-z]\s*optional\s*[:-]*((\s|\w)*))')
-+pari_stack_warning_regex = re.compile(r'\s*\*\*\*.*(Warning: increasing stack size to )\d+\.')
-+glpk_simplex_warning_regex = re.compile(r'(Long-step dual simplex will be used)')
- find_sage_prompt = re.compile(r"^(\s*)sage: ", re.M)
- find_sage_continuation = re.compile(r"^(\s*)\.\.\.\.:", re.M)
- random_marker = re.compile('.*random', re.I)
-@@ -935,6 +936,8 @@
-             <type 'float'>
-         """
-         got = self.human_readable_escape_sequences(got)
-+        got = pari_stack_warning_regex.sub('', got)
-+        got = glpk_simplex_warning_regex.sub('', got)
-         if isinstance(want, MarkedOutput):
-             if want.random:
-                 return True