Date: Wednesday, September 5, 2018 @ 14:44:57 Author: arojas Revision: 376937
archrelease: copy trunk to community-x86_64 Added: singular/repos/community-x86_64/PKGBUILD (from rev 376936, singular/trunk/PKGBUILD) singular/repos/community-x86_64/singular-gcd-Zx.patch (from rev 376936, singular/trunk/singular-gcd-Zx.patch) Deleted: singular/repos/community-x86_64/PKGBUILD -----------------------+ PKGBUILD | 79 ++++++++++++++++++++++++++---------------------- singular-gcd-Zx.patch | 23 +++++++++++++ 2 files changed, 67 insertions(+), 35 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2018-09-05 14:44:27 UTC (rev 376936) +++ PKGBUILD 2018-09-05 14:44:57 UTC (rev 376937) @@ -1,35 +0,0 @@ -# $Id$ -# Maintainer: Antonio Rojas <aro...@archlinux.org> -# Contributor: Rémy Oudompheng <oudom...@clipper.ens.fr> - -pkgname=singular -_majver=4-1-1 -_patchver=3 -pkgver=${_majver//-/.}.p${_patchver} -#pkgver=${_majver//-/.} -pkgrel=2 -pkgdesc="Computer Algebra System for polynomial computations" -arch=(x86_64) -url="http://www.singular.uni-kl.de/" -license=(GPL) -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//-/.}.tar.gz") -sha256sums=('551b41060c06878e60119f0283edd09ca7a34d47755fe67d04f5cf9bea4a12e3') -options=(!zipman) - -build() { - cd singular-${_majver//-/.} - ./configure --prefix=/usr --libexecdir=/usr/lib - make -} - -package() { - cd singular-${_majver//-/.} - make DESTDIR="$pkgdir" install - - # Fix ownership - chown -R root:root "$pkgdir"/usr/share/singular/html "$pkgdir"/usr/share/info -} Copied: singular/repos/community-x86_64/PKGBUILD (from rev 376936, singular/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2018-09-05 14:44:57 UTC (rev 376937) @@ -0,0 +1,44 @@ +# $Id$ +# Maintainer: Antonio Rojas <aro...@archlinux.org> +# Contributor: Rémy Oudompheng <oudom...@clipper.ens.fr> + +pkgname=singular +_majver=4-1-1 +_patchver=3 +pkgver=${_majver//-/.}.p${_patchver} +#pkgver=${_majver//-/.} +pkgrel=3 +pkgdesc="Computer Algebra System for polynomial computations" +arch=(x86_64) +url="http://www.singular.uni-kl.de/" +license=(GPL) +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" + singular-gcd-Zx.patch) +#source=("http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/$_majver/singular-${_majver//-/.}.tar.gz") +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 + make +} + +package() { + cd singular-${_majver//-/.} + make DESTDIR="$pkgdir" install + + # 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 +} Copied: singular/repos/community-x86_64/singular-gcd-Zx.patch (from rev 376936, singular/trunk/singular-gcd-Zx.patch) =================================================================== --- singular-gcd-Zx.patch (rev 0) +++ singular-gcd-Zx.patch 2018-09-05 14:44:57 UTC (rev 376937) @@ -0,0 +1,23 @@ +From 55ec4f789df5836f21154a2d6e25c0e9cb8cf814 Mon Sep 17 00:00:00 2001 +From: Hans Schoenemann <han...@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); + }