Drop merged patch

5 files changed, 8 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5e1f167939da..f07f042f3305 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 = 8.5.beta2.r0.g0082a23a2e
+	pkgver = 8.5.beta5.r0.gb36eca1990
 	pkgrel = 1
 	url = http://www.sagemath.org
 	arch = x86_64
@@ -105,7 +105,6 @@ pkgbase = sagemath-git
 	source = fes02.patch
 	source = sagemath-threejs.patch
 	source = sagemath-cremona.patch
-	source = sagemath-lcalc-c++11.patch
 	source = sagemath-gap-4.8.patch
 	source = sagemath-sphinx-1.8.patch
 	source = sagemath-networkx-2.2.patch
@@ -118,10 +117,9 @@ pkgbase = sagemath-git
 	sha256sums = 769fd5a9c377be61de41e1e30004dadb23818da901cceb6e1bece7712ba7cb83
 	sha256sums = 3a0ebda1df708f263be830751cc5ddb430ca1f685b25b08d4b6592b65b123ebe
 	sha256sums = 7fcb52e96935dccb0f958d37c2f4e3918392480b9af53e08562f6cba6c68cb94
-	sha256sums = 4722f9257f7b58a5dc8be2e9163ebba6d7b3ee011ff1ab9c0dbfb1330d367261
+	sha256sums = f6b48abf34f64ea3fc092b0f0179e89633f7d3ecc0d62c2acacbfa1217751d63
 	sha256sums = 7efb38ba511037feb3abbd88576323320555ba50235ddc7e3d423ca294dd42ed
-	sha256sums = 5114c912f821900e5bfae1e2cfeb7984de946d0b23e1182b0bf15be1d803dfd0
-	sha256sums = 7304d6242bf0e8241d3d83b772d92f00f905c425b894d36a25c264edca279986
+	sha256sums = 79bce829e2ba3050e14cf66f8d4346852cd02febf937575eec53b885163d5a10
 	sha256sums = 7dd2ab94fddda8e7c2cdd5250642c4cdd00b7702815d88762fbcd68416bacaee
 	sha256sums = a011fac2db31c3076fb8fc59e959fd9a9dc785ad3897f4fe3b3bd00b466cde83
 	sha256sums = d1af7916e21d0a4de7b3ab5d4054c6b3175b84551ea6639a2680e6102c0b990b
diff --git a/PKGBUILD b/PKGBUILD
index fd01abeaf6b9..c955533b4f72 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
 
 pkgbase=sagemath-git
 pkgname=(sagemath-git sagemath-jupyter-git)
-pkgver=8.5.beta2.r0.g0082a23a2e
+pkgver=8.5.beta5.r0.gb36eca1990
 pkgrel=1
 pkgdesc="Open Source Mathematics Software, free alternative to Magma, Maple, Mathematica, and Matlab"
 arch=(x86_64)
@@ -43,7 +43,6 @@ source=(git://git.sagemath.org/sage.git#branch=develop
         fes02.patch
         sagemath-threejs.patch
         sagemath-cremona.patch
-        sagemath-lcalc-c++11.patch
         sagemath-gap-4.8.patch
         sagemath-sphinx-1.8.patch
         sagemath-networkx-2.2.patch
@@ -56,10 +55,9 @@ sha256sums=('SKIP'
             '769fd5a9c377be61de41e1e30004dadb23818da901cceb6e1bece7712ba7cb83'
             '3a0ebda1df708f263be830751cc5ddb430ca1f685b25b08d4b6592b65b123ebe'
             '7fcb52e96935dccb0f958d37c2f4e3918392480b9af53e08562f6cba6c68cb94'
-            '4722f9257f7b58a5dc8be2e9163ebba6d7b3ee011ff1ab9c0dbfb1330d367261'
+            'f6b48abf34f64ea3fc092b0f0179e89633f7d3ecc0d62c2acacbfa1217751d63'
             '7efb38ba511037feb3abbd88576323320555ba50235ddc7e3d423ca294dd42ed'
-            '5114c912f821900e5bfae1e2cfeb7984de946d0b23e1182b0bf15be1d803dfd0'
-            '7304d6242bf0e8241d3d83b772d92f00f905c425b894d36a25c264edca279986'
+            '79bce829e2ba3050e14cf66f8d4346852cd02febf937575eec53b885163d5a10'
             '7dd2ab94fddda8e7c2cdd5250642c4cdd00b7702815d88762fbcd68416bacaee'
             'a011fac2db31c3076fb8fc59e959fd9a9dc785ad3897f4fe3b3bd00b466cde83'
             'd1af7916e21d0a4de7b3ab5d4054c6b3175b84551ea6639a2680e6102c0b990b'
@@ -86,8 +84,6 @@ prepare(){
   patch -p1 -i ../sagemath-python3-notebook.patch
 # fix three.js plotting backend
   patch -p1 -i ../sagemath-threejs.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
   patch -p1 -i ../sagemath-gap-4.8.patch
 # fix introspection with sphinx 1.8
diff --git a/sagemath-gap-4.8.patch b/sagemath-gap-4.8.patch
index 6d0922457f8c..64d6b28ea38b 100644
--- a/sagemath-gap-4.8.patch
+++ b/sagemath-gap-4.8.patch
@@ -21,6 +21,6 @@ index 7bffcfc00d..51dad178d5 100644
      print('The gap-4.5.5.spkg (or later) seems to be not installed!')
 -    gap_sh = open(os.path.join(SAGE_LOCAL, 'bin', 'gap')).read().splitlines()
 +    gap_sh = open(os.path.join(SAGE_LOCAL, 'bin', 'gap-4.8')).read().splitlines()
-     gapdir = filter(lambda dir:dir.strip().startswith('GAP_DIR'), gap_sh)[0]
+     gapdir = next(dir for dir in gap_sh if dir.strip().startswith('GAP_DIR'))
      gapdir = gapdir.split('"')[1]
      gapdir = gapdir.replace('$SAGE_LOCAL', SAGE_LOCAL)
diff --git a/sagemath-lcalc-c++11.patch b/sagemath-lcalc-c++11.patch
deleted file mode 100644
index adc10f4a34bb..000000000000
--- a/sagemath-lcalc-c++11.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/sage/libs/lcalc/lcalc_Lfunction.pxd
-+++ b/src/sage/libs/lcalc/lcalc_Lfunction.pxd
-@@ -1,6 +1,5 @@
- # Lcalc requires GNU extensions, it does not strictly conform to any
- # C++ standard: https://trac.sagemath.org/ticket/23341
--# distutils: extra_compile_args = -std=gnu++98
- 
- cdef extern from "lcalc_sage.h":
-     ctypedef struct doublevec "std::vector<double>":
-
diff --git a/sagemath-threejs.patch b/sagemath-threejs.patch
index 09cb92790e0a..a3de32684319 100644
--- a/sagemath-threejs.patch
+++ b/sagemath-threejs.patch
@@ -5,7 +5,7 @@
          if online:
              from sage.misc.package import installed_packages
 -            version = installed_packages()['threejs'].split('.')[0]
-+            version = 'r95'
++            version = 'r80'
              return """
  <script src="https://cdn.rawgit.com/mrdoob/three.js/{0}/build/three.min.js"></script>
  <script src="https://cdn.rawgit.com/mrdoob/three.js/{0}/examples/js/controls/OrbitControls.js"></script>