[arch-commits] Commit in singular/trunk (PKGBUILD singular-gcd-Zx.patch)

[Antonio Rojas]

    Date: Wednesday, September 5, 2018 @ 14:44:27
  Author: arojas
Revision: 376936

- Don't enforce c++11, it breaks polymake (FS#59941)
- Fix gcd of polynomials over Z

Added:
  singular/trunk/singular-gcd-Zx.patch
Modified:
  singular/trunk/PKGBUILD

-----------------------+
 PKGBUILD              |   15 ++++++++++++---
 singular-gcd-Zx.patch |   23 +++++++++++++++++++++++
 2 files changed, 35 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-09-05 14:08:28 UTC (rev 376935)
+++ PKGBUILD	2018-09-05 14:44:27 UTC (rev 376936)
@@ -7,7 +7,7 @@
 _patchver=3
 pkgver=${_majver//-/.}.p${_patchver}
 #pkgver=${_majver//-/.}
-pkgrel=2
+pkgrel=3
 pkgdesc="Computer Algebra System for polynomial computations"
 arch=(x86_64)
 url="http://www.singular.uni-kl.de/"
@@ -15,11 +15,18 @@
 depends=(flint cddlib) # polymake
 makedepends=(doxygen python2)
 optdepends=('python2: Python interface')
-source=("http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/$_majver/singular-${_majver//-/.}p${_patchver}.tar.gz")
+source=("http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/$_majver/singular-${_majver//-/.}p${_patchver}.tar.gz"
+        singular-gcd-Zx.patch)
 #source=("http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/$_majver/singular-${_majver//-/.}.tar.gz")
-sha256sums=('551b41060c06878e60119f0283edd09ca7a34d47755fe67d04f5cf9bea4a12e3')
+sha256sums=('551b41060c06878e60119f0283edd09ca7a34d47755fe67d04f5cf9bea4a12e3'
+            '7c868ff33501b47d2dc0eaab5e8a988f36bb79f744d902a4964f2d45cf8cefbf')
 options=(!zipman)
 
+prepare() {
+  cd singular-${_majver//-/.}
+  patch -p1 -i ../singular-gcd-Zx.patch # Fix gcd in Z[x]
+}
+
 build() {
   cd singular-${_majver//-/.}
   ./configure --prefix=/usr --libexecdir=/usr/lib
@@ -32,4 +39,6 @@
 
   # Fix ownership
   chown -R root:root "$pkgdir"/usr/share/singular/html "$pkgdir"/usr/share/info
+  # Don't enforce c++11, it breaks build of polymake
+  sed -e 's/-std=c++11//' -i "$pkgdir"/usr/bin/libsingular-config
 }

Added: singular-gcd-Zx.patch
===================================================================
--- singular-gcd-Zx.patch	                        (rev 0)
+++ singular-gcd-Zx.patch	2018-09-05 14:44:27 UTC (rev 376936)
@@ -0,0 +1,23 @@
+From 55ec4f789df5836f21154a2d6e25c0e9cb8cf814 Mon Sep 17 00:00:00 2001
+From: Hans Schoenemann <hannes at mathematik.uni-kl.de>
+Date: Wed, 1 Aug 2018 15:35:44 +0200
+Subject: [PATCH] fix: tr. #834 (gcd in Z[x])
+
+---
+
+diff --git a/kernel/polys.cc b/kernel/polys.cc
+index 3c66ccd5d2..a7b2f47ec6 100644
+--- a/kernel/polys.cc
++++ b/kernel/polys.cc
+@@ -180,8 +180,9 @@ poly singclap_gcd ( poly f, poly g, const ring r )
+   }
+   else         return f; // g==0 => gcd=f (but do a p_Cleardenom/pNorm)
+   if (f==NULL) return g; // f==0 => gcd=g (but do a p_Cleardenom/pNorm)
+-  if(p_IsConstant(f,currRing)
+-  ||p_IsConstant(g,currRing))
++  if(!rField_is_Ring(currRing)
++  && (p_IsConstant(f,currRing)
++  ||p_IsConstant(g,currRing)))
+   {
+     res=p_One(currRing);
+   }