[arch-commits] Commit in singular/repos (6 files)
Antonio Rojas
arojas at archlinux.org
Wed Nov 2 19:27:20 UTC 2016
Date: Wednesday, November 2, 2016 @ 19:27:20
Author: arojas
Revision: 194541
archrelease: copy trunk to community-i686, community-x86_64
Added:
singular/repos/community-i686/PKGBUILD
(from rev 194540, singular/trunk/PKGBUILD)
singular/repos/community-i686/revert-86ce458e.patch
(from rev 194540, singular/trunk/revert-86ce458e.patch)
singular/repos/community-x86_64/PKGBUILD
(from rev 194540, singular/trunk/PKGBUILD)
singular/repos/community-x86_64/revert-86ce458e.patch
(from rev 194540, singular/trunk/revert-86ce458e.patch)
Deleted:
singular/repos/community-i686/PKGBUILD
singular/repos/community-x86_64/PKGBUILD
----------------------------------------+
/PKGBUILD | 74 +++++++++++++++++++++++++++++++
community-i686/PKGBUILD | 48 --------------------
community-i686/revert-86ce458e.patch | 71 +++++++++++++++++++++++++++++
community-x86_64/PKGBUILD | 48 --------------------
community-x86_64/revert-86ce458e.patch | 71 +++++++++++++++++++++++++++++
5 files changed, 216 insertions(+), 96 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2016-11-02 19:26:50 UTC (rev 194540)
+++ community-i686/PKGBUILD 2016-11-02 19:27:20 UTC (rev 194541)
@@ -1,48 +0,0 @@
-# $Id$
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-# Contributor: Rémy Oudompheng <oudomphe at clipper.ens.fr>
-
-pkgname=singular
-_majver=4-0-3
-_patchver=4
-pkgver=${_majver//-/.}.p${_patchver}
-pkgrel=3
-pkgdesc="Computer Algebra System for polynomial computations"
-arch=(i686 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-ntl10.patch::"https://github.com/Singular/Sources/commit/861b7899.patch" revert-86ce458e.patch)
-md5sums=('5b5c67b2ff2e8fa12d2fc5afc327e2d8'
- '3dce1e6533a1b4686f9730e0b534df65'
- 'cc5eaa95cf24e5e295917f9ec96dea5e')
-
-prepare() {
- cd singular-${_majver//-/.}
-# Fix build with NTL 10
- patch -p1 -i ../singular-ntl10.patch
-# Revert commit that breaks Sage
- patch -Rlp1 -i ../revert-86ce458e.patch
-}
-
-build() {
- cd singular-${_majver//-/.}
- ./configure --prefix=/usr --libexecdir=/usr/lib
- make
-}
-
-package() {
- cd singular-${_majver//-/.}
- make DESTDIR="$pkgdir" install
-
-# fix permissions
- chown -R root:root "$pkgdir"/usr/share
- chmod 755 "$pkgdir"/usr/share/singular/html
- chmod 644 "$pkgdir"/usr/share/singular/html/*
- chmod 644 "$pkgdir"/usr/share/info/singular.hlp
-# move singular.hlp to the path expected by SageMath
- install -Dm644 "$pkgdir"/usr/share/{info,singular}/singular.hlp
-}
Copied: singular/repos/community-i686/PKGBUILD (from rev 194540, singular/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2016-11-02 19:27:20 UTC (rev 194541)
@@ -0,0 +1,37 @@
+# $Id$
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Contributor: Rémy Oudompheng <oudomphe at clipper.ens.fr>
+
+pkgname=singular
+_majver=4-0-3
+_patchver=5
+pkgver=${_majver//-/.}.p${_patchver}
+pkgrel=1
+pkgdesc="Computer Algebra System for polynomial computations"
+arch=(i686 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")
+md5sums=('3fe62e48076dff1a6137baa287501364')
+
+build() {
+ cd singular-${_majver//-/.}
+ ./configure --prefix=/usr --libexecdir=/usr/lib
+ make
+}
+
+package() {
+ cd singular-${_majver//-/.}
+ make DESTDIR="$pkgdir" install
+
+# fix permissions
+ chown -R root:root "$pkgdir"/usr/share
+ chmod 755 "$pkgdir"/usr/share/singular/html
+ chmod 644 "$pkgdir"/usr/share/singular/html/*
+ chmod 644 "$pkgdir"/usr/share/info/singular.hlp
+# move singular.hlp to the path expected by SageMath
+ install -Dm644 "$pkgdir"/usr/share/{info,singular}/singular.hlp
+}
Copied: singular/repos/community-i686/revert-86ce458e.patch (from rev 194540, singular/trunk/revert-86ce458e.patch)
===================================================================
--- community-i686/revert-86ce458e.patch (rev 0)
+++ community-i686/revert-86ce458e.patch 2016-11-02 19:27:20 UTC (rev 194541)
@@ -0,0 +1,71 @@
+From 86ce458e1269a1d57e682c12b9154dd1f1459354 Mon Sep 17 00:00:00 2001
+From: Hans Schoenemann <hannes at mathematik.uni-kl.de>
+Date: Mon, 5 Sep 2016 19:19:40 +0200
+Subject: [PATCH] change: iiExprArith*Intern do not clean args (iiExprArith*
+ does iti for them)
+
+---
+ Singular/iparith.cc | 15 ---------------
+ 1 file changed, 15 deletions(-)
+
+diff --git a/Singular/iparith.cc b/Singular/iparith.cc
+index 3d43296..5919313 100644
+--- a/Singular/iparith.cc
++++ b/Singular/iparith.cc
+@@ -7959,8 +7959,6 @@ static BOOLEAN iiExprArith2TabIntern(leftv res, leftv a, int op, leftv b,
+ {
+ break;// leave loop, goto error handling
+ }
+- a->CleanUp();
+- b->CleanUp();
+ //Print("op: %d,result typ:%d\n",op,res->rtyp);
+ return FALSE;
+ }
+@@ -8016,8 +8014,6 @@ static BOOLEAN iiExprArith2TabIntern(leftv res, leftv a, int op, leftv b,
+ bn->CleanUp();
+ omFreeBin((ADDRESS)an, sleftv_bin);
+ omFreeBin((ADDRESS)bn, sleftv_bin);
+- a->CleanUp();
+- b->CleanUp();
+ return FALSE;
+ }
+ }
+@@ -8078,8 +8074,6 @@ static BOOLEAN iiExprArith2TabIntern(leftv res, leftv a, int op, leftv b,
+ }
+ res->rtyp = UNKNOWN;
+ }
+- a->CleanUp();
+- b->CleanUp();
+ return TRUE;
+ }
+ BOOLEAN iiExprArith2Tab(leftv res, leftv a, int op,
+@@ -8374,9 +8368,6 @@ static BOOLEAN iiExprArith3TabIntern(leftv res, int op, leftv a, leftv b, leftv
+ {
+ break;// leave loop, goto error handling
+ }
+- a->CleanUp();
+- b->CleanUp();
+- c->CleanUp();
+ return FALSE;
+ }
+ i++;
+@@ -8429,9 +8420,6 @@ static BOOLEAN iiExprArith3TabIntern(leftv res, int op, leftv a, leftv b, leftv
+ omFreeBin((ADDRESS)an, sleftv_bin);
+ omFreeBin((ADDRESS)bn, sleftv_bin);
+ omFreeBin((ADDRESS)cn, sleftv_bin);
+- a->CleanUp();
+- b->CleanUp();
+- c->CleanUp();
+ //Print("op: %d,result typ:%d\n",op,res->rtyp);
+ return FALSE;
+ }
+@@ -8491,9 +8479,6 @@ static BOOLEAN iiExprArith3TabIntern(leftv res, int op, leftv a, leftv b, leftv
+ }
+ res->rtyp = UNKNOWN;
+ }
+- a->CleanUp();
+- b->CleanUp();
+- c->CleanUp();
+ //Print("op: %d,result typ:%d\n",op,res->rtyp);
+ return TRUE;
+ }
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2016-11-02 19:26:50 UTC (rev 194540)
+++ community-x86_64/PKGBUILD 2016-11-02 19:27:20 UTC (rev 194541)
@@ -1,48 +0,0 @@
-# $Id$
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-# Contributor: Rémy Oudompheng <oudomphe at clipper.ens.fr>
-
-pkgname=singular
-_majver=4-0-3
-_patchver=4
-pkgver=${_majver//-/.}.p${_patchver}
-pkgrel=3
-pkgdesc="Computer Algebra System for polynomial computations"
-arch=(i686 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-ntl10.patch::"https://github.com/Singular/Sources/commit/861b7899.patch" revert-86ce458e.patch)
-md5sums=('5b5c67b2ff2e8fa12d2fc5afc327e2d8'
- '3dce1e6533a1b4686f9730e0b534df65'
- 'cc5eaa95cf24e5e295917f9ec96dea5e')
-
-prepare() {
- cd singular-${_majver//-/.}
-# Fix build with NTL 10
- patch -p1 -i ../singular-ntl10.patch
-# Revert commit that breaks Sage
- patch -Rlp1 -i ../revert-86ce458e.patch
-}
-
-build() {
- cd singular-${_majver//-/.}
- ./configure --prefix=/usr --libexecdir=/usr/lib
- make
-}
-
-package() {
- cd singular-${_majver//-/.}
- make DESTDIR="$pkgdir" install
-
-# fix permissions
- chown -R root:root "$pkgdir"/usr/share
- chmod 755 "$pkgdir"/usr/share/singular/html
- chmod 644 "$pkgdir"/usr/share/singular/html/*
- chmod 644 "$pkgdir"/usr/share/info/singular.hlp
-# move singular.hlp to the path expected by SageMath
- install -Dm644 "$pkgdir"/usr/share/{info,singular}/singular.hlp
-}
Copied: singular/repos/community-x86_64/PKGBUILD (from rev 194540, singular/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2016-11-02 19:27:20 UTC (rev 194541)
@@ -0,0 +1,37 @@
+# $Id$
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Contributor: Rémy Oudompheng <oudomphe at clipper.ens.fr>
+
+pkgname=singular
+_majver=4-0-3
+_patchver=5
+pkgver=${_majver//-/.}.p${_patchver}
+pkgrel=1
+pkgdesc="Computer Algebra System for polynomial computations"
+arch=(i686 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")
+md5sums=('3fe62e48076dff1a6137baa287501364')
+
+build() {
+ cd singular-${_majver//-/.}
+ ./configure --prefix=/usr --libexecdir=/usr/lib
+ make
+}
+
+package() {
+ cd singular-${_majver//-/.}
+ make DESTDIR="$pkgdir" install
+
+# fix permissions
+ chown -R root:root "$pkgdir"/usr/share
+ chmod 755 "$pkgdir"/usr/share/singular/html
+ chmod 644 "$pkgdir"/usr/share/singular/html/*
+ chmod 644 "$pkgdir"/usr/share/info/singular.hlp
+# move singular.hlp to the path expected by SageMath
+ install -Dm644 "$pkgdir"/usr/share/{info,singular}/singular.hlp
+}
Copied: singular/repos/community-x86_64/revert-86ce458e.patch (from rev 194540, singular/trunk/revert-86ce458e.patch)
===================================================================
--- community-x86_64/revert-86ce458e.patch (rev 0)
+++ community-x86_64/revert-86ce458e.patch 2016-11-02 19:27:20 UTC (rev 194541)
@@ -0,0 +1,71 @@
+From 86ce458e1269a1d57e682c12b9154dd1f1459354 Mon Sep 17 00:00:00 2001
+From: Hans Schoenemann <hannes at mathematik.uni-kl.de>
+Date: Mon, 5 Sep 2016 19:19:40 +0200
+Subject: [PATCH] change: iiExprArith*Intern do not clean args (iiExprArith*
+ does iti for them)
+
+---
+ Singular/iparith.cc | 15 ---------------
+ 1 file changed, 15 deletions(-)
+
+diff --git a/Singular/iparith.cc b/Singular/iparith.cc
+index 3d43296..5919313 100644
+--- a/Singular/iparith.cc
++++ b/Singular/iparith.cc
+@@ -7959,8 +7959,6 @@ static BOOLEAN iiExprArith2TabIntern(leftv res, leftv a, int op, leftv b,
+ {
+ break;// leave loop, goto error handling
+ }
+- a->CleanUp();
+- b->CleanUp();
+ //Print("op: %d,result typ:%d\n",op,res->rtyp);
+ return FALSE;
+ }
+@@ -8016,8 +8014,6 @@ static BOOLEAN iiExprArith2TabIntern(leftv res, leftv a, int op, leftv b,
+ bn->CleanUp();
+ omFreeBin((ADDRESS)an, sleftv_bin);
+ omFreeBin((ADDRESS)bn, sleftv_bin);
+- a->CleanUp();
+- b->CleanUp();
+ return FALSE;
+ }
+ }
+@@ -8078,8 +8074,6 @@ static BOOLEAN iiExprArith2TabIntern(leftv res, leftv a, int op, leftv b,
+ }
+ res->rtyp = UNKNOWN;
+ }
+- a->CleanUp();
+- b->CleanUp();
+ return TRUE;
+ }
+ BOOLEAN iiExprArith2Tab(leftv res, leftv a, int op,
+@@ -8374,9 +8368,6 @@ static BOOLEAN iiExprArith3TabIntern(leftv res, int op, leftv a, leftv b, leftv
+ {
+ break;// leave loop, goto error handling
+ }
+- a->CleanUp();
+- b->CleanUp();
+- c->CleanUp();
+ return FALSE;
+ }
+ i++;
+@@ -8429,9 +8420,6 @@ static BOOLEAN iiExprArith3TabIntern(leftv res, int op, leftv a, leftv b, leftv
+ omFreeBin((ADDRESS)an, sleftv_bin);
+ omFreeBin((ADDRESS)bn, sleftv_bin);
+ omFreeBin((ADDRESS)cn, sleftv_bin);
+- a->CleanUp();
+- b->CleanUp();
+- c->CleanUp();
+ //Print("op: %d,result typ:%d\n",op,res->rtyp);
+ return FALSE;
+ }
+@@ -8491,9 +8479,6 @@ static BOOLEAN iiExprArith3TabIntern(leftv res, int op, leftv a, leftv b, leftv
+ }
+ res->rtyp = UNKNOWN;
+ }
+- a->CleanUp();
+- b->CleanUp();
+- c->CleanUp();
+ //Print("op: %d,result typ:%d\n",op,res->rtyp);
+ return TRUE;
+ }
More information about the arch-commits
mailing list