[arch-commits] Commit in sagemath/trunk (3 files)

2020-12-19 Thread Antonio Rojas via arch-commits 
Date: Saturday, December 19, 2020 @ 10:42:43
  Author: arojas
Revision: 779936

Port to singular 4.2 library names

Added:
  sagemath/trunk/sagemath-singular-4.2.patch
(from rev 779935, sagemath/trunk/sagemath-singular-4.1.2.patch)
Modified:
  sagemath/trunk/PKGBUILD
Deleted:
  sagemath/trunk/sagemath-singular-4.1.2.patch

---+
 PKGBUILD  |   16 
 sagemath-singular-4.1.2.patch |  759 -
 sagemath-singular-4.2.patch   |  915 
 3 files changed, 921 insertions(+), 769 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-12-19 10:42:11 UTC (rev 779935)
+++ PKGBUILD2020-12-19 10:42:43 UTC (rev 779936)
@@ -8,7 +8,7 @@
 pkgbase=sagemath
 pkgname=(sagemath sagemath-jupyter)
 pkgver=9.2
-pkgrel=8
+pkgrel=9
 pkgdesc="Open Source Mathematics Software, free alternative to Magma, Maple, 
Mathematica, and Matlab"
 arch=(x86_64)
 url="http://www.sagemath.org;
@@ -39,7 +39,7 @@
 latte-count.patch
 test-optional.patch
 sagemath-cremona.patch
-sagemath-singular-4.1.2.patch
+sagemath-singular-4.2.patch
 sagemath-gap-4.11.patch
 sagemath-flint-2.6.patch
 sagemath-cypari-2.1.2.patch
@@ -50,7 +50,7 @@
 'af922e1f978821a9a1f6c9a56130d71e5011c84a7aee7bf66a591bee658af30b'
 '7da0dbcda15a327c21dc33853cb8f98cb86a283139f8735e3b20a71d49458a88'
 '937074fa7a8a4e2aba9ea77ec622fe937985a1a9176c48460d51325ee877a4f5'
-'881186d016a6eb47b919765b9d4e6abc4560fce54e08cf42bd948ba77e16aa85'
+'a15446a96f2f6ddc0be37c768cbb4695e1efe6630a3479c625f4ef631aface3b'
 '34f06f9776f84f6998b1350555316e0ffea76ed16e149916970f19ef750a467f'
 '5d00b24c1d36b41b8ea3f07b93fc0e00b42dd84d9bc4e9b3d26e5f2cfeba6405'
 'dc507eeb75eae1109273879771b4eb56172b7417e87a0693381106afd7554e04'
@@ -65,8 +65,8 @@
 # Upstream patches
 # use Features to detect Cremona databases 
https://trac.sagemath.org/ticket/25825
   patch -p1 -i ../sagemath-cremona.patch
-# Fixes for singular 4.1.2 https://trac.sagemath.org/ticket/25993
-  patch -p1 -i ../sagemath-singular-4.1.2.patch
+# Fixes for singular 4.2 https://trac.sagemath.org/ticket/25993
+  patch -p1 -i ../sagemath-singular-4.2.patch
 # Fix segfault and tests with flint 2.6 https://trac.sagemath.org/ticket/29719
   patch -p1 -i ../sagemath-flint-2.6.patch
 # Fix gap.version() and doctests with GAP 4.11 
https://trac.sagemath.org/ticket/29314
@@ -106,12 +106,8 @@
 
   python setup.py install --root="$pkgdir" --optimize=1
 
-  _pythonpath=`python -c "from sysconfig import get_path; 
print(get_path('platlib'))"`
 # Remove sage_setup
-  rm -r "$pkgdir"/$_pythonpath/sage_setup
-# Install tests
-  cp -r sage/doctest/tests "$pkgdir"/$_pythonpath/sage/doctest
-  cp -r sage/tests/books "$pkgdir"/$_pythonpath/sage/tests
+  rm -r "$pkgdir"/usr/lib/python*/site-packages/sage_setup
 
 # Split jupyter kernel
   rm -r "$pkgdir"/usr/share

Deleted: sagemath-singular-4.1.2.patch
===
--- sagemath-singular-4.1.2.patch   2020-12-19 10:42:11 UTC (rev 779935)
+++ sagemath-singular-4.1.2.patch   2020-12-19 10:42:43 UTC (rev 779936)
@@ -1,759 +0,0 @@
-diff --git a/src/doc/en/constructions/algebraic_geometry.rst 
b/src/doc/en/constructions/algebraic_geometry.rst
-index a312548..d1c9c95 100644
 a/src/doc/en/constructions/algebraic_geometry.rst
-+++ b/src/doc/en/constructions/algebraic_geometry.rst
-@@ -139,7 +139,7 @@ Other methods
- 
-sage: singular.lib("brnoeth.lib")
-sage: s = singular.ring(2,'(x,y)','lp')
--   sage: I = singular.ideal('[x^4+x, y^4+y]')
-+   sage: I = singular.ideal('x^4+x', 'y^4+y')
-sage: L = singular.closed_points(I)
-sage: # Here you have all the points :
-sage: print(L)
-@@ -325,7 +325,7 @@ Singular itself to help an understanding of how the 
wrapper works.
-sage: X = Curve(f); pts = X.rational_points()
-sage: D = X.divisor([ (3, pts[0]), (-1,pts[1]), (10, pts[5]) ])
-sage: X.riemann_roch_basis(D)
--   [(-x - 2*y)/(-2*x - 2*y), (-x + z)/(x + y)]
-+   [(-2*x + y)/(x + y), (-x + z)/(x + y)]
- 
- -  Using Singular's ``BrillNoether`` command (for details see the section
-Brill-Noether in the Singular online documentation
-diff --git a/src/sage/algebras/free_algebra.py 
b/src/sage/algebras/free_algebra.py
-index 7391dd9..7234f91 100644
 a/src/sage/algebras/free_algebra.py
-+++ b/src/sage/algebras/free_algebra.py
-@@ -39,7 +39,15 @@ two-sided ideals, and thus provide ideal containment tests::
- Free Associative Unital Algebra on 3 generators (x, y, z) over Rational 
Field
- sage: I = F*[x*y+y*z,x^2+x*y-y*x-y^2]*F
- sage: I.groebner_basis(degbound=4)
--Twosided Ideal (y*z*y*y - y*z*y*z + y*z*z*y - y*z*z*z, y*z*y*x +

[arch-commits] Commit in sagemath/trunk (3 files)

2020-11-02 Thread Antonio Rojas via arch-commits 
Date: Monday, November 2, 2020 @ 18:30:36
  Author: arojas
Revision: 740034

Fix issues with pari 2.13

Added:
  sagemath/trunk/sagemath-cypari-2.1.2.patch
  sagemath/trunk/sagemath-pari-2.13.patch
Modified:
  sagemath/trunk/PKGBUILD

-+
 PKGBUILD|   14 
 sagemath-cypari-2.1.2.patch |  155 +++
 sagemath-pari-2.13.patch| 1925 ++
 3 files changed, 2091 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-11-02 18:29:31 UTC (rev 740033)
+++ PKGBUILD2020-11-02 18:30:36 UTC (rev 740034)
@@ -8,7 +8,7 @@
 pkgbase=sagemath
 pkgname=(sagemath sagemath-jupyter)
 pkgver=9.2
-pkgrel=2
+pkgrel=3
 pkgdesc="Open Source Mathematics Software, free alternative to Magma, Maple, 
Mathematica, and Matlab"
 arch=(x86_64)
 url="http://www.sagemath.org;
@@ -41,7 +41,9 @@
 sagemath-cremona.patch
 sagemath-singular-4.1.2.patch
 sagemath-gap-4.11.patch
-sagemath-flint-2.6.patch)
+sagemath-flint-2.6.patch
+sagemath-cypari-2.1.2.patch
+sagemath-pari-2.13.patch)
 sha256sums=('edc89776461247cf74a16473851378e70a2de867309978ca2346ef6f93af0f90'
 '00cf73534c10bb8694c77639670aa041b4b8c897babb01751a5f65648bcfdcf6'
 'af922e1f978821a9a1f6c9a56130d71e5011c84a7aee7bf66a591bee658af30b'
@@ -49,7 +51,9 @@
 '937074fa7a8a4e2aba9ea77ec622fe937985a1a9176c48460d51325ee877a4f5'
 '881186d016a6eb47b919765b9d4e6abc4560fce54e08cf42bd948ba77e16aa85'
 '34f06f9776f84f6998b1350555316e0ffea76ed16e149916970f19ef750a467f'
-'5d00b24c1d36b41b8ea3f07b93fc0e00b42dd84d9bc4e9b3d26e5f2cfeba6405')
+'5d00b24c1d36b41b8ea3f07b93fc0e00b42dd84d9bc4e9b3d26e5f2cfeba6405'
+'dc507eeb75eae1109273879771b4eb56172b7417e87a0693381106afd7554e04'
+'a285ab97c4342c1d050db3493c03807a0162ced74a67bea9eb2794f52ce439fc')
 
 prepare(){
   cd sage-$pkgver
@@ -65,6 +69,10 @@
   patch -p1 -i ../sagemath-flint-2.6.patch
 # Fix gap.version() and doctests with GAP 4.11 
https://trac.sagemath.org/ticket/29314
   patch -p1 -i ../sagemath-gap-4.11.patch
+# Fix gcd/lcm between pari and sage objects 
https://trac.sagemath.org/ticket/30849
+  patch -p1 -i ../sagemath-cypari-2.1.2.patch
+# Port to PARI 2.13 https://trac.sagemath.org/ticket/30801
+  patch -p1 -i ../sagemath-pari-2.13.patch
 
 # Arch-specific patches
 # assume all optional packages are installed

Added: sagemath-cypari-2.1.2.patch
===
--- sagemath-cypari-2.1.2.patch (rev 0)
+++ sagemath-cypari-2.1.2.patch 2020-11-02 18:30:36 UTC (rev 740034)
@@ -0,0 +1,155 @@
+diff --git a/src/sage/rings/integer.pyx b/src/sage/rings/integer.pyx
+index 4c835d0..77a3a18 100644
+--- a/src/sage/rings/integer.pyx
 b/src/sage/rings/integer.pyx
+@@ -4414,6 +4414,29 @@ cdef class 
Integer(sage.structure.element.EuclideanDomainElement):
+ sig_off()
+ return z
+ 
++def _gcd(self, Integer n):
++"""
++Return the greatest common divisor of self and `n`.
++
++EXAMPLES::
++
++sage: 1._gcd(-1)
++1
++sage: 0._gcd(1)
++1
++sage: 0._gcd(0)
++0
++sage: 2._gcd(2^6)
++2
++sage: 21._gcd(2^6)
++1
++"""
++cdef Integer z = PY_NEW(Integer)
++sig_on()
++mpz_gcd(z.value, self.value, n.value)
++sig_off()
++return z
++
+ def denominator(self):
+ """
+ Return the denominator of this integer, which of course is
+@@ -6736,33 +6759,6 @@ cdef class 
Integer(sage.structure.element.EuclideanDomainElement):
+ raise ZeroDivisionError(f"inverse of Mod({self}, {m}) does not 
exist")
+ return ans
+ 
+-def gcd(self, n):
+-"""
+-Return the greatest common divisor of self and `n`.
+-
+-EXAMPLES::
+-
+-sage: gcd(-1,1)
+-1
+-sage: gcd(0,1)
+-1
+-sage: gcd(0,0)
+-0
+-sage: gcd(2,2^6)
+-2
+-sage: gcd(21,2^6)
+-1
+-"""
+-if not isinstance(n, Integer) and not isinstance(n, int):
+-left, right = coercion_model.canonical_coercion(self, n)
+-return left.gcd(right)
+-cdef Integer m = as_Integer(n)
+-cdef Integer g = PY_NEW(Integer)
+-sig_on()
+-mpz_gcd(g.value, self.value, m.value)
+-sig_off()
+-return g
+-
+ def crt(self, y, m, n):
+ """
+ Return the unique integer between `0` and `mn` that is congruent to
+diff --git a/src/sage/structure/element.pyx b/src/sage/structure/element.pyx
+index f145e66..1cf634e 100644
+--- a/src/sage/structure/element.pyx

[arch-commits] Commit in sagemath/trunk (3 files)

2020-06-21 Thread Antonio Rojas via arch-commits 
Date: Sunday, June 21, 2020 @ 22:03:22
  Author: arojas
Revision: 650296

ecl 20.04 rebuild

Added:
  sagemath/trunk/sagemath-ecl-20.04.patch
Modified:
  sagemath/trunk/PKGBUILD
Deleted:
  sagemath/trunk/sagemath-ecl-sigfpe.patch

---+
 PKGBUILD  |   17 -
 sagemath-ecl-20.04.patch  |  413 
 sagemath-ecl-sigfpe.patch |  147 ---
 3 files changed, 419 insertions(+), 158 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-06-21 21:52:42 UTC (rev 650295)
+++ PKGBUILD2020-06-21 22:03:22 UTC (rev 650296)
@@ -8,7 +8,7 @@
 pkgbase=sagemath
 pkgname=(sagemath sagemath-jupyter)
 pkgver=9.1
-pkgrel=4
+pkgrel=5
 pkgdesc="Open Source Mathematics Software, free alternative to Magma, Maple, 
Mathematica, and Matlab"
 arch=(x86_64)
 url="http://www.sagemath.org;
@@ -39,7 +39,7 @@
 test-optional.patch
 sagemath-cremona.patch
 sagemath-singular-4.1.2.patch
-sagemath-ecl-sigfpe.patch
+sagemath-ecl-20.04.patch
 sagemath-no-dict-sorting.patch
 sagemath-ipython7.patch
 sagemath-python-3.8.patch
@@ -57,7 +57,7 @@
 '887b931b0eb3c7fcfcb01ae0cfda9668925ed59740c4134cba13c43dfe0dd088'
 '937074fa7a8a4e2aba9ea77ec622fe937985a1a9176c48460d51325ee877a4f5'
 '4cb86b4f39f4e876450080e6ae5058ad2226d20b9cb3425ba0dc3e4368708434'
-'e44bbde87f3312548faad75b7383ef21fade55be251ab5804de41cd3842ca8a0'
+'1fabc86d066310988a90083aaedceb9690822df8ff80c16501692231daa96e33'
 'c6ac173198303cc3c719e9aa7e1e55c7353d6065184a0142c27bc3b82db255dd'
 'fc28ca3aa1a656bfb451181d5086b3041238f24bf462cc69626d3cd603a246df'
 '9b24c5ccecaccb7bdd20c849d43ad048a2f5ade4fc9c359d22a8bf19b13012ca'
@@ -78,8 +78,8 @@
   patch -p1 -i ../sagemath-cremona.patch
 # Fixes for singular 4.1.2 https://trac.sagemath.org/ticket/25993
   patch -p1 -i ../sagemath-singular-4.1.2.patch
-# Fix SIGFPE crashes with ecl 16.1.3 https://trac.sagemath.org/ticket/22191
-  patch -p1 -i ../sagemath-ecl-sigfpe.patch
+# Fix build with ECL 20.04 https://trac.sagemath.org/ticket/22191
+  patch -p1 -i ../sagemath-ecl-20.04.patch
 # Fix doc build with sphinx 3 https://trac.sagemath.org/ticket/28856
   patch -p1 -i ../sagemath-sphinx-3.patch
 # Fix warnings with matplotlib 3.2 https://trac.sagemath.org/ticket/29547
@@ -120,10 +120,7 @@
 build() {
   cd sage-$pkgver/src
 
-  export CC=gcc \
- SAGE_ROOT="$PWD" \
- SAGE_SRC="$PWD" \
- SAGE_NUM_THREADS=10
+  export SAGE_NUM_THREADS=10
   python setup.py build
 }
 
@@ -132,8 +129,6 @@
 
   cd sage-$pkgver/src
 
-  export SAGE_ROOT="$PWD" \
- SAGE_LOCAL="/usr"
   python setup.py install --root="$pkgdir" --optimize=1
 
   mkdir -p "$pkgdir"/usr/bin

Added: sagemath-ecl-20.04.patch
===
--- sagemath-ecl-20.04.patch(rev 0)
+++ sagemath-ecl-20.04.patch2020-06-21 22:03:22 UTC (rev 650296)
@@ -0,0 +1,413 @@
+diff --git a/src/sage/interfaces/interface.py 
b/src/sage/interfaces/interface.py
+index 616c13d..430ba80 100644
+--- a/src/sage/interfaces/interface.py
 b/src/sage/interfaces/interface.py
+@@ -589,9 +589,9 @@ class Interface(WithEqualityById, ParentWithBase):
+ EXAMPLES::
+ 
+ sage: maxima.quad_qags(x, x, 0, 1, epsrel=1e-4)
+-[0.5,0.55511151231257...e-14,21,0]
++[0.5,5.5511151231257...e-15,21,0]
+ sage: maxima.function_call('quad_qags', [x, x, 0, 1], 
{'epsrel':'1e-4'})
+-[0.5,0.55511151231257...e-14,21,0]
++[0.5,5.5511151231257...e-15,21,0]
+ """
+ args, kwds = self._convert_args_kwds(args, kwds)
+ self._check_valid_function_name(function)
+diff --git a/src/sage/interfaces/maxima.py b/src/sage/interfaces/maxima.py
+index 9ab456e..3e8f4a6 100644
+--- a/src/sage/interfaces/maxima.py
 b/src/sage/interfaces/maxima.py
+@@ -128,9 +128,9 @@ http://maxima.sourceforge.net/docs/intromax/intromax.html.
+ 
+ sage: a = maxima('(1 + sqrt(2))^5')
+ sage: float(a)
+-82.01219330881975
++82.0121933088197...
+ sage: a.numer()
+-82.01219330881975
++82.0121933088197...
+ 
+ ::
+ 
+diff --git a/src/sage/interfaces/maxima_abstract.py 
b/src/sage/interfaces/maxima_abstract.py
+index 86fbe75..ed3055d 100644
+--- a/src/sage/interfaces/maxima_abstract.py
 b/src/sage/interfaces/maxima_abstract.py
+@@ -1518,7 +1518,7 @@ class MaximaAbstractElement(ExtraTabCompletion, 
InterfaceElement):
+ EXAMPLES::
+ 
+ sage: maxima('exp(-sqrt(x))').nintegral('x',0,1)
+-(0.5284822353142306, 0.41633141378838...e-10, 231, 0)
++(0.5284822353142306, 4.1633141378838...e-11, 231, 0)
+ 
+ Note that GP also does numerical integration, and can do so to very
+ high

[arch-commits] Commit in sagemath/trunk (3 files)

2020-04-21 Thread Antonio Rojas via arch-commits 
Date: Tuesday, April 21, 2020 @ 10:26:05
  Author: arojas
Revision: 617328

Update sphinx 3 patch

Added:
  sagemath/trunk/sagemath-sphinx-3.patch
Modified:
  sagemath/trunk/PKGBUILD
Deleted:
  sagemath/trunk/sagemath-sphinx-3.0.patch

---+
 PKGBUILD  |8 ++--
 sagemath-sphinx-3.0.patch |   71 
 sagemath-sphinx-3.patch   |   85 
 3 files changed, 89 insertions(+), 75 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-04-21 10:24:34 UTC (rev 617327)
+++ PKGBUILD2020-04-21 10:26:05 UTC (rev 617328)
@@ -8,7 +8,7 @@
 pkgbase=sagemath
 pkgname=(sagemath sagemath-jupyter)
 pkgver=9.0
-pkgrel=16
+pkgrel=17
 pkgdesc="Open Source Mathematics Software, free alternative to Magma, Maple, 
Mathematica, and Matlab"
 arch=(x86_64)
 url="http://www.sagemath.org;
@@ -46,7 +46,7 @@
 sagemath-gap-4.11.patch
 sagemath-matplotlib-3.2.patch
 sagemath-jedi-0.16.patch
-sagemath-sphinx-3.0.patch)
+sagemath-sphinx-3.patch)
 sha256sums=('6f5d42b306a2c03073dd95086f80602bd1a0b929b8ad19c6d219c8ca8e96da26'
 '496da0fa42cdfc92b43f5d85610bb462ca9bdc2f4d80fd316e8e9d068dba3b0b'
 '6a5470d7044a50a35a6478f57c19adf72fe54aefebeea8a095915b63f9e219ac'
@@ -60,7 +60,7 @@
 '7123af05c79f76b94c89aa97da13dd1c1a796cdf10a9486e0974c88054eb3037'
 '979777363001cca87f73128dd4db5f372fc9e4f1079805a20af01df47797468f'
 '63914b14d8369cb37e88500c73029bea83025d437029af65ba523f5f4396af91'
-'ab7016e398d227fed39035028ad8585789aff1a8a8b467cb1176e4b1c6bc5946')
+'3c64361d7390810e192c924b8e3c9a1f9d71adefa2e0b60dec9e882c1b61558b')
 
 prepare(){
   cd sage-$pkgver
@@ -95,7 +95,7 @@
 # Fix SIGFPE crashes with ecl 16.1.3 https://trac.sagemath.org/ticket/22191
   patch -p1 -i ../sagemath-ecl-sigfpe.patch
 # Fix doc build with sphinx 3 https://trac.sagemath.org/ticket/28856
-  patch -p1 -i ../sagemath-sphinx-3.0.patch
+  patch -p1 -i ../sagemath-sphinx-3.patch
 
   sed -e 's|sage-python23|python|' -i src/bin/*
   sed -e 's|$SAGE_PYTHON3|yes|' -i src/bin/sage

Deleted: sagemath-sphinx-3.0.patch
===
--- sagemath-sphinx-3.0.patch   2020-04-21 10:24:34 UTC (rev 617327)
+++ sagemath-sphinx-3.0.patch   2020-04-21 10:26:05 UTC (rev 617328)
@@ -1,71 +0,0 @@
-Index: sage/docs/conf.py
-===
 a/src/sage/docs/conf.py
-+++ b/src/sage/docs/conf.py
-@@ -8,6 +8,7 @@ from docutils import nodes
- from docutils.transforms import Transform
- from sphinx.ext.doctest import blankline_re
- from sphinx import highlighting
-+import sphinx.ext.intersphinx as intersphinx
- from IPython.lib.lexers import IPythonConsoleLexer, IPyLexer
- 
- # If your extensions are in another directory, add it here.
-@@ -169,13 +169,8 @@ todo_include_todos = True
- 
- # Cross-links to other project's online documentation.
- python_version = sys.version_info.major
--intersphinx_mapping = {
--'python': ('https://docs.python.org/',
--os.path.join(SAGE_DOC_SRC, "common",
-- "python{}.inv".format(python_version))),
--'pplpy': (PPLPY_DOCS, None)}
- 
--def set_intersphinx_mappings(app):
-+def set_intersphinx_mappings(app, config):
- """
- Add precompiled inventory (the objects.inv)
- """
-@@ -186,7 +182,11 @@ def set_intersphinx_mappings(app):
- app.config.intersphinx_mapping = {}
- return
- 
--app.config.intersphinx_mapping = intersphinx_mapping
-+app.config.intersphinx_mapping =  {
-+'python': ('https://docs.python.org/',
-+os.path.join(SAGE_DOC_SRC, "common",
-+ "python{}.inv".format(python_version))),
-+'pplpy': (PPLPY_DOCS, None)}
- 
- # Add master intersphinx mapping
- dst = os.path.join(invpath, 'objects.inv')
-@@ -201,6 +201,7 @@ def set_intersphinx_mappings(app):
- dst = os.path.join(invpath, directory, 'objects.inv')
- app.config.intersphinx_mapping[src] = dst
- 
-+intersphinx.normalize_intersphinx_mapping(app, config)
- 
- # By default document are not master.
- multidocs_is_master = True
-@@ -669,7 +672,7 @@ def call_intersphinx(app, env, node, contnode):
- """
- debug_inf(app, " Trying intersphinx for %s" % node['reftarget'])
- builder = app.builder
--res =  sphinx.ext.intersphinx.missing_reference(
-+res =  intersphinx.missing_reference(
- app, env, node, contnode)
- if res:
- # Replace absolute links to $SAGE_DOC by relative links: this
-@@ -852,11 +855,10 @@ def setup(app):
- if app.srcdir.startswith(SAGE_DOC_SRC):
- app.add_config_value('intersphinx_mapping', {}, False)
- app.add_config_value('intersphinx_cache_limit', 5, False)
-+

[arch-commits] Commit in sagemath/trunk (3 files)

2019-07-29 Thread Antonio Rojas via arch-commits 
Date: Monday, July 29, 2019 @ 18:26:01
  Author: arojas
Revision: 494672

Use multiplication tables shipped by meataxe package instead of generating them 
at runtime

Added:
  sagemath/trunk/meataxe-tables.patch
Modified:
  sagemath/trunk/PKGBUILD
  sagemath/trunk/sagemath-env.patch

--+
 PKGBUILD |   12 
 meataxe-tables.patch |   34 ++
 sagemath-env.patch   |4 +---
 3 files changed, 43 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-07-29 18:08:49 UTC (rev 494671)
+++ PKGBUILD2019-07-29 18:26:01 UTC (rev 494672)
@@ -8,7 +8,7 @@
 pkgbase=sagemath
 pkgname=(sagemath sagemath-jupyter)
 pkgver=8.8
-pkgrel=2
+pkgrel=3
 pkgdesc="Open Source Mathematics Software, free alternative to Magma, Maple, 
Mathematica, and Matlab"
 arch=(x86_64)
 url="http://www.sagemath.org;
@@ -46,9 +46,10 @@
 sagemath-singular-4.1.2.patch
 sagemath-ecl-sigfpe.patch
 sagemath-linbox-1.6.patch
-sagemath-threejs-dir-structure.patch)
+sagemath-threejs-dir-structure.patch
+meataxe-tables.patch)
 sha256sums=('d012ff4f0f34e086fcaf576e25220fc647826116c69b62b887bc0b8ced5c1e9f'
-'1c2a2d750e81ac65a1dc07094f086ba07f4862288c935a1cd009cdd62bcfc23c'
+'20f5d7a1b5b16f4de43edcd4184e99e4687d9e70058f3f58f5d909bda300'
 '328e45e78065b5f6527174bda48cfff6828acbf107c2535b0a9a92c3ceb35842'
 '596d03daf53a76b04029b120619253250b0e58d530d69f14afa169e27e06f446'
 'e554cdf689100c787a5fbcb7fe281cd68bef081e08bd58df8be1d113a4665d7e'
@@ -59,7 +60,8 @@
 '961bfb5694b67d425d21240d71490cb71714b5207c23448c89be0966512ff8f9'
 'a42f3b152b1aedb8abf16bc70971419919d1fe30328574e7fef8305f9d07d938'
 '81fc39e39e8508f742ccc784efd0492fd04474cee75edf7bd3cbea43edd49b2e'
-'779e4107f663307bc9c564e6f800364e7e1926b6cab18ea6674bd62ea7664143')
+'779e4107f663307bc9c564e6f800364e7e1926b6cab18ea6674bd62ea7664143'
+'8305de73d7a3c68ceaa001866ff933c4fa3a0706700ade2e25046f58270bc6db')
 
 prepare(){
   cd sage-$pkgver
@@ -91,6 +93,8 @@
   patch -p1 -i ../sagemath-linbox-1.6.patch
 # use upstream's three.js directory structure 
https://trac.sagemath.org/ticket/28007
   patch -p1 -i ../sagemath-threejs-dir-structure.patch
+# use meataxe package's multiplication tables instead of generating them at 
runtime https://trac.sagemath.org/ticket/28188
+  patch -p1 -i ../meataxe-tables.patch
 
 # use python2
   sed -e 's|sage-python23|python2|' -e 's|#!/usr/bin/env 
python\b|#!/usr/bin/env python2|' -i src/bin/*

Added: meataxe-tables.patch
===
--- meataxe-tables.patch(rev 0)
+++ meataxe-tables.patch2019-07-29 18:26:01 UTC (rev 494672)
@@ -0,0 +1,34 @@
+diff --git a/src/sage/env.py b/src/sage/env.py
+index 27dd40c..453ccd7 100644
+--- a/src/sage/env.py
 b/src/sage/env.py
+@@ -182,6 +182,7 @@ var('CREMONA_LARGE_DATA_DIR',join(SAGE_SHARE, 
'cremona'))
+ var('JMOL_DIR',  join(SAGE_SHARE, 'jmol'))
+ var('JSMOL_DIR', join(SAGE_SHARE, 'jsmol'))
+ var('MATHJAX_DIR',   join(SAGE_SHARE, 'mathjax'))
++var('MTXLIB',join(SAGE_SHARE, 'meataxe'))
+ var('THREEJS_DIR',   join(SAGE_SHARE, 'threejs'))
+ var('PPLPY_DOCS',join(SAGE_SHARE, 'doc', 'pplpy'))
+ var('MAXIMA_FAS')
+diff --git a/src/sage/libs/meataxe.pyx b/src/sage/libs/meataxe.pyx
+index 1120600..7549e55 100644
+--- a/src/sage/libs/meataxe.pyx
 b/src/sage/libs/meataxe.pyx
+@@ -68,7 +68,6 @@ cdef Matrix_t *rawMatrix(int Field, list entries) except 
NULL:
+ 
+ from sage.cpython.string cimport str_to_bytes, char_to_str
+ import os
+-from sage.env import DOT_SAGE
+ 
+ cdef void sage_meataxe_error_handler(const MtxErrorRecord_t *err):
+ sig_block()
+@@ -82,7 +81,8 @@ cdef inline meataxe_init():
+ ## Assign to a variable that enables MeatAxe to find
+ ## its multiplication tables.
+ global MtxLibDir
+-mtxdir = str_to_bytes(os.path.join(DOT_SAGE, 'meataxe'))
++from sage import env
++mtxdir = str_to_bytes(env.MTXLIB)
+ if len(mtxdir) >= 1024:
+ raise RuntimeError(f"the path for the meataxe library {mtxdir!r} is 
too long, it needs to be of length < 1024")
+ MtxLibDir[:len(mtxdir)] = mtxdir

Modified: sagemath-env.patch
===
--- sagemath-env.patch  2019-07-29 18:08:49 UTC (rev 494671)
+++ sagemath-env.patch  2019-07-29 18:26:01 UTC (rev 494672)
@@ -91,12 +91,10 @@
  export SAGE_DOC="$SAGE_SHARE/doc/sage"
  
  if [ -z "${SAGE_ORIG_PATH_SET}" ]; then
-@@ -411,28 +411,8 @@
+@@ -411,28 +411,6 @@
  export SAGE_STARTUP_FILE
  fi
  
-+export LIBMTX="$DOT_SAGE/meataxe"
-+[[ -d $LIBMTX ]] ||

[arch-commits] Commit in sagemath/trunk (3 files)

2019-04-13 Thread Antonio Rojas via arch-commits 
Date: Saturday, April 13, 2019 @ 07:03:44
  Author: arojas
Revision: 451342

Fix 3D rendering with recent three.js

Added:
  sagemath/trunk/sagemath-threejs-100.patch
Modified:
  sagemath/trunk/PKGBUILD
  sagemath/trunk/sagemath-threejs.patch

+
 PKGBUILD   |   12 
 sagemath-threejs-100.patch |   26 ++
 sagemath-threejs.patch |2 +-
 3 files changed, 35 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-04-13 05:51:11 UTC (rev 451341)
+++ PKGBUILD2019-04-13 07:03:44 UTC (rev 451342)
@@ -8,7 +8,7 @@
 pkgbase=sagemath
 pkgname=(sagemath sagemath-jupyter)
 pkgver=8.7
-pkgrel=1
+pkgrel=2
 pkgdesc="Open Source Mathematics Software, free alternative to Magma, Maple, 
Mathematica, and Matlab"
 arch=(x86_64)
 url="http://www.sagemath.org;
@@ -46,7 +46,8 @@
 sagemath-sphinx-1.8.patch
 sagemath-singular-4.1.2.patch
 sagemath-ecl-sigfpe.patch
-sagemath-gap-4.10.1.patch)
+sagemath-gap-4.10.1.patch
+sagemath-threejs-100.patch)
 sha256sums=('263c3b3fc956b8bebc532f3b51e68c1b0d559d3b7e7c9fadffdfc0f4dbae18ab'
 'e0e36f2a39b634a76e1c3ad9a31f9ab60e734dd53b43203557b76613277d53b9'
 'b1068a8d5750051c2b5cfcb89d3d5870cf4233ab445e71c398543fb8b1e6281a'
@@ -54,12 +55,13 @@
 '12cd410035ae644c2495b0dcd3a5138133a471ecc07912d37114c46ee837eb0e'
 'f12bd2a53ad51549015093aacc89978f4d796d9ab5bcd3d737aa0d57a5815b54'
 '7fcb52e96935dccb0f958d37c2f4e3918392480b9af53e08562f6cba6c68cb94'
-'f6b48abf34f64ea3fc092b0f0179e89633f7d3ecc0d62c2acacbfa1217751d63'
+'d3c50256cfcf84a90336647f8a1164386b6b8034f47c45361d57be487e92d2c1'
 '4c6df9e4e5a7b29ecf6189eda3e5a79f69b6e1b4d29c1b9559663149b8c0af96'
 '22f5e44a42c8276025b8512f45cac1c36d576c29c7fd9d36fde8b19ff87867d8'
 '961bfb5694b67d425d21240d71490cb71714b5207c23448c89be0966512ff8f9'
 'a42f3b152b1aedb8abf16bc70971419919d1fe30328574e7fef8305f9d07d938'
-'9ec56a3788e32c54f35abeaeedf7cadf6670fa10d39007050b23b93d3c35278e')
+'9ec56a3788e32c54f35abeaeedf7cadf6670fa10d39007050b23b93d3c35278e'
+'3190167368e1689eb29b905b6703fdd41f11c075cc25442caf6305393f3e218c')
 
 prepare(){
   cd sage-$pkgver
@@ -91,6 +93,8 @@
   patch -p1 -i ../sagemath-singular-4.1.2.patch
 # Fix SIGFPE crashes with ecl 16.1.3 https://trac.sagemath.org/ticket/22191
   patch -p1 -i ../sagemath-ecl-sigfpe.patch
+# Fix rendering with three.js r100 https://trac.sagemath.org/ticket/26718
+  patch -p1 -i ../sagemath-threejs-100.patch
 
 # use python2
   sed -e 's|sage-python23|python2|' -e 's|#!/usr/bin/env 
python\b|#!/usr/bin/env python2|' -i src/bin/*

Added: sagemath-threejs-100.patch
===
--- sagemath-threejs-100.patch  (rev 0)
+++ sagemath-threejs-100.patch  2019-04-13 07:03:44 UTC (rev 451342)
@@ -0,0 +1,26 @@
+diff --git a/src/ext/threejs/threejs_template.html 
b/src/ext/threejs/threejs_template.html
+index 0243bc1..d6ad3a7 100644
+--- a/src/ext/threejs/threejs_template.html
 b/src/ext/threejs/threejs_template.html
+@@ -114,7 +114,7 @@ SAGE_SCRIPTS
+ scene.add( sprite );
+ }
+ 
+-if ( options.axes ) scene.add( new THREE.AxisHelper( Math.min( 
a[0]*b[1].x, a[1]*b[1].y, a[2]*b[1].z ) ) );
++if ( options.axes ) scene.add( new THREE.AxesHelper( Math.min( 
a[0]*b[1].x, a[1]*b[1].y, a[2]*b[1].z ) ) );
+ 
+ var camera = new THREE.PerspectiveCamera( 45, window.innerWidth / 
window.innerHeight, 0.1, 1000 );
+ camera.up.set( 0, 0, 1 );
+@@ -235,7 +235,11 @@ SAGE_SCRIPTS
+  transparent: transparent, opacity: 
json.opacity,
+  shininess: 20 } );
+ 
+-var c = geometry.center().multiplyScalar( -1 );
++var c = new THREE.Vector3();
++geometry.computeBoundingBox();
++geometry.boundingBox.getCenter( c );
++geometry.translate( -c.x, -c.y, -c.z );
++
+ var mesh = new THREE.Mesh( geometry, material );
+ mesh.position.set( c.x, c.y, c.z );
+ scene.add( mesh );

Modified: sagemath-threejs.patch
===
--- sagemath-threejs.patch  2019-04-13 05:51:11 UTC (rev 451341)
+++ sagemath-threejs.patch  2019-04-13 07:03:44 UTC (rev 451342)
@@ -5,7 +5,7 @@
  if online:
  from sage.misc.package import installed_packages
 -version = installed_packages()['threejs'].split('.')[0]
-+version = 'r80'
++version = 'r100'
  return """
  https://cdn.rawgit.com/mrdoob/three.js/{0}/build/three.min.js";>
  https://cdn.rawgit.com/mrdoob/three.js/{0}/examples/js/controls/OrbitControls.js";>

[arch-commits] Commit in sagemath/trunk (3 files)

2018-12-23 Thread Antonio Rojas via arch-commits 
Date: Sunday, December 23, 2018 @ 22:50:45
  Author: arojas
Revision: 417674

Rebuild with ecl 16.1.3, update networkx patch

Added:
  sagemath/trunk/sagemath-ecl-sigfpe.patch
Modified:
  sagemath/trunk/PKGBUILD
  sagemath/trunk/sagemath-networkx-2.2.patch

-+
 PKGBUILD|   12 +
 sagemath-ecl-sigfpe.patch   |   23 +++
 sagemath-networkx-2.2.patch |  322 +++---
 3 files changed, 300 insertions(+), 57 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-12-23 22:04:56 UTC (rev 417673)
+++ PKGBUILD2018-12-23 22:50:45 UTC (rev 417674)
@@ -8,7 +8,7 @@
 pkgbase=sagemath
 pkgname=(sagemath sagemath-jupyter)
 pkgver=8.5
-pkgrel=1
+pkgrel=2
 pkgdesc="Open Source Mathematics Software, free alternative to Magma, Maple, 
Mathematica, and Matlab"
 arch=(x86_64)
 url="http://www.sagemath.org;
@@ -47,7 +47,8 @@
 sagemath-sphinx-1.8.patch
 sagemath-networkx-2.2.patch
 sagemath-cypari2.patch
-sagemath-singular-4.1.1.p4.patch)
+sagemath-singular-4.1.1.p4.patch
+sagemath-ecl-sigfpe.patch)
 sha256sums=('369810fac9ad7fb6cb1eb2a82d3e3679edee015778de34c56670d4ee80bde690'
 'f26ab0f22d7d916a621f02b9d9fc806eb6825f8d34cdf45accb0e2601c82f049'
 '960afe4fcbffe2762b66119b8f14355386ced0d8ee52b535d0dac1dba90d365b'
@@ -59,9 +60,10 @@
 '4c6df9e4e5a7b29ecf6189eda3e5a79f69b6e1b4d29c1b9559663149b8c0af96'
 '224f8d1db783d7ae25408912c4891687d6a8a1dacc8c5b3a00b725a28d951b6c'
 '22f5e44a42c8276025b8512f45cac1c36d576c29c7fd9d36fde8b19ff87867d8'
-'27e2590d3ff8242dd76579defdcf3d17ce54937e1bc8c847089fd3b681e98008'
+'c19afd209d1f0caf072a43e0f6447c61cae8cf1583f3f89e27c48c8302542c26'
 '1677bcaa3fe19bf978b6ffaae7b64b7ec32df63fa3d0e28b179cfa831fcfa896'
-'482887fe43d89cef3270e89300ab9e2238fa74cd5b7c875688b68fb1b10c4fdf')
+'482887fe43d89cef3270e89300ab9e2238fa74cd5b7c875688b68fb1b10c4fdf'
+'87bf055de0a233e9599c59a86f64b4502be31fda53ba0a426f94f25f17ca76df')
 
 prepare(){
   cd sage-$pkgver
@@ -95,6 +97,8 @@
   patch -p1 -i ../sagemath-gap-4.10.patch
 # Fixes for singular 4.1.1p4 https://trac.sagemath.org/ticket/25993
   patch -p1 -i ../sagemath-singular-4.1.1.p4.patch
+# Fix SIGFPE crashes with ecl 16.1.3 https://trac.sagemath.org/ticket/22191
+  patch -p1 -i ../sagemath-ecl-sigfpe.patch
 
 # use python2
   sed -e 's|sage-python23|python2|' -e 's|#!/usr/bin/env 
python\b|#!/usr/bin/env python2|' -i src/bin/*

Added: sagemath-ecl-sigfpe.patch
===
--- sagemath-ecl-sigfpe.patch   (rev 0)
+++ sagemath-ecl-sigfpe.patch   2018-12-23 22:50:45 UTC (rev 417674)
@@ -0,0 +1,23 @@
+diff --git a/src/sage/libs/ecl.pyx b/src/sage/libs/ecl.pyx
+index 1fafb6c..4f730ad 100644
+--- a/src/sage/libs/ecl.pyx
 b/src/sage/libs/ecl.pyx
+@@ -321,6 +321,7 @@ def init_ecl():
+ """))
+ safe_funcall_clobj=cl_eval(string_to_object(b"(symbol-function 
'sage-safe-funcall)"))
+ 
++cl_eval(string_to_object("(si::trap-fpe T NIL)"))
+ ecl_has_booted = 1
+ 
+ cdef cl_object ecl_safe_eval(cl_object form) except NULL:
+--- sage-8.5/src/sage/interfaces/maxima_lib.py.orig 2018-12-23 
21:59:46.431420340 +
 sage-8.5/src/sage/interfaces/maxima_lib.py  2018-12-23 22:00:05.494568891 
+
+@@ -107,6 +107,7 @@
+ else:
+ ecl_eval("(require 'maxima)")
+ ecl_eval("(in-package :maxima)")
++ecl_eval("(si::trap-fpe 'floating-point-overflow nil)")
+ ecl_eval("(setq $nolabels t))")
+ ecl_eval("(defvar *MAXIMA-LANG-SUBDIR* NIL)")
+ ecl_eval("(set-locale-subdir)")
+

Modified: sagemath-networkx-2.2.patch
===
--- sagemath-networkx-2.2.patch 2018-12-23 22:04:56 UTC (rev 417673)
+++ sagemath-networkx-2.2.patch 2018-12-23 22:50:45 UTC (rev 417674)
@@ -1,224 +1,440 @@
 diff --git a/src/sage/graphs/digraph_generators.py 
b/src/sage/graphs/digraph_generators.py
-index d0023e9..a478727 100644
+index 204c013..af4d8ea 100644
 --- a/src/sage/graphs/digraph_generators.py
 +++ b/src/sage/graphs/digraph_generators.py
-@@ -1108,7 +1108,7 @@ class DiGraphGenerators():
+@@ -63,6 +63,7 @@ Functions and methods
+ from __future__ import print_function, division
+ from six.moves import range
  
- -  ``kernel`` - the attachment kernel
++import sys
+ from sage.misc.randstate import current_randstate
+ from sage.graphs.digraph import DiGraph
  
+@@ -1104,18 +1105,19 @@ class DiGraphGenerators():
+ INPUT:
+ 
+ 
+--  ``n`` - number of vertices.
++- ``n`` - number of vertices.
+ 
+--  ``kernel`` - the attachment kernel
++- ``kernel`` - the attachment kernel.
+ 
 --  ``seed`` - for the random number generator
-+-  ``seed`` - a ``random.Random`` seed for the

[arch-commits] Commit in sagemath/trunk (3 files)

2018-09-14 Thread Antonio Rojas via arch-commits 
Date: Friday, September 14, 2018 @ 20:05:30
  Author: arojas
Revision: 380994

Fix introspection with sphinx 1.8, fix search_doc

Added:
  sagemath/trunk/sagemath-no-doc-check.patch
  sagemath/trunk/sagemath-sphinx-1.8.patch
Modified:
  sagemath/trunk/PKGBUILD

-+
 PKGBUILD|   14 +++--
 sagemath-no-doc-check.patch |   61 ++
 sagemath-sphinx-1.8.patch   |   28 +++
 3 files changed, 100 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-09-14 19:27:14 UTC (rev 380993)
+++ PKGBUILD2018-09-14 20:05:30 UTC (rev 380994)
@@ -8,7 +8,7 @@
 pkgbase=sagemath
 pkgname=(sagemath sagemath-jupyter)
 pkgver=8.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Open Source Mathematics Software, free alternative to Magma, Maple, 
Mathematica, and Matlab"
 arch=(x86_64)
 url="http://www.sagemath.org;
@@ -50,7 +50,9 @@
 sagemath-gap-4.8.patch
 sagemath-cypari2.patch
 sagemath-cddlib-0.94j.patch
-sagemath-eclib-20180710.patch)
+sagemath-eclib-20180710.patch
+sagemath-no-doc-check.patch
+sagemath-sphinx-1.8.patch)
 sha256sums=('41fd0b4eb820f7a1274e12294b6fbdbbf60d0027bff98c22fdc84da140964929'
 'f483a448c045aeff186bec4b402da8109fa12547ff36219a9aa427c2561ec8e5'
 '960afe4fcbffe2762b66119b8f14355386ced0d8ee52b535d0dac1dba90d365b'
@@ -67,7 +69,9 @@
 'b2c9b9695c358f868c3868790382cf7d112092184ce08f5733524d406ec20cac'
 '94847fc033fd36bc59217c8484d4cf48d0640ff35bb5ca5ffba88a8158c6dd44'
 '9a690bda83c280c0801f6d04353e8a909da80ccfee92e06d200ae6eb9be9a5a8'
-'182b0765d58494978bf27628bada8b42c95ef7eb2671b91ddf9c67608560c662')
+'182b0765d58494978bf27628bada8b42c95ef7eb2671b91ddf9c67608560c662'
+'a10079bc1994ac99acf527f666513d7dd135615d6d9c29705f24570aa22f6852'
+'7dd2ab94fddda8e7c2cdd5250642c4cdd00b7702815d88762fbcd68416bacaee')
 
 prepare(){
   cd sage-$pkgver
@@ -97,6 +101,10 @@
   patch -p1 -i ../sagemath-gap-4.8.patch
 # Fix build with eclib 20180710
   patch -p1 -i ../sagemath-eclib-20180710.patch
+# don't check for doc presence in doc_search (Gentoo)
+  patch -p1 -i ../sagemath-no-doc-check.patch
+# fix introspection with sphinx 1.8
+  patch -p1 -i ../sagemath-sphinx-1.8.patch
 
 # Upstream patches  
 # fix build against libfes 0.2 http://trac.sagemath.org/ticket/15209

Added: sagemath-no-doc-check.patch
===
--- sagemath-no-doc-check.patch (rev 0)
+++ sagemath-no-doc-check.patch 2018-09-14 20:05:30 UTC (rev 380994)
@@ -0,0 +1,61 @@
+diff -Naur src.orig/sage/misc/sagedoc.py src/sage/misc/sagedoc.py
+--- a/src/sage/misc/sagedoc.py 2016-02-26 13:15:40.649917083 +1300
 b/src/sage/misc/sagedoc.py 2016-02-26 13:16:59.173122116 +1300
+@@ -838,57 +838,6 @@
+ exts = ['html']
+ title = 'Documentation'
+ base_path = SAGE_DOC
+-doc_path = SAGE_DOC_SRC
+-
+-from sage_setup.docbuild.build_options import LANGUAGES, OMIT
+-# List of languages
+-lang = LANGUAGES
+-# Documents in SAGE_DOC_SRC/LANG/ to omit
+-omit = OMIT
+-
+-# List of documents, minus the omitted ones
+-documents = []
+-for L in lang:
+-documents += [os.path.join(L, dir) for dir
+-  in os.listdir(os.path.join(doc_path, L))
+-  if dir not in omit]
+-
+-# Check to see if any documents are missing.  This just
+-# checks to see if the appropriate output directory exists,
+-# not that it contains a complete build of the docs.
+-missing = [os.path.join(SAGE_DOC, 'html', doc)
+-   for doc in documents if not
+-   os.path.exists(os.path.join(SAGE_DOC, 'html', doc))]
+-num_missing = len(missing)
+-if num_missing > 0:
+-print("""Warning, the following Sage documentation hasn't been 
built,
+-so documentation search results may be incomplete:
+-""")
+-for s in missing:
+-print(s)
+-if num_missing > 1:
+-print("""
+-You can build these with 'sage -docbuild DOCUMENT html',
+-where DOCUMENT is one of""", end=' ')
+-for s in missing:
+-if s.find('en') != -1:
+-print("'{}',".format(os.path.split(s)[-1]), end=' ')
+-else:
+-print("'{}',".format(os.path.join(
+-os.path.split(os.path.split(s)[0])[-1],
+-os.path.split(s)[-1])), end=' ')
+-print("""
+-or you can use 'sage -docbuild all html' to build all of the missing 
documentation.""")
+-else:
+-s = missing[0]
+-

[arch-commits] Commit in sagemath/trunk (3 files)

2018-07-12 Thread Antonio Rojas via arch-commits 
Date: Thursday, July 12, 2018 @ 14:25:43
  Author: arojas
Revision: 357920

Add patches for new eclib and cddlib

Added:
  sagemath/trunk/sagemath-cddlib-094j.patch
  sagemath/trunk/sagemath-eclib-20180710.patch
Modified:
  sagemath/trunk/PKGBUILD

---+
 PKGBUILD  |   13 
 sagemath-cddlib-094j.patch|  980 
 sagemath-eclib-20180710.patch |   24 
 3 files changed, 1014 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-07-12 12:09:04 UTC (rev 357919)
+++ PKGBUILD2018-07-12 14:25:43 UTC (rev 357920)
@@ -9,7 +9,7 @@
 pkgbase=sagemath
 pkgname=(sagemath sagemath-jupyter)
 pkgver=8.2
-pkgrel=11
+pkgrel=12
 pkgdesc="Open Source Mathematics Software, free alternative to Magma, Maple, 
Mathematica, and Matlab"
 arch=(x86_64)
 url="http://www.sagemath.org;
@@ -41,7 +41,8 @@
 sagemath-detect-igraph.patch sagemath-networkx2.patch 
sagemath-scipy-1.0.patch sagemath-lrs.patch
 sagemath-singular-4.1.1.patch sagemath-lcalc-c++11.patch 
sagemath-gap-4.8.patch
 
pari-ratpoints.patch::"https://github.com/sagemath/sage/commit/83458400.patch;
-
sagemath-cypari2.patch::"https://git.sagemath.org/sage.git/patch?id=da380b32;)
+
sagemath-cypari2.patch::"https://git.sagemath.org/sage.git/patch?id=da380b32;
+sagemath-cddlib-094j.patch sagemath-eclib-20180710.patch)
 sha256sums=('41ba2c2dde7a02e1bb6880ae875d37ab058567cc26e760efe87eeb12188cd65b'
 'b3c5f5c159d72ba7bc2b186b7b0e50a02b1ca60caef49b3857dbaad3da36b6fc'
 'c41ae665499c6cd775d40bbe178f8786830b0931ee26bf11ee02f7d83bcc8107'
@@ -61,7 +62,9 @@
 '5114c912f821900e5bfae1e2cfeb7984de946d0b23e1182b0bf15be1d803dfd0'
 '6917cb74e50ae965ea8d7c39577e5f0a5068e4b6a67b53fc6f219149a7d06584'
 'e24ad879f6b2eb970778fc5e867bcbe0a6d393feca8f11f5cb8d07da1f024be9'
-'94847fc033fd36bc59217c8484d4cf48d0640ff35bb5ca5ffba88a8158c6dd44')
+'94847fc033fd36bc59217c8484d4cf48d0640ff35bb5ca5ffba88a8158c6dd44'
+'092a928b77c8bb1e23399f22be39f67797a0065954128b690ead6a09f9ce1e44'
+'182b0765d58494978bf27628bada8b42c95ef7eb2671b91ddf9c67608560c662')
 
 prepare(){
   cd sage-$pkgver
@@ -104,6 +107,8 @@
   patch -p1 -i ../sagemath-lcalc-c++11.patch
 # Adjust paths for gap-4.8
   patch -p1 -i ../sagemath-gap-4.8.patch
+# Fix build with eclib 20180710
+  patch -p1 -i ../sagemath-eclib-20180710.patch
 
 # Upstream patches  
 # fix build against libfes 0.2 http://trac.sagemath.org/ticket/15209
@@ -110,6 +115,8 @@
   patch -p1 -i ../fes02.patch
 # update to cypari2 https://trac.sagemath.org/ticket/25813
   patch -p1 -i ../sagemath-cypari2.patch
+# port to cddlib 0.94j https://trac.sagemath.org/ticket/25344
+  patch -p1 -i ../sagemath-cddlib-094j.patch
 
 # use python2
   sed -e 's|#!/usr/bin/env sage-python23|#!/usr/bin/env python2|' -e 
's|#!/usr/bin/env python\b|#!/usr/bin/env python2|' \

Added: sagemath-cddlib-094j.patch
===
--- sagemath-cddlib-094j.patch  (rev 0)
+++ sagemath-cddlib-094j.patch  2018-07-12 14:25:43 UTC (rev 357920)
@@ -0,0 +1,980 @@
+diff --git a/src/sage/geometry/polyhedron/backend_cdd.py 
b/src/sage/geometry/polyhedron/backend_cdd.py
+index 9e0ca53ba7b..8497741b0c4 100644
+--- a/src/sage/geometry/polyhedron/backend_cdd.py
 b/src/sage/geometry/polyhedron/backend_cdd.py
+@@ -154,7 +154,9 @@ def _init_from_cdd_input(self, cdd_input_string, 
cmdline_arg='--all', verbose=Fa
+ :[0.62, -1.38, 0.38],[0.144, -1.04, 0.04],
+ :[0.1309090909, -1.0290909091, 0.04]]
+ sage: Polyhedron(point_list)
+-A 3-dimensional polyhedron in RDF^3 defined as the convex hull of 
14 vertices
++Traceback (most recent call last):
++...
++ValueError: *Error: Numerical inconsistency is found.  Use the 
GMP exact arithmetic.
+ sage: Polyhedron(point_list, base_ring=QQ)
+ A 3-dimensional polyhedron in QQ^3 defined as the convex hull of 
14 vertices
+ """
+@@ -286,7 +288,9 @@ def cdd_adjacencies():
+ else:
+ n_cdd=n;
+ self._V_adjacency_matrix = matrix(ZZ, n, n, 0)
+-expect_in_cddout('begin')
++if not find_in_cddout('begin'):
++raise ValueError('Error while parsing cdd output: could not '
++ 'find "begin" after "Vertex graph"')
+ l = cddout.pop(0).split()
+ assert int(l[0]) == n_cdd, "Not enough V-adjacencies in cdd 
output?"
+ for i in range(n_cdd):
+@@ -309,7 +313,9 @@ def cdd_adjacencies():
+ if find_in_cddout('Facet graph'):
+ n = len(self._Hrepresentation);
+ self._H_adjacency_matrix = matrix(ZZ, n,

[arch-commits] Commit in sagemath/trunk (3 files)

2018-04-09 Thread Antonio Rojas via arch-commits 
Date: Monday, April 9, 2018 @ 18:11:09
  Author: arojas
Revision: 315453

ntl 11 rebuild, backport cython 0.28 build fixes

Added:
  sagemath/trunk/sagemath-cython-0.28c.patch
  sagemath/trunk/sagemath-lcalc-c++11.patch
Modified:
  sagemath/trunk/PKGBUILD

-+
 PKGBUILD|   24 ++---
 sagemath-cython-0.28c.patch |   59 ++
 sagemath-lcalc-c++11.patch  |   10 +++
 3 files changed, 89 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-04-09 17:47:24 UTC (rev 315452)
+++ PKGBUILD2018-04-09 18:11:09 UTC (rev 315453)
@@ -9,7 +9,7 @@
 pkgbase=sagemath
 pkgname=(sagemath sagemath-jupyter)
 pkgver=8.1
-pkgrel=11
+pkgrel=12
 pkgdesc="Open Source Mathematics Software, free alternative to Magma, Maple, 
Mathematica, and Matlab"
 arch=(x86_64)
 url="http://www.sagemath.org;
@@ -39,8 +39,12 @@
 r-no-readline.patch fes02.patch sagemath-threejs.patch 
pari-stackwarn.patch
 sagemath-detect-igraph.patch sagemath-networkx2.patch 
sagemath-linbox-1.5.patch sagemath-pynac-0.7.14.patch
 sagemath-matplotlib2.patch sagemath-scipy-1.0.patch sagemath-lrs.patch 
sagemath-ipython-prompt.patch
-sagemath-singular-4.1.1.patch
-
sagemath-cython-source.patch::"https://github.com/sagemath/sage/commit/fccaf230.patch;)
+sagemath-singular-4.1.1.patch sagemath-lcalc-c++11.patch
+
sagemath-cython-source.patch::"https://github.com/sagemath/sage/commit/fccaf230.patch;
+
sagemath-cython-0.28a.patch::"https://github.com/sagemath/sage/commit/348432f7.patch;
+
sagemath-cython-0.28b.patch::"https://github.com/sagemath/sage/commit/609a04de.patch;
+sagemath-cython-0.28c.patch
+
sagemath-cython-0.28d.patch::"https://github.com/sagemath/sage/commit/c331d9bb.patch;)
 sha256sums=('a42b55c2c8ac244535dc9b87171b7d4dd7e1d498099518ab253354fbe2eaaa7b'
 '9593f49ac3f73bc7106f661bdaa484d22c12b889964986f5a99b75a605a2359b'
 'c41ae665499c6cd775d40bbe178f8786830b0931ee26bf11ee02f7d83bcc8107'
@@ -61,7 +65,12 @@
 'c0f65534a845ba802de6196229159fe67fcc3f72f0cb1ce57d4ae5c9fe10282c'
 '937a0081e7aea56bda645ef5f0d34b8e356acd62a7dd128a35163f46e7836131'
 'cc679321c2968d5e74b0ec060979c74019df2995857906bdd1397695b1f24c5c'
-'447a616937e5c43da5f72aeb186fb649e2b3756f7683967380c66b9b1448875e')
+'5114c912f821900e5bfae1e2cfeb7984de946d0b23e1182b0bf15be1d803dfd0'
+'447a616937e5c43da5f72aeb186fb649e2b3756f7683967380c66b9b1448875e'
+'8b88c72495c47c400a63cd2c6b3998cd6de649f653b6f5acbd506e2fc158f062'
+'6deaa988737f670f27f174c838501248004d9ce029c29d3e643a93cd1c500894'
+'7cfca93a35bc0ad4608286fae477195c7bee94787a3655021e55055d0adfe224'
+'a46f60c3df77f95e9b0e65573a281d6f9980b218a9dbea1417fa51ea7af2558d')
 
 prepare(){
   cd sage-$pkgver
@@ -100,6 +109,8 @@
   patch -p1 -i ../sagemath-ipython-prompt.patch
 # fix build with Singular 4.1.1
   patch -p1 -i ../sagemath-singular-4.1.1.patch
+# don't force c++98 for lcalc (fixes build with NTL 11)
+  patch -p1 -i ../sagemath-lcalc-c++11.patch
 
 # Upstream patches  
 # fix build against libfes 0.2 http://trac.sagemath.org/ticket/15209
@@ -112,6 +123,11 @@
   patch -p1 -i ../sagemath-matplotlib2.patch
 # install cython source files https://trac.sagemath.org/24690
   patch -p1 -i ../sagemath-cython-source.patch
+# fix build with cython 0.28
+  patch -p1 -i ../sagemath-cython-0.28a.patch
+  patch -p1 -i ../sagemath-cython-0.28b.patch
+  patch -p1 -i ../sagemath-cython-0.28c.patch
+  patch -p1 -i ../sagemath-cython-0.28d.patch
 
 # use python2
   sed -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' -e 's|\|exec python2|' -i src/bin/*

Added: sagemath-cython-0.28c.patch
===
--- sagemath-cython-0.28c.patch (rev 0)
+++ sagemath-cython-0.28c.patch 2018-04-09 18:11:09 UTC (rev 315453)
@@ -0,0 +1,59 @@
+From e9efe88316733178b9330b21eee2c207f01132fd Mon Sep 17 00:00:00 2001
+From: Jeroen Demeyer 
+Date: Tue, 6 Mar 2018 12:43:46 +0100
+Subject: [PATCH 2/2] Use late includes
+
+---
+ src/sage_setup/autogen/interpreters/generator.py | 26 
+ src/setup.py |  1 +
+ 2 files changed, 1 insertion(+), 26 deletions(-)
+
+diff --git a/src/sage_setup/autogen/interpreters/generator.py 
b/src/sage_setup/autogen/interpreters/generator.py
+index feefd9ee2f3..d1db4557784 100644
+--- a/src/sage_setup/autogen/interpreters/generator.py
 b/src/sage_setup/autogen/interpreters/generator.py
+@@ -277,32 +277,6 @@ def write_interpreter(self, write):
+ /* {{ warn }} */
+ #include 
+ 
+-/* Some interpreter files (for example interp_el.c) need access
+-

[arch-commits] Commit in sagemath/trunk (3 files)

2018-02-14 Thread Antonio Rojas via arch-commits 
Date: Wednesday, February 14, 2018 @ 17:15:10
  Author: arojas
Revision: 294437

singular 4.1.1 rebuild

Added:
  sagemath/trunk/sagemath-singular-4.1.1.patch
(from rev 294436, sagemath/trunk/sagemath-singular-4.1.0.p4.patch)
Modified:
  sagemath/trunk/PKGBUILD
Deleted:
  sagemath/trunk/sagemath-singular-4.1.0.p4.patch

--+
 PKGBUILD |8 +--
 sagemath-singular-4.1.0.p4.patch |   94 -
 sagemath-singular-4.1.1.patch|   94 +
 3 files changed, 98 insertions(+), 98 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-02-14 16:32:20 UTC (rev 294436)
+++ PKGBUILD2018-02-14 17:15:10 UTC (rev 294437)
@@ -9,7 +9,7 @@
 pkgbase=sagemath
 pkgname=(sagemath sagemath-jupyter)
 pkgver=8.1
-pkgrel=8
+pkgrel=9
 pkgdesc="Open Source Mathematics Software, free alternative to Magma, Maple, 
Mathematica, and Matlab"
 arch=(x86_64)
 url="http://www.sagemath.org;
@@ -39,7 +39,7 @@
 r-no-readline.patch fes02.patch sagemath-threejs.patch 
pari-stackwarn.patch
 sagemath-detect-igraph.patch sagemath-networkx2.patch 
sagemath-linbox-1.5.patch sagemath-pynac-0.7.14.patch
 sagemath-matplotlib2.patch sagemath-scipy-1.0.patch sagemath-lrs.patch 
sagemath-ipython-prompt.patch
-sagemath-singular-4.1.0.p4.patch)
+sagemath-singular-4.1.1.patch)
 sha256sums=('a42b55c2c8ac244535dc9b87171b7d4dd7e1d498099518ab253354fbe2eaaa7b'
 '39b76a189365464998cab9355d177581bc2b15dff10858f316faa85f2efa0426'
 'c41ae665499c6cd775d40bbe178f8786830b0931ee26bf11ee02f7d83bcc8107'
@@ -96,8 +96,8 @@
   patch -p1 -i ../sagemath-scipy-1.0.patch
 # fix ipython prompt in pexpect interface
   patch -p1 -i ../sagemath-ipython-prompt.patch
-# fix build with Singular 4.1.0.p4
-  patch -p1 -i ../sagemath-singular-4.1.0.p4.patch
+# fix build with Singular 4.1.1
+  patch -p1 -i ../sagemath-singular-4.1.1.patch
 
 # Upstream patches  
 # fix build against libfes 0.2 http://trac.sagemath.org/ticket/15209

Deleted: sagemath-singular-4.1.0.p4.patch
===
--- sagemath-singular-4.1.0.p4.patch2018-02-14 16:32:20 UTC (rev 294436)
+++ sagemath-singular-4.1.0.p4.patch2018-02-14 17:15:10 UTC (rev 294437)
@@ -1,94 +0,0 @@
-diff --git a/src/sage/libs/singular/decl.pxd b/src/sage/libs/singular/decl.pxd
-index 676544ab1e..5c8639d362 100644
 a/src/sage/libs/singular/decl.pxd
-+++ b/src/sage/libs/singular/decl.pxd
-@@ -188,7 +188,7 @@ cdef extern from "singular/Singular/libsingular.h":
- 
- int n_NumberOfParameters(const n_Procs_s* r)
- 
--ctypedef struct poly "polyrec":
-+ctypedef struct poly "spolyrec":
- poly *next
- number *coef
- unsigned long exp[1]
-@@ -650,7 +650,7 @@ cdef extern from "singular/Singular/libsingular.h":
- 
- # divide monomial p by monomial q, p,q const
- 
--poly *pDivide(poly *p,poly *q)
-+poly *pMDivide(poly *p,poly *q)
- 
- # return the i-th power of p; p destroyed, requires global ring
- 
-diff --git a/src/sage/rings/polynomial/multi_polynomial_libsingular.pyx 
b/src/sage/rings/polynomial/multi_polynomial_libsingular.pyx
-index 089524d6b4..ce6d58fc6f 100644
 a/src/sage/rings/polynomial/multi_polynomial_libsingular.pyx
-+++ b/src/sage/rings/polynomial/multi_polynomial_libsingular.pyx
-@@ -188,8 +188,8 @@ from sage.libs.singular.decl cimport (
- n_IsUnit, n_Invers,
- p_ISet, rChangeCurrRing, p_Copy, p_Init, p_SetCoeff, p_Setm, p_SetExp, 
p_Add_q,
- p_NSet, p_GetCoeff, p_Delete, p_GetExp, pNext, rRingVar, omAlloc0, 
omStrDup,
--omFree, pDivide, p_SetCoeff0, n_Init, p_DivisibleBy, pLcm, 
p_LmDivisibleBy,
--pDivide, p_IsConstant, p_ExpVectorEqual, p_String, p_LmInit, n_Copy,
-+omFree, pMDivide, p_SetCoeff0, n_Init, p_DivisibleBy, pLcm, 
p_LmDivisibleBy,
-+pMDivide, p_IsConstant, p_ExpVectorEqual, p_String, p_LmInit, n_Copy,
- p_IsUnit, p_Series, p_Head, idInit, fast_map_common_subexp, id_Delete,
- p_IsHomogeneous, p_Homogen, p_Totaldegree,pLDeg1_Totaldegree, 
singclap_pdivide, singclap_factorize,
- idLift, IDELEMS, On, Off, SW_USE_CHINREM_GCD, SW_USE_EZGCD,
-@@ -1690,8 +1695,8 @@ cdef class 
MPolynomialRing_libsingular(MPolynomialRing_generic):
- if not g._poly:
- raise ZeroDivisionError
- 
--if r!=currRing: rChangeCurrRing(r)  # pDivide
--res = pDivide(f._poly, g._poly)
-+if r!=currRing: rChangeCurrRing(r)  # pMDivide
-+res = pMDivide(f._poly, g._poly)
- if coeff:
- if r.cf.type == n_unknown or r.cf.cfDivBy(p_GetCoeff(f._poly, r), 
p_GetCoeff(g._poly, r), r.cf):
- n = r.cf.cfDiv( p_GetCoeff(f._poly, r) , p_GetCoeff(g._poly, 
r), r.cf)
-@@ -1850,8 +1855,8 @@ cdef class 
MPolynomialRing_libsingular(MPolynomialRing_generic):
-

[arch-commits] Commit in sagemath/trunk (3 files)

2017-12-16 Thread Antonio Rojas via arch-commits 
Date: Saturday, December 16, 2017 @ 13:02:10
  Author: arojas
Revision: 274567

Fix importing sage from python, fix expected prompt in pexpect interface

Added:
  sagemath/trunk/sagemath-ipython-prompt.patch
Modified:
  sagemath/trunk/PKGBUILD
  sagemath/trunk/sagemath-env.patch

---+
 PKGBUILD  |9 ++---
 sagemath-env.patch|6 --
 sagemath-ipython-prompt.patch |   13 +
 3 files changed, 23 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-12-16 11:22:47 UTC (rev 274566)
+++ PKGBUILD2017-12-16 13:02:10 UTC (rev 274567)
@@ -38,9 +38,9 @@
 sagemath-env.patch package.patch latte-count.patch jupyter-path.patch 
sagemath-python3-notebook.patch test-optional.patch
 r-no-readline.patch fes02.patch sagemath-ecl-no-sigfpe.patch 
sagemath-threejs.patch pari-stackwarn.patch
 sagemath-detect-igraph.patch sagemath-networkx2.patch 
sagemath-linbox-1.5.patch sagemath-pynac-0.7.14.patch
-sagemath-matplotlib2.patch sagemath-scipy-1.0.patch sagemath-lrs.patch)
+sagemath-matplotlib2.patch sagemath-scipy-1.0.patch sagemath-lrs.patch 
sagemath-ipython-prompt.patch)
 sha256sums=('a42b55c2c8ac244535dc9b87171b7d4dd7e1d498099518ab253354fbe2eaaa7b'
-'6dc9b101310f80381c61c0312a3e5c648771bfe0de2e94ac46fafe7282a3e0ee'
+'39b76a189365464998cab9355d177581bc2b15dff10858f316faa85f2efa0426'
 'c41ae665499c6cd775d40bbe178f8786830b0931ee26bf11ee02f7d83bcc8107'
 '0b680e674c11c47afa86162d8b49645620b8912722e08133d23357c29ca9310a'
 '2cad308f8adbb6c54e6603fa22b2f0eb60f6f09248d5d015000c3932ac14f646'
@@ -57,7 +57,8 @@
 '538f7b279d72f4b67edb445d386d267f3f7022c1079031ca7ea06f6ce392c906'
 'b9ab2bb5f381ea425e8763b81b8b3a108a3951c594fb1f37f7df921e7c77e26d'
 '17397b8e1843b013ef5d2e083369109f0719651edd8ef0c8493cb49e2bc4324a'
-'c0f65534a845ba802de6196229159fe67fcc3f72f0cb1ce57d4ae5c9fe10282c')
+'c0f65534a845ba802de6196229159fe67fcc3f72f0cb1ce57d4ae5c9fe10282c'
+'937a0081e7aea56bda645ef5f0d34b8e356acd62a7dd128a35163f46e7836131')
 
 prepare(){
   cd sage-$pkgver
@@ -92,6 +93,8 @@
   patch -p1 -i ../pari-stackwarn.patch
 # remove deprecated scipy parameters
   patch -p1 -i ../sagemath-scipy-1.0.patch
+# fix ipython prompt in pexpect interface
+  patch -p1 -i ../sagemath-ipython-prompt.patch
 
 # Upstream patches  
 # fix build against libfes 0.2 http://trac.sagemath.org/ticket/15209

Modified: sagemath-env.patch
===
--- sagemath-env.patch  2017-12-16 11:22:47 UTC (rev 274566)
+++ sagemath-env.patch  2017-12-16 13:02:10 UTC (rev 274567)
@@ -93,11 +93,13 @@
  # First, figure out the right values for SAGE_NUM_THREADS (default
 --- src/sage/env.py.orig   2017-12-07 19:51:25.554281539 +
 +++ src/sage/env.py2017-12-07 19:51:42.787654650 +
-@@ -118,7 +118,7 @@
+@@ -117,8 +117,8 @@
+ _add_variable_or_fallback('LOCAL_IDENTIFIER','$HOSTNAME.%s'%os.getpid())
  
  # bunch of sage directories and files
- _add_variable_or_fallback('SAGE_ROOT',   None)
+-_add_variable_or_fallback('SAGE_ROOT',   None)
 -_add_variable_or_fallback('SAGE_LOCAL',  None)
++_add_variable_or_fallback('SAGE_ROOT',   '')
 +_add_variable_or_fallback('SAGE_LOCAL',  '/usr')
  _add_variable_or_fallback('SAGE_ETC',opj('$SAGE_LOCAL', 'etc'))
  _add_variable_or_fallback('SAGE_INC',opj('$SAGE_LOCAL', 'include'))

Added: sagemath-ipython-prompt.patch
===
--- sagemath-ipython-prompt.patch   (rev 0)
+++ sagemath-ipython-prompt.patch   2017-12-16 13:02:10 UTC (rev 274567)
@@ -0,0 +1,13 @@
+diff --git a/src/sage/interfaces/sage0.py b/src/sage/interfaces/sage0.py
+index 4ba76ab0b8..e7740177f4 100644
+--- a/src/sage/interfaces/sage0.py
 b/src/sage/interfaces/sage0.py
+@@ -161,7 +161,7 @@ class Sage(ExtraTabCompletion, Expect):
+ '--no-term-title',
+ '--simple-prompt',
+ ])
+-prompt = re.compile('In \[\d+\]: ')
++prompt = re.compile('sage: ')
+ if init_code is None:
+ init_code = ['from six.moves import cPickle']
+

[arch-commits] Commit in sagemath/trunk (3 files)

2017-09-21 Thread Antonio Rojas 
Date: Thursday, September 21, 2017 @ 20:03:24
  Author: arojas
Revision: 259317

Adapt to networkx 2 API changes

Added:
  sagemath/trunk/sagemath-detect-igraph.patch
  sagemath/trunk/sagemath-networkx2.patch
Modified:
  sagemath/trunk/PKGBUILD

--+
 PKGBUILD |   12 +---
 sagemath-detect-igraph.patch |   21 +
 sagemath-networkx2.patch |   26 ++
 3 files changed, 56 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-09-21 20:02:30 UTC (rev 259316)
+++ PKGBUILD2017-09-21 20:03:24 UTC (rev 259317)
@@ -9,7 +9,7 @@
 pkgbase=sagemath
 pkgname=(sagemath sagemath-jupyter)
 pkgver=8.0
-pkgrel=4
+pkgrel=5
 pkgdesc="Open Source Mathematics Software, free alternative to Magma, Maple, 
Mathematica, and Matlab"
 arch=(i686 x86_64)
 url="http://www.sagemath.org;
@@ -37,7 +37,7 @@
 
source=("$pkgname-$pkgver.tar.gz::https://github.com/sagemath/sage/archive/$pkgver.tar.gz;
 env.patch package.patch latte-count.patch jupyter-path.patch 
sagemath-python3-notebook.patch test-optional.patch
 r-no-readline.patch fes02.patch sagemath-ecl-no-sigfpe.patch 
sagemath-cython-0.26.patch
-sagemath-pynac-0.7.11.patch)
+sagemath-pynac-0.7.11.patch sagemath-detect-igraph.patch 
sagemath-networkx2.patch)
 sha256sums=('91df3e303add71616e24b38c04789f66d57ada7b1017e5369e850c42d5e8753d'
 'e0b5b8673300857fde823209a7e90faecf9e754ab812cc5e54297eddc0c79571'
 '4a2297e4d9d28f0b3a1f58e1b463e332affcb109eafde44837b1657e309c8212'
@@ -49,7 +49,9 @@
 'a39da083c038ada797ffc5bedc9ba47455a3f77057d42f86484ae877ef9172ea'
 'c31809f887bf9acc45c5bd9dd30bb93e73601d3efbf3016594c3c1d241731c8a'
 '2953ef15d957a2f3304a5584c154bf4777bcb4b461414d3a2178423257539755'
-'3e23ff449a5a3a032684287722455633762636b93ecfc35fb00e875c69eff240')
+'3e23ff449a5a3a032684287722455633762636b93ecfc35fb00e875c69eff240'
+'90be1d1a90120bd5bd3620769480106ba809dd23e896bc4a3f8931e5340f3cda'
+'a1a0ab5b794136b518f5f66fe9f1689411fabb3b81560b159eae81f6f69000e3')
 
 prepare(){
   cd sage-$pkgver
@@ -72,6 +74,10 @@
 # fix Cremona database detection
   sed -e 
"s|is_package_installed('database_cremona_ellcurve')|os.path.exists('/usr/share/cremona/cremona.db')|"
 \
-i src/sage/databases/cremona.py
+# fix python-igraph detection
+  patch -p1 -i ../sagemath-detect-igraph.patch
+# adapt to networkx 2 changes
+  patch -p1 -i ../sagemath-networkx2.patch
 
 # Upstream patches  
 # fix build against libfes 0.2 http://trac.sagemath.org/ticket/15209

Added: sagemath-detect-igraph.patch
===
--- sagemath-detect-igraph.patch(rev 0)
+++ sagemath-detect-igraph.patch2017-09-21 20:03:24 UTC (rev 259317)
@@ -0,0 +1,21 @@
+diff --git a/src/sage/graphs/generic_graph.py 
b/src/sage/graphs/generic_graph.py
+index 252984f..ce19682 100644
+--- a/src/sage/graphs/generic_graph.py
 b/src/sage/graphs/generic_graph.py
+@@ -7876,10 +7875,12 @@ class GenericGraph(GenericGraph_pyx):
+ if algorithm is None:
+ if vertex_bound:
+ algorithm = "LP"
+-elif is_package_installed("python_igraph"):
+-algorithm = "igraph"
+ else:
+-algorithm = "FF"
++algorithm = "igraph"
++try:
++import igraph
++except ImportError:
++algorithm = "FF"
+ 
+ if (algorithm == "FF"):
+ return self._ford_fulkerson(x,y, value_only=value_only, 
integer=integer, use_edge_labels=use_edge_labels)
+

Added: sagemath-networkx2.patch
===
--- sagemath-networkx2.patch(rev 0)
+++ sagemath-networkx2.patch2017-09-21 20:03:24 UTC (rev 259317)
@@ -0,0 +1,26 @@
+diff --git a/src/sage/graphs/digraph.py b/src/sage/graphs/digraph.py
+index 8c29602da6..e7a185d586 100644
+--- a/src/sage/graphs/digraph.py
 b/src/sage/graphs/digraph.py
+@@ -751,7 +751,7 @@ class DiGraph(GenericGraph):
+ self.allow_multiple_edges(multiedges,check=False)
+ self.allow_loops(loops,check=False)
+ self.add_vertices(data.nodes())
+-self.add_edges((u,v,r(l)) for u,v,l in data.edges_iter(data=True))
++self.add_edges((u,v,r(l)) for u,v,l in data.edges(data=True))
+ elif format == 'igraph':
+ if not data.is_directed():
+ raise ValueError("A *directed* igraph graph was expected. To 
"+
+diff --git a/src/sage/graphs/graph.py b/src/sage/graphs/graph.py
+index b63135d8e6..5775042976 100644
+--- a/src/sage/graphs/graph.py
 b/src/sage/graphs/graph.py
+@@ -1199,7 +1199,7 @@ class

[arch-commits] Commit in sagemath/trunk (3 files)

2017-03-25 Thread Antonio Rojas 
Date: Saturday, March 25, 2017 @ 14:51:08
  Author: arojas
Revision: 218952

Update to 7.6

Modified:
  sagemath/trunk/PKGBUILD
Deleted:
  sagemath/trunk/sagemath-gslcblas.patch
  sagemath/trunk/sagemath-no-anal.h.patch

--+
 PKGBUILD |   17 ++---
 sagemath-gslcblas.patch  |   13 -
 sagemath-no-anal.h.patch |   12 
 3 files changed, 6 insertions(+), 36 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-03-25 13:59:29 UTC (rev 218951)
+++ PKGBUILD2017-03-25 14:51:08 UTC (rev 218952)
@@ -9,8 +9,8 @@
 
 pkgbase=sagemath
 pkgname=(sagemath sagemath-jupyter)
-pkgver=7.5.1
-pkgrel=7
+pkgver=7.6
+pkgrel=1
 pkgdesc="Open Source Mathematics Software, free alternative to Magma, Maple, 
Mathematica, and Matlab"
 arch=(i686 x86_64)
 url="http://www.sagemath.org;
@@ -29,14 +29,15 @@
   '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)
 
source=("$pkgname-$pkgver.tar.gz::https://github.com/sagemath/sage/archive/$pkgver.tar.gz;
 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 
sagemath-gslcblas.patch r-no-readline.patch
-sagemath-no-anal.h.patch sagemath-planarity3.patch fes02.patch 
sagemath-singular-4.1.0.p2.patch)
-sha256sums=('3cd9af3e3bfd7f5cc966b7c36168d04b9a1213aa9a7af3286b5d53d40e7653e3'
+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)
+sha256sums=('e6e0729ab25446e7c922058db0eee4b0b294b32c196e34842e843ea9fae41423'
 '9dba04ff13626a7b6c338a8b18a6c27d343f68a547a218533cf773af3dae6635'
 'b02b3d2d5620ca20f96adb62b6fef05e4676c0a60983310a1450fdf3d923cb04'
 'ff7e034d08ab084fdb193484f7fe3a659ebcd8ab33a2b7177237d65b26de7872'
@@ -46,9 +47,7 @@
 '81d08c6a760f171f3381455b66a6c84789c9f0eefddbe6ca5794075514ad8c3a'
 '65ad84c83d5f956fde8eab961f2caad56d64044324c4abc0e56bcd9f44061cb6'
 'be925eefeac3f28e639794ddc20d64e6faafd7181804e29417a510224d19ccc7'
-'973224f53e9a6fcfaa9c6cb842b02430a601d1c7ce0abb41b3591470d128930c'
 'ef9f401fa84fe1772af9efee6816643534f2896da4c23b809937b19771bdfbbf'
-'8126c92a5fc15738c4f7982aadb5a4033230fc2d5da05af9133a96ad1181419e'
 'a1c562ebe4538d672404ca3ac2e954a3c955afeb7463f7b4fe6eaa6fa74fe5c7'
 'a39da083c038ada797ffc5bedc9ba47455a3f77057d42f86484ae877ef9172ea'
 'e1912afec58b834fac3b9161c2d5a1794bb618126c6bd7a4be85c834231360e7')
@@ -73,8 +72,6 @@
   patch -p1 -i ../ecm-7.patch
 # increase numerical tolerance, needed by scipy 0.18
   patch -p1 -i ../increase-rtol.patch
-# fix cblas linking in gsl modules
-  patch -p1 -i ../sagemath-gslcblas.patch
 # fix freezes in R interface with readline 7 (Debian)
   patch -p1 -i ../r-no-readline.patch
 # fix build with planarity 3 (Debian)
@@ -87,8 +84,6 @@
   patch -p1 -i ../fes02.patch
 # replace is_package_installed usage http://trac.sagemath.org/ticket/20377
   patch -p1 -i ../is-package-installed.patch
-# Allow compiling without pari's anal.h https://trac.sagemath.org/ticket/22195
-  patch -p1 -i ../sagemath-no-anal.h.patch
 
 # use python2
   sed -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' -e 's|exec 
python|exec python2|' -i src/bin/*

Deleted: sagemath-gslcblas.patch
===
--- sagemath-gslcblas.patch 2017-03-25 13:59:29 UTC (rev 218951)
+++ sagemath-gslcblas.patch 2017-03-25 14:51:08 UTC (rev 218952)
@@ -1,13 +0,0 @@
-diff --git a/src/module_list.py b/src/module_list.py
-index 96e8081..4728e9a 100644
 a/src/module_list.py
-+++ b/src/module_list.py
-@@ -45,6 +45,7 @@ givaro_library_dirs = givaro_pc['library_dirs']
- gsl_pc = pkgconfig.parse('gsl')
- gsl_libs = gsl_pc['libraries']
- gsl_libs.remove('gslcblas')
-+gsl_libs.extend(cblas_libs)
- gsl_library_dirs = gsl_pc['library_dirs']
- gsl_include_dirs = gsl_pc['include_dirs']
- 
-

Deleted: sagemath-no-anal.h.patch
===
--- sagemath-no-anal.h.patch2017-03-25 13:59:29 UTC (rev

[arch-commits] Commit in sagemath/trunk (3 files)

2016-11-05 Thread Antonio Rojas 
Date: Saturday, November 5, 2016 @ 23:46:24
  Author: arojas
Revision: 194713

pynac 0.7.0 rebuild

Added:
  sagemath/trunk/sagemath-cython0.25.patch
Modified:
  sagemath/trunk/PKGBUILD
  sagemath/trunk/package.patch

---+
 PKGBUILD  |   18 +++---
 package.patch |6 ++
 sagemath-cython0.25.patch |   30 ++
 3 files changed, 43 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-11-05 21:52:12 UTC (rev 194712)
+++ PKGBUILD2016-11-05 23:46:24 UTC (rev 194713)
@@ -10,7 +10,7 @@
 pkgbase=sagemath
 pkgname=(sagemath sagemath-jupyter)
 pkgver=7.4
-pkgrel=2
+pkgrel=3
 pkgdesc="Open Source Mathematics Software, free alternative to Magma, Maple, 
Mathematica, and Matlab"
 arch=(i686 x86_64)
 url="http://www.sagemath.org;
@@ -25,20 +25,21 @@
   'coin-or-cbc: COIN backend for numerical computations' 'coin-or-csdp: for 
computing Lovász theta-function of graphs'
   'buckygen: for generating fullerene graphs' 'plantri: for generating some 
classes of graphs' 'benzene: for generating fusenes and benzenoids'
   'modular_decomposition: modular decomposition of graphs' 'ffmpeg: to export 
animations to video' 'imagemagick: to show animations'
-  'coxeter3: Coxeter groups implementation' 'cryptominisat: SAT solver' 
'gap-data: for computing Galois groups'
+  'coxeter3: Coxeter groups implementation' 'cryptominisat2: SAT solver' 
'gap-data: for computing Galois groups'
   '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')
 makedepends=(cython2 boost ratpoints symmetrica fflas-ffpack python2-jinja 
coin-or-cbc libhomfly libbraiding
-  mcqd coxeter3 cryptominisat modular_decomposition bliss-graphs tdlib 
python2-pkgconfig meataxe) # libfes
+  mcqd coxeter3 cryptominisat2 modular_decomposition bliss-graphs tdlib 
python2-pkgconfig meataxe) # libfes
 
source=("$pkgname-$pkgver.tar.gz::https://github.com/sagemath/sage/archive/$pkgver.tar.gz;
 env.patch skip-check.patch cython-sys-path.patch 
is-package-installed.patch package.patch disable-fes.patch
-jupyter-path.patch test-optional.patch python-2.7.11.patch ecm-7.patch 
increase-rtol.patch sagemath-singular4.patch)
+jupyter-path.patch test-optional.patch python-2.7.11.patch ecm-7.patch 
increase-rtol.patch sagemath-singular4.patch
+sagemath-cython0.25.patch)
 md5sums=('8311ee35a309dbc668b5148795211254'
  '784ba3fca83f24ed0bbf62e01fa4e967'
  '6cafcb381437d4751fd55b25d5090987'
  'a1bcdd3fe620dbae60ed8b0e98b2ece7'
  '5dca842e4440e4ef235ae18c1b1f20e3'
- '493a9e0eae9b2ef87544b42785ae11ea'
+ 'ccfd5b1bc4796f414f1531be52504dd7'
  '06a67e611d10aa2381efe1f08ea4ffd9'
  '0d88207416dfb98a17bf8886257d9a02'
  '921017fd2d9dadbb6b602ac0476bfd58'
@@ -45,7 +46,8 @@
  'ef927896f2071b442b1d07d7e69f5f3a'
  '0c9a57d35de80c2cd418ebec912efbbb'
  '39d3fded716d2a7ae0ab03e0896b7497'
- '4bd7305e8b69add8356f9751470cf587')
+ '4bd7305e8b69add8356f9751470cf587'
+ '0ba2b4266f14b19319ece3996be70511')
 
 prepare(){
   cd sage-$pkgver
@@ -83,6 +85,8 @@
   patch -p1 -i ../is-package-installed.patch
 # port to Singular 4 https://trac.sagemath.org/ticket/17254
   patch -p1 -i ../sagemath-singular4.patch
+# fix build with cython 0.25
+  patch -p1 -i ../sagemath-cython0.25.patch
 
 # use python2
   sed -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' -e 's|exec 
python|exec python2|' -i src/bin/*
@@ -144,7 +148,7 @@
 
 package_sagemath-jupyter() {
   pkgdesc='Jupyter kernel for SageMath'
-  depends=(sagemath python2-jupyter_client jupyter-widgetsnbextension 
python-ipywidgets mathjax thebe)
+  depends=(sagemath python2-jupyter_client jupyter-widgetsnbextension 
python-ipywidgets mathjax)
   optdepends=('sage-notebook-exporter: convert flask notebooks to Jupyter')
 
   cd sage-$pkgver/src

Modified: package.patch
===
--- package.patch   2016-11-05 21:52:12 UTC (rev 194712)
+++ package.patch   2016-11-05 23:46:24 UTC (rev 194713)
@@ -20,11 +20,10 @@
  
  class CythonizeExtension(Extension):
  """
-@@ -75,15 +73,7 @@
- try:
+@@ -76,14 +74,7 @@
  condition = kwds.pop("condition")
  except KeyError:
--pkg = kwds.pop("package")
+ pkg = kwds.pop("package")
 -try:
 -pkginfo = all_packages[pkg]
 -except KeyError:
@@ -37,4 +36,3 @@
  if condition:
  return Extension(*args, **kwds)
  else:
- 

Added: sagemath-cython0.25.patch
===
--- sagemath-cython0.25.patch   (rev 0)
+++