Patch was merged upstream

3 files changed, 2 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 47451c935275..fe21ba4ddcf1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -32,8 +32,6 @@ pkgbase = macaulay2
 	depends = gtest
 	depends = givaro
 	source = git+https://github.com/Macaulay2/M2
-	source = pr2536.patch
 	sha256sums = SKIP
-	sha256sums = 90867bff358bc879cb447c62a54e9a71892a0fa3fe3aac1611703722fae10931
 
 pkgname = macaulay2
diff --git a/PKGBUILD b/PKGBUILD
index 8d19ec5514e8..fa24e89d59df 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@ url="http://www.math.uiuc.edu/Macaulay2/"
 license=('GPL')
 depends=('gcc-fortran' 'readline' 'gdbm' 'gc' 'mpir' 'mpfr' 'mpsolve-git' 'boost' 'lapack' 'cblas' 'eigen' 'ntl' 'scscp' 'singular-factory' 'frobby' 'flint' 'cddlib' 'glpk' 'gfan' 'gtest' 'givaro')
 makedepends=('git' 'unzip' 'emacs' 'texinfo')
-source=('git+https://github.com/Macaulay2/M2' 'pr2536.patch')
+source=('git+https://github.com/Macaulay2/M2')
 
 pkgver() {
   cd "${srcdir}"/M2
@@ -19,7 +19,6 @@ pkgver() {
 
 build() {
   cd "$srcdir"/M2
-  patch -Np1 -i ../pr2536.patch
   cd M2
 
   # Some provided examples will make M2 crash if the -q option is used.
@@ -52,4 +51,4 @@ package() {
   mkdir info
   mv info-mac info/Macaulay2
 }
-sha256sums=('SKIP' '90867bff358bc879cb447c62a54e9a71892a0fa3fe3aac1611703722fae10931')
+sha256sums=('SKIP')
diff --git a/pr2536.patch b/pr2536.patch
deleted file mode 100644
index 5b0690f106df..000000000000
--- a/pr2536.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/M2/Macaulay2/e/monoid.cpp b/M2/Macaulay2/e/monoid.cpp
-index fd53b942e3..0459ed4944 100644
---- a/M2/Macaulay2/e/monoid.cpp
-+++ b/M2/Macaulay2/e/monoid.cpp
-@@ -225,7 +225,13 @@ void Monoid::set_degrees()
-       }
-   else
-     {
--      for (int i = 0; i < nvars_; i++) heft_degree_of_var_->array[i] = 1;
-+      for (int i = 0; i < nvars_; i++)
-+        {
-+          monomial m = degree_monoid_->make_one();
-+          degree_monoid_->from_expvector(t, m);
-+          degree_of_var_.push_back(m);
-+          heft_degree_of_var_->array[i] = 1;
-+        }
-     }
-   degree_of_var_.push_back(degree_monoid_->make_one());
- }