Rebase patches

1 files changed, 4 insertions, 8 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 29c014c7dcaa..5aba9d7bb1d7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
 
 pkgbase=sagemath-git
 pkgname=(sagemath-git sagemath-jupyter-git)
-pkgver=8.7.beta0.r0.g5389d8dc87
+pkgver=8.7.beta1.r0.g0cb494282d
 pkgrel=1
 pkgdesc="Open Source Mathematics Software, free alternative to Magma, Maple, Mathematica, and Matlab"
 arch=(x86_64)
@@ -46,8 +46,7 @@ source=(git://git.sagemath.org/sage.git#branch=develop
         sagemath-sphinx-1.8.patch
         sagemath-cypari2.patch
         sagemath-singular-4.1.1.p4.patch
-        sagemath-ecl-sigfpe.patch
-        sagemath-numpy-1.16.patch)
+        sagemath-ecl-sigfpe.patch)
 sha256sums=('SKIP'
             'de6e38462ef1848778fbc23a63529fbee9229dbb245bb653f58a0d834a634c04'
             '960afe4fcbffe2762b66119b8f14355386ced0d8ee52b535d0dac1dba90d365b'
@@ -58,10 +57,9 @@ sha256sums=('SKIP'
             'f6b48abf34f64ea3fc092b0f0179e89633f7d3ecc0d62c2acacbfa1217751d63'
             '4c6df9e4e5a7b29ecf6189eda3e5a79f69b6e1b4d29c1b9559663149b8c0af96'
             '22f5e44a42c8276025b8512f45cac1c36d576c29c7fd9d36fde8b19ff87867d8'
-            'ca47248d2ed5edfe663ea02e261ddbb26a7cb03bef67928dbec690d9b9a8f129'
+            '9e49c7c1820ff952daf52658270aa8e404f949f1a15aee90355f78a07c6a89fe'
             '482887fe43d89cef3270e89300ab9e2238fa74cd5b7c875688b68fb1b10c4fdf'
-            'a42f3b152b1aedb8abf16bc70971419919d1fe30328574e7fef8305f9d07d938'
-            'd483b1dc78eb83e3cd1620e3d44214ca0704065e1d27d7a257976e56c85f2d5b')
+            'a42f3b152b1aedb8abf16bc70971419919d1fe30328574e7fef8305f9d07d938')
 
 pkgver() {
   cd sage
@@ -98,8 +96,6 @@ prepare(){
   patch -p1 -i ../sagemath-singular-4.1.1.p4.patch
 # Fix SIGFPE crashes with ecl 16.1.3 https://trac.sagemath.org/ticket/22191
   patch -p1 -i ../sagemath-ecl-sigfpe.patch
-# Fix inline fortran with numpy 1.16 https://trac.sagemath.org/ticket/27061
-  patch -p1 -i ../sagemath-numpy-1.16.patch
 
 # use python2
   sed -e 's|sage-python23|python2|' -e 's|#!/usr/bin/env python\b|#!/usr/bin/env python2|' -i src/bin/*