[arch-commits] Commit in singular/repos (6 files)
Antonio Rojas
arojas at archlinux.org
Tue Apr 18 20:00:39 UTC 2017
Date: Tuesday, April 18, 2017 @ 20:00:38
Author: arojas
Revision: 223757
archrelease: copy trunk to community-staging-i686, community-staging-x86_64
Added:
singular/repos/community-staging-i686/PKGBUILD
(from rev 223756, singular/trunk/PKGBUILD)
singular/repos/community-staging-i686/p_invers.patch
(from rev 223756, singular/trunk/p_invers.patch)
singular/repos/community-staging-x86_64/PKGBUILD
(from rev 223756, singular/trunk/PKGBUILD)
singular/repos/community-staging-x86_64/p_invers.patch
(from rev 223756, singular/trunk/p_invers.patch)
Deleted:
singular/repos/community-staging-i686/PKGBUILD
singular/repos/community-staging-x86_64/PKGBUILD
-----------------------------------------+
/PKGBUILD | 80 +++++++++++++++++++++++++++
community-staging-i686/PKGBUILD | 32 -----------
community-staging-i686/p_invers.patch | 87 ++++++++++++++++++++++++++++++
community-staging-x86_64/PKGBUILD | 32 -----------
community-staging-x86_64/p_invers.patch | 87 ++++++++++++++++++++++++++++++
5 files changed, 254 insertions(+), 64 deletions(-)
Deleted: community-staging-i686/PKGBUILD
===================================================================
--- community-staging-i686/PKGBUILD 2017-04-18 20:00:05 UTC (rev 223756)
+++ community-staging-i686/PKGBUILD 2017-04-18 20:00:38 UTC (rev 223757)
@@ -1,32 +0,0 @@
-# $Id$
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-# Contributor: Rémy Oudompheng <oudomphe at clipper.ens.fr>
-
-pkgname=singular
-_majver=4-1-0
-_patchver=3
-pkgver=${_majver//-/.}.p${_patchver}
-#pkgver=${_majver//-/.}
-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")
-#source=("http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/$_majver/singular-${_majver//-/.}.tar.gz")
-sha256sums=('440164c850d5a1575fcbfe95ab884088d03c0449570d40f465611932ffd0bf80')
-options=(!zipman)
-
-build() {
- cd singular-${_majver//-/.}
- ./configure --prefix=/usr --libexecdir=/usr/lib
- make
-}
-
-package() {
- cd singular-${_majver//-/.}
- make DESTDIR="$pkgdir" install
-}
Copied: singular/repos/community-staging-i686/PKGBUILD (from rev 223756, singular/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2017-04-18 20:00:38 UTC (rev 223757)
@@ -0,0 +1,40 @@
+# $Id$
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Contributor: Rémy Oudompheng <oudomphe at clipper.ens.fr>
+
+pkgname=singular
+_majver=4-1-0
+_patchver=3
+pkgver=${_majver//-/.}.p${_patchver}
+#pkgver=${_majver//-/.}
+pkgrel=2
+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"
+ p_invers.patch)
+#source=("http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/$_majver/singular-${_majver//-/.}.tar.gz")
+sha256sums=('440164c850d5a1575fcbfe95ab884088d03c0449570d40f465611932ffd0bf80'
+ 'dfd3c2d8ab0aeb25157a163cc1c3111476f1b7751f144f9d8f7f3ef7cec11ffd')
+options=(!zipman)
+
+prepare() {
+ cd singular-${_majver//-/.}
+# Revert removal of symbol needed by Sage
+ patch -Rp1 -i ../p_invers.patch
+}
+
+build() {
+ cd singular-${_majver//-/.}
+ ./configure --prefix=/usr --libexecdir=/usr/lib
+ make
+}
+
+package() {
+ cd singular-${_majver//-/.}
+ make DESTDIR="$pkgdir" install
+}
Copied: singular/repos/community-staging-i686/p_invers.patch (from rev 223756, singular/trunk/p_invers.patch)
===================================================================
--- community-staging-i686/p_invers.patch (rev 0)
+++ community-staging-i686/p_invers.patch 2017-04-18 20:00:38 UTC (rev 223757)
@@ -0,0 +1,87 @@
+From e6c82d85aac825e8a4b87b736cc416a479f19435 Mon Sep 17 00:00:00 2001
+From: Hans Schoenemann <hannes at mathematik.uni-kl.de>
+Date: Thu, 9 Mar 2017 11:58:01 +0100
+Subject: [PATCH] p_Invers is ONLY a helper for p_Series (see jet): now static
+
+---
+ kernel/polys.h | 1 -
+ libpolys/polys/monomials/p_polys.cc | 32 ++++++++++++++++----------------
+ libpolys/polys/monomials/p_polys.h | 3 ---
+ 4 files changed, 17 insertions(+), 20 deletions(-)
+
+diff --git a/kernel/polys.h b/kernel/polys.h
+index 3184f60..c646159 100644
+--- a/kernel/polys.h
++++ b/kernel/polys.h
+@@ -352,7 +352,6 @@ inline void pNorm(poly p, const ring R = currRing){ p_Norm(p, R); }
+ #define pJetW(p,m,iv) p_JetW(p,m,iv,currRing)
+ #define pMinDeg(p,w) p_MinDeg(p,w,currRing)
+ #define pSeries(n,p,u,w) p_Series(n,p,u,w,currRing)
+-#define pInvers(n,p,w) p_Invers(n,p,w,currRing)
+ // maximum weigthed degree of all monomials of p, w is indexed from
+ // 1..pVariables
+
+diff --git a/libpolys/polys/monomials/p_polys.cc b/libpolys/polys/monomials/p_polys.cc
+index ad4ab52..aab0d35 100644
+--- a/libpolys/polys/monomials/p_polys.cc
++++ b/libpolys/polys/monomials/p_polys.cc
+@@ -4313,22 +4313,7 @@ int p_MinDeg(poly p,intvec *w, const ring R)
+ }
+
+ /***************************************************************/
+-
+-poly p_Series(int n,poly p,poly u, intvec *w, const ring R)
+-{
+- short *ww=iv2array(w,R);
+- if(p!=NULL)
+- {
+- if(u==NULL)
+- p=p_JetW(p,n,ww,R);
+- else
+- p=p_JetW(p_Mult_q(p,p_Invers(n-p_MinDeg(p,w,R),u,w,R),R),n,ww,R);
+- }
+- omFreeSize((ADDRESS)ww,(rVar(R)+1)*sizeof(short));
+- return p;
+-}
+-
+-poly p_Invers(int n,poly u,intvec *w, const ring R)
++static poly p_Invers(int n,poly u,intvec *w, const ring R)
+ {
+ if(n<0)
+ return NULL;
+@@ -4356,6 +4341,21 @@ poly p_Invers(int n,poly u,intvec *w, const ring R)
+ return v;
+ }
+
++
++poly p_Series(int n,poly p,poly u, intvec *w, const ring R)
++{
++ short *ww=iv2array(w,R);
++ if(p!=NULL)
++ {
++ if(u==NULL)
++ p=p_JetW(p,n,ww,R);
++ else
++ p=p_JetW(p_Mult_q(p,p_Invers(n-p_MinDeg(p,w,R),u,w,R),R),n,ww,R);
++ }
++ omFreeSize((ADDRESS)ww,(rVar(R)+1)*sizeof(short));
++ return p;
++}
++
+ BOOLEAN p_EqualPolys(poly p1,poly p2, const ring r)
+ {
+ while ((p1 != NULL) && (p2 != NULL))
+diff --git a/libpolys/polys/monomials/p_polys.h b/libpolys/polys/monomials/p_polys.h
+index 498f608..3f201b1 100644
+--- a/libpolys/polys/monomials/p_polys.h
++++ b/libpolys/polys/monomials/p_polys.h
+@@ -2008,9 +2008,6 @@ poly p_PermPoly (poly p, const int * perm,const ring OldRing, const ring dst,
+
+ /*----------------------------------------------------*/
+ poly p_Series(int n,poly p,poly u, intvec *w, const ring R);
+-poly p_Invers(int n,poly u,intvec *w, const ring R);
+-
+-
+
+ /*----------------------------------------------------*/
+ int p_Var(poly mi, const ring r);
Deleted: community-staging-x86_64/PKGBUILD
===================================================================
--- community-staging-x86_64/PKGBUILD 2017-04-18 20:00:05 UTC (rev 223756)
+++ community-staging-x86_64/PKGBUILD 2017-04-18 20:00:38 UTC (rev 223757)
@@ -1,32 +0,0 @@
-# $Id$
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-# Contributor: Rémy Oudompheng <oudomphe at clipper.ens.fr>
-
-pkgname=singular
-_majver=4-1-0
-_patchver=3
-pkgver=${_majver//-/.}.p${_patchver}
-#pkgver=${_majver//-/.}
-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")
-#source=("http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/$_majver/singular-${_majver//-/.}.tar.gz")
-sha256sums=('440164c850d5a1575fcbfe95ab884088d03c0449570d40f465611932ffd0bf80')
-options=(!zipman)
-
-build() {
- cd singular-${_majver//-/.}
- ./configure --prefix=/usr --libexecdir=/usr/lib
- make
-}
-
-package() {
- cd singular-${_majver//-/.}
- make DESTDIR="$pkgdir" install
-}
Copied: singular/repos/community-staging-x86_64/PKGBUILD (from rev 223756, singular/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2017-04-18 20:00:38 UTC (rev 223757)
@@ -0,0 +1,40 @@
+# $Id$
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Contributor: Rémy Oudompheng <oudomphe at clipper.ens.fr>
+
+pkgname=singular
+_majver=4-1-0
+_patchver=3
+pkgver=${_majver//-/.}.p${_patchver}
+#pkgver=${_majver//-/.}
+pkgrel=2
+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"
+ p_invers.patch)
+#source=("http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/$_majver/singular-${_majver//-/.}.tar.gz")
+sha256sums=('440164c850d5a1575fcbfe95ab884088d03c0449570d40f465611932ffd0bf80'
+ 'dfd3c2d8ab0aeb25157a163cc1c3111476f1b7751f144f9d8f7f3ef7cec11ffd')
+options=(!zipman)
+
+prepare() {
+ cd singular-${_majver//-/.}
+# Revert removal of symbol needed by Sage
+ patch -Rp1 -i ../p_invers.patch
+}
+
+build() {
+ cd singular-${_majver//-/.}
+ ./configure --prefix=/usr --libexecdir=/usr/lib
+ make
+}
+
+package() {
+ cd singular-${_majver//-/.}
+ make DESTDIR="$pkgdir" install
+}
Copied: singular/repos/community-staging-x86_64/p_invers.patch (from rev 223756, singular/trunk/p_invers.patch)
===================================================================
--- community-staging-x86_64/p_invers.patch (rev 0)
+++ community-staging-x86_64/p_invers.patch 2017-04-18 20:00:38 UTC (rev 223757)
@@ -0,0 +1,87 @@
+From e6c82d85aac825e8a4b87b736cc416a479f19435 Mon Sep 17 00:00:00 2001
+From: Hans Schoenemann <hannes at mathematik.uni-kl.de>
+Date: Thu, 9 Mar 2017 11:58:01 +0100
+Subject: [PATCH] p_Invers is ONLY a helper for p_Series (see jet): now static
+
+---
+ kernel/polys.h | 1 -
+ libpolys/polys/monomials/p_polys.cc | 32 ++++++++++++++++----------------
+ libpolys/polys/monomials/p_polys.h | 3 ---
+ 4 files changed, 17 insertions(+), 20 deletions(-)
+
+diff --git a/kernel/polys.h b/kernel/polys.h
+index 3184f60..c646159 100644
+--- a/kernel/polys.h
++++ b/kernel/polys.h
+@@ -352,7 +352,6 @@ inline void pNorm(poly p, const ring R = currRing){ p_Norm(p, R); }
+ #define pJetW(p,m,iv) p_JetW(p,m,iv,currRing)
+ #define pMinDeg(p,w) p_MinDeg(p,w,currRing)
+ #define pSeries(n,p,u,w) p_Series(n,p,u,w,currRing)
+-#define pInvers(n,p,w) p_Invers(n,p,w,currRing)
+ // maximum weigthed degree of all monomials of p, w is indexed from
+ // 1..pVariables
+
+diff --git a/libpolys/polys/monomials/p_polys.cc b/libpolys/polys/monomials/p_polys.cc
+index ad4ab52..aab0d35 100644
+--- a/libpolys/polys/monomials/p_polys.cc
++++ b/libpolys/polys/monomials/p_polys.cc
+@@ -4313,22 +4313,7 @@ int p_MinDeg(poly p,intvec *w, const ring R)
+ }
+
+ /***************************************************************/
+-
+-poly p_Series(int n,poly p,poly u, intvec *w, const ring R)
+-{
+- short *ww=iv2array(w,R);
+- if(p!=NULL)
+- {
+- if(u==NULL)
+- p=p_JetW(p,n,ww,R);
+- else
+- p=p_JetW(p_Mult_q(p,p_Invers(n-p_MinDeg(p,w,R),u,w,R),R),n,ww,R);
+- }
+- omFreeSize((ADDRESS)ww,(rVar(R)+1)*sizeof(short));
+- return p;
+-}
+-
+-poly p_Invers(int n,poly u,intvec *w, const ring R)
++static poly p_Invers(int n,poly u,intvec *w, const ring R)
+ {
+ if(n<0)
+ return NULL;
+@@ -4356,6 +4341,21 @@ poly p_Invers(int n,poly u,intvec *w, const ring R)
+ return v;
+ }
+
++
++poly p_Series(int n,poly p,poly u, intvec *w, const ring R)
++{
++ short *ww=iv2array(w,R);
++ if(p!=NULL)
++ {
++ if(u==NULL)
++ p=p_JetW(p,n,ww,R);
++ else
++ p=p_JetW(p_Mult_q(p,p_Invers(n-p_MinDeg(p,w,R),u,w,R),R),n,ww,R);
++ }
++ omFreeSize((ADDRESS)ww,(rVar(R)+1)*sizeof(short));
++ return p;
++}
++
+ BOOLEAN p_EqualPolys(poly p1,poly p2, const ring r)
+ {
+ while ((p1 != NULL) && (p2 != NULL))
+diff --git a/libpolys/polys/monomials/p_polys.h b/libpolys/polys/monomials/p_polys.h
+index 498f608..3f201b1 100644
+--- a/libpolys/polys/monomials/p_polys.h
++++ b/libpolys/polys/monomials/p_polys.h
+@@ -2008,9 +2008,6 @@ poly p_PermPoly (poly p, const int * perm,const ring OldRing, const ring dst,
+
+ /*----------------------------------------------------*/
+ poly p_Series(int n,poly p,poly u, intvec *w, const ring R);
+-poly p_Invers(int n,poly u,intvec *w, const ring R);
+-
+-
+
+ /*----------------------------------------------------*/
+ int p_Var(poly mi, const ring r);
More information about the arch-commits
mailing list