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

[Antonio Rojas]

    Date: Saturday, June 3, 2017 @ 10:51:11
  Author: arojas
Revision: 233692

Remove workaround for Sage

Modified:
  singular/trunk/PKGBUILD
Deleted:
  singular/trunk/p_invers.patch

----------------+
 PKGBUILD       |   12 +------
 p_invers.patch |   87 -------------------------------------------------------
 2 files changed, 2 insertions(+), 97 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-06-03 10:44:22 UTC (rev 233691)
+++ PKGBUILD	2017-06-03 10:51:11 UTC (rev 233692)
@@ -15,19 +15,11 @@
 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//-/.}p${_patchver}.tar.gz")
 #source=("http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/$_majver/singular-${_majver//-/.}.tar.gz")
-sha256sums=('440164c850d5a1575fcbfe95ab884088d03c0449570d40f465611932ffd0bf80'
-            'dfd3c2d8ab0aeb25157a163cc1c3111476f1b7751f144f9d8f7f3ef7cec11ffd')
+sha256sums=('440164c850d5a1575fcbfe95ab884088d03c0449570d40f465611932ffd0bf80')
 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

Deleted: p_invers.patch
===================================================================
--- p_invers.patch	2017-06-03 10:44:22 UTC (rev 233691)
+++ p_invers.patch	2017-06-03 10:51:11 UTC (rev 233692)
@@ -1,87 +0,0 @@
-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);