Sync with stable

7 files changed, 129 insertions, 204 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ee412b70d4c4..43f2bd0a64f5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = sagemath-git
 	pkgdesc = Open Source Mathematics Software, free alternative to Magma, Maple, Mathematica, and Matlab
-	pkgver = 7.6.beta5.r0.g36bcfa606a
+	pkgver = 8.0.beta0.r0.g8725c635c3
 	pkgrel = 1
 	url = http://www.sagemath.org
 	arch = i686
@@ -86,6 +86,7 @@ pkgbase = sagemath-git
 	optdepends = libbraiding: for computing in braid groups
 	optdepends = libfes: exhaustive search of solutions for boolean equations
 	optdepends = python2-pynormaliz: Normaliz backend for polyhedral computations
+	optdepends = latte-integrale: integral point count in polyhedra
 	optdepends = three.js: alternative 3D plots engine
 	optdepends = tachyon: alternative 3D plots engine
 	source = git://git.sagemath.org/sage.git#branch=develop
@@ -94,28 +95,26 @@ pkgbase = sagemath-git
 	source = cython-sys-path.patch
 	source = is-package-installed.patch
 	source = package.patch
+	source = latte-count.patch
 	source = jupyter-path.patch
+	source = sagemath-python3-notebook.patch
 	source = test-optional.patch
 	source = ecm-7.patch
-	source = increase-rtol.patch
 	source = r-no-readline.patch
-	source = sagemath-planarity3.patch
 	source = fes02.patch
-	source = sagemath-singular-4.1.0.p2.patch
 	sha256sums = SKIP
 	sha256sums = 9dba04ff13626a7b6c338a8b18a6c27d343f68a547a218533cf773af3dae6635
 	sha256sums = 178074c0a22da4a8129ec299a6845aaae8cf3ef1da6f62b34f2ec0ed50c1e6a2
 	sha256sums = ff7e034d08ab084fdb193484f7fe3a659ebcd8ab33a2b7177237d65b26de7872
 	sha256sums = d60fb0fbd27991ce9496ca035a54b03334b5b53f244227a8d6e13f3327ce75d2
 	sha256sums = 4a2297e4d9d28f0b3a1f58e1b463e332affcb109eafde44837b1657e309c8212
+	sha256sums = b816c71d345fb1188c3faa01c4e75cfa04ba6506080231d5d2c303a2288e9b50
 	sha256sums = 889b65598d2a15e73eb482f543ec9b28d8992eeb57b07883c2e9627dfee15a9b
+	sha256sums = 27aa73d427d92aeb2c181a233aa3a574a4158cd7dee33832808f69edaec55ea2
 	sha256sums = 81d08c6a760f171f3381455b66a6c84789c9f0eefddbe6ca5794075514ad8c3a
 	sha256sums = 06bc1e5b409e21d49fc71ef03e96ec35b7a9b524bfd1f81a2dbf5c64a55e5acf
-	sha256sums = 1c068c524a2926ba222b36b0f4229a45c6f00c2225ffde0b0555e4e9659342d5
 	sha256sums = ef9f401fa84fe1772af9efee6816643534f2896da4c23b809937b19771bdfbbf
-	sha256sums = a1c562ebe4538d672404ca3ac2e954a3c955afeb7463f7b4fe6eaa6fa74fe5c7
 	sha256sums = a39da083c038ada797ffc5bedc9ba47455a3f77057d42f86484ae877ef9172ea
-	sha256sums = e1912afec58b834fac3b9161c2d5a1794bb618126c6bd7a4be85c834231360e7
 
 pkgname = sagemath-git
 	optdepends = cython2: to compile cython code
@@ -140,6 +139,7 @@ pkgname = sagemath-git
 	optdepends = libbraiding: for computing in braid groups
 	optdepends = libfes: exhaustive search of solutions for boolean equations
 	optdepends = python2-pynormaliz: Normaliz backend for polyhedral computations
+	optdepends = latte-integrale: integral point count in polyhedra
 	optdepends = three.js: alternative 3D plots engine
 	optdepends = tachyon: alternative 3D plots engine
 	optdepends = sagemath-jupyter: Jupyter kernel
diff --git a/PKGBUILD b/PKGBUILD
index 3572de1267ab..b3a4253c179a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@
 
 pkgbase=sagemath-git
 pkgname=(sagemath-git sagemath-jupyter-git)
-pkgver=7.6.beta5.r0.g36bcfa606a
+pkgver=8.0.beta0.r0.g8725c635c3
 pkgrel=1
 pkgdesc="Open Source Mathematics Software, free alternative to Magma, Maple, Mathematica, and Matlab"
 arch=(i686 x86_64)
@@ -28,27 +28,26 @@ optdepends=('cython2: to compile cython code' 'python2-pkgconfig: to compile cyt
   'lrs: Algorithms for linear reverse search used in game theory and for computing volume of polytopes'
   'libhomfly: for computing the homfly polynomial of links' 'libbraiding: for computing in braid groups'
   'libfes: exhaustive search of solutions for boolean equations' 'python2-pynormaliz: Normaliz backend for polyhedral computations'
+  'latte-integrale: integral point count in polyhedra'
   'three.js: alternative 3D plots engine' 'tachyon: alternative 3D plots engine')
 makedepends=(cython2 boost ratpoints symmetrica python2-jinja coin-or-cbc libhomfly libbraiding
   mcqd coxeter3 cryptominisat2 modular_decomposition bliss-graphs tdlib python2-pkgconfig meataxe libfes git)
 source=("git://git.sagemath.org/sage.git#branch=develop" 
-        env.patch skip-check.patch cython-sys-path.patch is-package-installed.patch package.patch
-        jupyter-path.patch test-optional.patch ecm-7.patch increase-rtol.patch r-no-readline.patch
-        sagemath-planarity3.patch fes02.patch sagemath-singular-4.1.0.p2.patch)
+        env.patch skip-check.patch cython-sys-path.patch is-package-installed.patch package.patch latte-count.patch
+        jupyter-path.patch sagemath-python3-notebook.patch test-optional.patch ecm-7.patch r-no-readline.patch fes02.patch)
 sha256sums=('SKIP'
             '9dba04ff13626a7b6c338a8b18a6c27d343f68a547a218533cf773af3dae6635'
             '178074c0a22da4a8129ec299a6845aaae8cf3ef1da6f62b34f2ec0ed50c1e6a2'
             'ff7e034d08ab084fdb193484f7fe3a659ebcd8ab33a2b7177237d65b26de7872'
             'd60fb0fbd27991ce9496ca035a54b03334b5b53f244227a8d6e13f3327ce75d2'
             '4a2297e4d9d28f0b3a1f58e1b463e332affcb109eafde44837b1657e309c8212'
+            'b816c71d345fb1188c3faa01c4e75cfa04ba6506080231d5d2c303a2288e9b50'
             '889b65598d2a15e73eb482f543ec9b28d8992eeb57b07883c2e9627dfee15a9b'
+            '27aa73d427d92aeb2c181a233aa3a574a4158cd7dee33832808f69edaec55ea2'
             '81d08c6a760f171f3381455b66a6c84789c9f0eefddbe6ca5794075514ad8c3a'
             '06bc1e5b409e21d49fc71ef03e96ec35b7a9b524bfd1f81a2dbf5c64a55e5acf'
-            '1c068c524a2926ba222b36b0f4229a45c6f00c2225ffde0b0555e4e9659342d5'
             'ef9f401fa84fe1772af9efee6816643534f2896da4c23b809937b19771bdfbbf'
-            'a1c562ebe4538d672404ca3ac2e954a3c955afeb7463f7b4fe6eaa6fa74fe5c7'
-            'a39da083c038ada797ffc5bedc9ba47455a3f77057d42f86484ae877ef9172ea'
-            'e1912afec58b834fac3b9161c2d5a1794bb618126c6bd7a4be85c834231360e7')
+            'a39da083c038ada797ffc5bedc9ba47455a3f77057d42f86484ae877ef9172ea')
 
 pkgver() {
   cd sage
@@ -73,14 +72,12 @@ prepare(){
   patch -p1 -i ../cython-sys-path.patch
 # fix regressions with ECM 7
   patch -p1 -i ../ecm-7.patch
-# increase numerical tolerance, needed by scipy 0.18
-  patch -p1 -i ../increase-rtol.patch
 # fix freezes in R interface with readline 7 (Debian)
   patch -p1 -i ../r-no-readline.patch
-# fix build with planarity 3 (Debian)
-  patch -p2 -i ../sagemath-planarity3.patch
-# fix build with Singular 4.1.0-p2
-  patch -p0 -i ../sagemath-singular-4.1.0.p2.patch
+# use correct latte-count binary name
+  patch -p1 -i ../latte-count.patch
+# make 'sage -notebook=jupyter' work with our python3 jupyter-notebook package
+  patch -p1 -i ../sagemath-python3-notebook.patch
 
 # Upstream patches  
 # fix build against libfes 0.2 http://trac.sagemath.org/ticket/15209
diff --git a/increase-rtol.patch b/increase-rtol.patch
deleted file mode 100644
index 96ed6f1c2be8..000000000000
--- a/increase-rtol.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -ru sage-7.3.orig/src/sage/coding/code_bounds.py sage-7.3/src/sage/coding/code_bounds.py
---- sage-7.3.orig/src/sage/coding/code_bounds.py        2016-08-05 20:26:10.033204091 +0200
-+++ sage-7.3/src/sage/coding/code_bounds.py     2016-08-05 20:32:27.276579565 +0200
-@@ -536,7 +536,7 @@
-     if q < 2:   # Here we check that q is actually at least 2
-         raise ValueError("The value q must be an integer greater than 1")
- 
--    eps  = 4.5e-16 # find_root has about this as the default xtol
-+    eps  = 4.5e-15 # find_root has about this as the default xtol
-     ymax = 1 - 1/q
-     if x <= eps:
-         return 0
-diff -ru sage-7.3.orig/src/sage/numerical/optimize.py sage-7.3/src/sage/numerical/optimize.py
---- sage-7.3.orig/src/sage/numerical/optimize.py        2016-08-05 20:26:10.816536625 +0200
-+++ sage-7.3/src/sage/numerical/optimize.py     2016-08-05 20:32:21.449907130 +0200
-@@ -16,7 +16,7 @@
- from sage.rings.real_double import RDF
- 
- 
--def find_root(f, a, b, xtol=10e-13, rtol=4.5e-16, maxiter=100, full_output=False):
-+def find_root(f, a, b, xtol=10e-13, rtol=4.5e-15, maxiter=100, full_output=False):
-     """
-     Numerically find a root of ``f`` on the closed interval `[a,b]`
-     (or `[b,a]`) if possible, where ``f`` is a function in the one variable.
-diff -ru sage-7.3.orig/src/sage/symbolic/expression.pyx sage-7.3/src/sage/symbolic/expression.pyx
---- sage-7.3.orig/src/sage/symbolic/expression.pyx      2016-08-05 20:26:11.333202767 +0200
-+++ sage-7.3/src/sage/symbolic/expression.pyx   2016-08-05 20:32:14.236566826 +0200
-@@ -10952,7 +10952,7 @@
-             ret = ret[0]
-         return ret
- 
--    def find_root(self, a, b, var=None, xtol=10e-13, rtol=4.5e-16, maxiter=100, full_output=False):
-+    def find_root(self, a, b, var=None, xtol=10e-13, rtol=4.5e-15, maxiter=100, full_output=False):
-         """
-         Numerically find a root of self on the closed interval [a,b] (or
-         [b,a]) if possible, where self is a function in the one variable.
-
diff --git a/latte-count.patch b/latte-count.patch
new file mode 100644
index 000000000000..623259294f68
--- /dev/null
+++ b/latte-count.patch
@@ -0,0 +1,84 @@
+diff --git a/src/sage/geometry/polyhedron/base.py b/src/sage/geometry/polyhedron/base.py
+index 50d99f99e4..3a3a8cb214 100644
+--- a/src/sage/geometry/polyhedron/base.py
++++ b/src/sage/geometry/polyhedron/base.py
+@@ -4629,7 +4629,7 @@ class Polyhedron_base(Element):
+             ...
+             RuntimeError: LattE integrale program failed (exit code 1):
+             ...
+-            Invocation: count '--redundancy-check=none' --cdd /dev/stdin
++            Invocation: latte-count '--redundancy-check=none' --cdd /dev/stdin
+             ...
+             Parse error in CDD-style input file /dev/stdin
+             sage: Q.integral_points_count(verbose=True) # optional - latte_int
+diff --git a/src/sage/geometry/polyhedron/base_ZZ.py b/src/sage/geometry/polyhedron/base_ZZ.py
+index 268af9db0d..70d41dfa30 100644
+--- a/src/sage/geometry/polyhedron/base_ZZ.py
++++ b/src/sage/geometry/polyhedron/base_ZZ.py
+@@ -228,7 +228,7 @@ class Polyhedron_ZZ(Polyhedron_base):
+             sage: p = P.ehrhart_polynomial(maxdet=5, verbose=True)  # optional - latte_int
+             This is LattE integrale ...
+             ...
+-            Invocation: count --ehrhart-polynomial '--redundancy-check=none' --cdd '--maxdet=5' /dev/stdin
++            Invocation: latte-count --ehrhart-polynomial '--redundancy-check=none' --cdd '--maxdet=5' /dev/stdin
+             ...
+             sage: p    # optional - latte_int
+             1/2*t^2 + 3/2*t + 1
+@@ -236,7 +236,7 @@ class Polyhedron_ZZ(Polyhedron_base):
+             sage: p = P.ehrhart_polynomial(dual=True, verbose=True)  # optional - latte_int
+             This is LattE integrale ...
+             ...
+-            Invocation: count --ehrhart-polynomial '--redundancy-check=none' --cdd --dual /dev/stdin
++            Invocation: latte-count --ehrhart-polynomial '--redundancy-check=none' --cdd --dual /dev/stdin
+             ...
+             sage: p   # optional - latte_int
+             1/2*t^2 + 3/2*t + 1
+@@ -244,7 +244,7 @@ class Polyhedron_ZZ(Polyhedron_base):
+             sage: p = P.ehrhart_polynomial(irrational_primal=True, verbose=True)   # optional - latte_int
+             This is LattE integrale ...
+             ...
+-            Invocation: count --ehrhart-polynomial '--redundancy-check=none' --cdd --irrational-primal /dev/stdin
++            Invocation: latte-count --ehrhart-polynomial '--redundancy-check=none' --cdd --irrational-primal /dev/stdin
+             ...
+             sage: p   # optional - latte_int
+             1/2*t^2 + 3/2*t + 1
+@@ -252,7 +252,7 @@ class Polyhedron_ZZ(Polyhedron_base):
+             sage: p = P.ehrhart_polynomial(irrational_all_primal=True, verbose=True)  # optional - latte_int
+             This is LattE integrale ...
+             ...
+-            Invocation: count --ehrhart-polynomial '--redundancy-check=none' --cdd --irrational-all-primal /dev/stdin
++            Invocation: latte-count --ehrhart-polynomial '--redundancy-check=none' --cdd --irrational-all-primal /dev/stdin
+             ...
+             sage: p   # optional - latte_int
+             1/2*t^2 + 3/2*t + 1
+@@ -264,7 +264,7 @@ class Polyhedron_ZZ(Polyhedron_base):
+             ...
+             RuntimeError: LattE integrale program failed (exit code 1):
+             ...
+-            Invocation: count --ehrhart-polynomial '--redundancy-check=none' --cdd '--bim-bam-boum=19' /dev/stdin
++            Invocation: latte-count --ehrhart-polynomial '--redundancy-check=none' --cdd '--bim-bam-boum=19' /dev/stdin
+             Unknown command/option --bim-bam-boum=19
+         """
+         if self.is_empty():
+diff --git a/src/sage/interfaces/latte.py b/src/sage/interfaces/latte.py
+index 066cedd401..302b39910d 100644
+--- a/src/sage/interfaces/latte.py
++++ b/src/sage/interfaces/latte.py
+@@ -86,7 +86,7 @@ def count(arg, ehrhart_polynomial=False, multivariate_generating_function=False,
+         sage: n = count(cddin, cdd=True, verbose=True, raw_output=True)  # optional - latte_int
+         This is LattE integrale ...
+         ...
+-        Invocation: count '--redundancy-check=none' --cdd /dev/stdin
++        Invocation: latte-count '--redundancy-check=none' --cdd /dev/stdin
+         ...
+         Total Unimodular Cones: ...
+         Maximum number of simplicial cones in memory at once: ...
+@@ -106,7 +106,7 @@ def count(arg, ehrhart_polynomial=False, multivariate_generating_function=False,
+     from sage.misc.misc import SAGE_TMP
+     from sage.rings.integer import Integer
+ 
+-    args = ['count']
++    args = ['latte-count']
+     if ehrhart_polynomial and multivariate_generating_function:
+         raise ValueError
+     if ehrhart_polynomial:
diff --git a/sagemath-planarity3.patch b/sagemath-planarity3.patch
deleted file mode 100644
index 6076008794f0..000000000000
--- a/sagemath-planarity3.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-Author: Ximin Luo <infinity0@debian.org>
-Bug: https://trac.sagemath.org/ticket/21774
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/sage/src/sage/graphs/planarity.pyx
-+++ b/sage/src/sage/graphs/planarity.pyx
-@@ -3,13 +3,19 @@
- """
- 
- cdef extern from "planarity/graph.h":
--    ctypedef struct graphNode:
--        int v
-+    ctypedef struct vertexRec:
-         int link[2]
--    ctypedef graphNode * graphNodeP
-+        int index
-+    ctypedef vertexRec * vertexRecP
-+
-+    ctypedef struct edgeRec:
-+        int link[2]
-+        int neighbor
-+    ctypedef edgeRec * edgeRecP
- 
-     ctypedef struct BM_graph:
--        graphNodeP G
-+        vertexRecP V
-+        edgeRecP E
-         int N
-     ctypedef BM_graph * graphP
- 
-@@ -93,15 +99,16 @@
-             g._pos = { u: [0,0], v: [0,1] }
-         return (True, None) if kuratowski else True
- 
--    # create to and from mappings to relabel vertices to the set {0,...,n-1}
-+    # create to and from mappings to relabel vertices to the set {1,...,n}
-+    # (planarity 3 uses 1-based array indexing, with 0 representing NIL)
-     cdef int i
-     listto = g.vertices()
-     ffrom = {}
-     for vvv in listto:
--        ffrom[vvv] = listto.index(vvv)
-+        ffrom[vvv] = listto.index(vvv) + 1
-     to = {}
-     for i from 0 <= i < len(listto):
--        to[i] = listto[i]
-+        to[i + 1] = listto[i]
-     g.relabel(ffrom)
- 
-     cdef graphP theGraph
-@@ -125,7 +132,7 @@
-     status = gp_Embed(theGraph, EMBEDFLAGS_PLANAR)
-     gp_SortVertices(theGraph)
- 
--    # use to and from mappings to relabel vertices back from the set {0,...,n-1}
-+    # use to and from mappings to relabel vertices back from the set {1,...,n}
-     g.relabel(to)
- 
-     if status == NOTOK:
-@@ -134,12 +141,12 @@
-         # Kuratowski subgraph isolator
-         g_dict = {}
-         from sage.graphs.graph import Graph
--        for i from 0 <= i < theGraph.N:
-+        for i from 0 < i <= theGraph.N:
-             linked_list = []
--            j = theGraph.G[i].link[1]
--            while j >= theGraph.N:
--                linked_list.append(to[theGraph.G[j].v])
--                j = theGraph.G[j].link[1]
-+            j = theGraph.V[i].link[1]
-+            while j:
-+                linked_list.append(to[theGraph.E[j].neighbor])
-+                j = theGraph.E[j].link[1]
-             if len(linked_list) > 0:
-                 g_dict[to[i]] = linked_list
-         G = Graph(g_dict)
-@@ -153,12 +160,12 @@
-             if set_embedding:
-                 emb_dict = {}
-                 #for i in range(theGraph.N):
--                for i from 0 <= i < theGraph.N:
-+                for i from 0 < i <= theGraph.N:
-                     linked_list = []
--                    j = theGraph.G[i].link[1]
--                    while j >= theGraph.N:
--                        linked_list.append(to[theGraph.G[j].v])
--                        j = theGraph.G[j].link[1]
-+                    j = theGraph.V[i].link[1]
-+                    while j:
-+                        linked_list.append(to[theGraph.E[j].neighbor])
-+                        j = theGraph.E[j].link[1]
-                     emb_dict[to[i]] = linked_list
-                 g._embedding = emb_dict
-             if set_pos:
-@@ -174,12 +181,12 @@
- 
-                 emb_dict = {}
-                 #for i in range(theGraph.N):
--                for i from 0 <= i < theGraph.N:
-+                for i from 0 < i <= theGraph.N:
-                     linked_list = []
--                    j = theGraph.G[i].link[0]
--                    while j >= theGraph.N:
--                        linked_list.append(to[theGraph.G[j].v])
--                        j = theGraph.G[j].link[0]
-+                    j = theGraph.V[i].link[0]
-+                    while j:
-+                        linked_list.append(to[theGraph.E[j].neighbor])
-+                        j = theGraph.E[j].link[0]
-                     emb_dict[to[i]] = linked_list
-                 g._embedding = emb_dict
-         gp_Free(&theGraph)
diff --git a/sagemath-python3-notebook.patch b/sagemath-python3-notebook.patch
new file mode 100644
index 000000000000..cae22561547a
--- /dev/null
+++ b/sagemath-python3-notebook.patch
@@ -0,0 +1,27 @@
+diff --git a/src/bin/sage-notebook b/src/bin/sage-notebook
+index 74192da240..0ede281aad 100755
+--- a/src/bin/sage-notebook
++++ b/src/bin/sage-notebook
+@@ -96,8 +96,7 @@ class NotebookJupyter(object):
+         if not have_prerequisites():
+             print(self.PREREQUISITE_ERROR)
+             raise SystemExit(1)
+-        from notebook.notebookapp import main
+-        main(argv)
++        os.execvp('jupyter-notebook', ['jupyter-notebook'] + argv)
+ 
+ 
+ class SageNBExport(NotebookJupyter):
+diff --git a/src/sage/repl/ipython_kernel/install.py b/src/sage/repl/ipython_kernel/install.py
+index 3912b8cdf5..bd40cdadda 100644
+--- a/src/sage/repl/ipython_kernel/install.py
++++ b/src/sage/repl/ipython_kernel/install.py
+@@ -281,7 +281,6 @@ def have_prerequisites(debug=True):
+         True
+     """
+     try:
+-        from notebook.notebookapp import NotebookApp
+         return True
+     except ImportError:
+         if debug:
+
diff --git a/sagemath-singular-4.1.0.p2.patch b/sagemath-singular-4.1.0.p2.patch
deleted file mode 100644
index b1a74a091129..000000000000
--- a/sagemath-singular-4.1.0.p2.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- src/sage/libs/singular/decl.pxd.orig	2017-02-21 07:58:27.088118954 +0000
-+++ src/sage/libs/singular/decl.pxd	2017-02-21 07:59:01.794846500 +0000
-@@ -484,8 +484,8 @@
- 
-     ring *rDefault(int char , int nvars, char **names)
-     ring *rDefault(const n_Procs_s* cf, int nvars, char **names)
--    ring *rDefault(int ch             , int nvars, char **names,int ord_size, int *ord, int *block0, int *block1, int **wvhdl)
--    ring *rDefault(const n_Procs_s* cf, int nvars, char **names,int ord_size, int *ord, int *block0, int *block1, int **wvhdl)
-+    ring *rDefault(int ch             , int nvars, char **names,int ord_size, rRingOrder_t *ord, int *block0, int *block1, int **wvhdl)
-+    ring *rDefault(const n_Procs_s* cf, int nvars, char **names,int ord_size, rRingOrder_t *ord, int *block0, int *block1, int **wvhdl)
- 
- 
- 
---- src/sage/libs/singular/ring.pyx.orig	2017-02-21 07:24:23.197906897 +0000
-+++ src/sage/libs/singular/ring.pyx	2017-02-21 07:29:23.731763098 +0000
-@@ -21,7 +21,7 @@
- from sage.libs.singular.decl cimport number, poly, ring, currRing
- from sage.libs.singular.decl cimport rChangeCurrRing, rCopy0, rComplete, rDelete, idInit
- from sage.libs.singular.decl cimport omAlloc0, omStrDup, omAlloc, omAlloc0Bin,  sip_sring_bin, rnumber_bin
--from sage.libs.singular.decl cimport ringorder_dp, ringorder_Dp, ringorder_lp, ringorder_rp, ringorder_ds, ringorder_Ds, ringorder_ls, ringorder_M, ringorder_C, ringorder_wp, ringorder_Wp, ringorder_ws, ringorder_Ws, ringorder_a
-+from sage.libs.singular.decl cimport ringorder_dp, ringorder_Dp, ringorder_lp, ringorder_rp, ringorder_ds, ringorder_Ds, ringorder_ls, ringorder_M, ringorder_C, ringorder_wp, ringorder_Wp, ringorder_ws, ringorder_Ws, ringorder_a, rRingOrder_t
- from sage.libs.singular.decl cimport p_Copy, prCopyR
- from sage.libs.singular.decl cimport n_unknown,  n_Zp,  n_Q,   n_R,   n_GF,  n_long_R,  n_algExt,n_transExt,n_long_C,   n_Z,   n_Zn,  n_Znm,  n_Z2m,  n_CF
- from sage.libs.singular.decl cimport n_coeffType, cfInitCharProc
-@@ -165,7 +165,7 @@
-     ##         q    q : GF(q=p^n)       *names         TRUE              (todo)
- 
-     _wvhdl  = <int **>omAlloc0((nblcks + 2) * sizeof(int *))
--    _order  = <int *>omAlloc0((nblcks + 2) * sizeof(int))
-+    _order  = <rRingOrder_t *>omAlloc0((nblcks + 2) * sizeof(int))
-     _block0 = <int *>omAlloc0((nblcks + 2) * sizeof(int))
-     _block1 = <int *>omAlloc0((nblcks + 2) * sizeof(int))
-