[arch-commits] Commit in sagemath/trunk (PKGBUILD fes02.patch package.patch)
Antonio Rojas
arojas at archlinux.org
Sat Jan 4 12:33:59 UTC 2020
Date: Saturday, January 4, 2020 @ 12:33:58
Author: arojas
Revision: 547884
Drop fes extension, it's been demoted to experimental, dead upstream, and requires python2
Modified:
sagemath/trunk/PKGBUILD
sagemath/trunk/package.patch
Deleted:
sagemath/trunk/fes02.patch
---------------+
PKGBUILD | 12 +++--------
fes02.patch | 57 --------------------------------------------------------
package.patch | 15 ++++++++++++++
3 files changed, 19 insertions(+), 65 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2020-01-04 12:33:33 UTC (rev 547883)
+++ PKGBUILD 2020-01-04 12:33:58 UTC (rev 547884)
@@ -8,7 +8,7 @@
pkgbase=sagemath
pkgname=(sagemath sagemath-jupyter)
pkgver=9.0
-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"
@@ -25,7 +25,7 @@
'ffmpeg: to export animations to video' 'imagemagick: to show animations'
'coxeter: Coxeter groups implementation'
'lrs: Algorithms for linear reverse search used in game theory and for computing volume of polytopes'
- 'libfes: exhaustive search of solutions for boolean equations' 'python-pynormaliz: Normaliz backend for polyhedral computations'
+ 'python-pynormaliz: Normaliz backend for polyhedral computations'
'latte-integrale: integral point count in polyhedra' 'python-jupymake: polymake backend for polyhedral computations'
'shared_meataxe: faster matrix arithmetic over finite fields' 'openblas: faster linear algebra'
'sirocco: for computing the fundamental group of the complement of a plane curve' 'primecount: faster prime_pi implementation'
@@ -32,12 +32,11 @@
'dot2tex: for displaying some diagrams' 'cryptominisat5: SAT solver' 'python-pycosat: picosat SAT solver'
'python-pip: to install optional packages with sage -pip')
makedepends=(cython boost ratpoints python-jinja coin-or-cbc sirocco
- mcqd coxeter bliss tdlib python-pkgconfig shared_meataxe libfes primecount)
+ mcqd coxeter bliss tdlib python-pkgconfig shared_meataxe primecount)
source=("$pkgname-$pkgver.tar.gz::https://github.com/sagemath/sage/archive/$pkgver.tar.gz"
package.patch
latte-count.patch
test-optional.patch
- fes02.patch
sagemath-cremona.patch
sagemath-singular-4.1.2.patch
sagemath-ecl-sigfpe.patch
@@ -45,10 +44,9 @@
sagemath-rpy-3.patch
sagemath-python-3.8.patch)
sha256sums=('6f5d42b306a2c03073dd95086f80602bd1a0b929b8ad19c6d219c8ca8e96da26'
- '328e45e78065b5f6527174bda48cfff6828acbf107c2535b0a9a92c3ceb35842'
+ '496da0fa42cdfc92b43f5d85610bb462ca9bdc2f4d80fd316e8e9d068dba3b0b'
'6a5470d7044a50a35a6478f57c19adf72fe54aefebeea8a095915b63f9e219ac'
'876fd1c0fc3471b56e54d960d79e5ce1d5fc49cebf6eed27043a7380854c792c'
- '9b2d87990db3045a83776e1ff527a31ce60a3361b08f5ec85fb1d45106982faa'
'937074fa7a8a4e2aba9ea77ec622fe937985a1a9176c48460d51325ee877a4f5'
'd2a065a36be3c011a257b8694111e267d9ce7cba867c53eeb464a4573dac9bbb'
'e44bbde87f3312548faad75b7383ef21fade55be251ab5804de41cd3842ca8a0'
@@ -76,8 +74,6 @@
sed -e 's|mathjax|mathjax2|g' -i src/sage/env.py
# Upstream patches
-# fix build against libfes 0.2 http://trac.sagemath.org/ticket/15209
- patch -p1 -i ../fes02.patch
# 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
Deleted: fes02.patch
===================================================================
--- fes02.patch 2020-01-04 12:33:33 UTC (rev 547883)
+++ fes02.patch 2020-01-04 12:33:58 UTC (rev 547884)
@@ -1,57 +0,0 @@
-From b1f5e3ecc789db674fe17552812f2d0e2ab84be0 Mon Sep 17 00:00:00 2001
-From: Charles Bouillaguet <charles.bouillaguet at lifl.fr>
-Date: Thu, 19 Sep 2013 10:31:11 +0200
-Subject: updating the libFES binding to match a change in the interface
-
----
- src/sage/libs/fes.pyx | 12 +++++++-----
- 1 file changed, 7 insertions(+), 5 deletions(-)
-
-diff --git a/src/sage/libs/fes.pyx b/src/sage/libs/fes.pyx
-index 40b9c23..d188cf0 100644
---- a/src/sage/libs/fes.pyx
-+++ b/src/sage/libs/fes.pyx
-@@ -1,17 +1,19 @@
- """
--Binding for the FES library.
-+Binding for the libFES library.
-
- Finding solutions of systems of boolean equations by exhaustive
- search, via the fes library. This is usually (much) faster than
- computing a Groebner basis, except in special cases where the latter
- is particularly easy.
-
--The FES library is presently only able to deal with polynomials in 64
-+More information is available at [http://www.lifl.fr/~bouillag/fes].
-+
-+The libFES library is presently only able to deal with polynomials in 64
- variables. Performing a full exhaustive search over 64 variables will
- take a **long** time. The number of variables can be artificially
- reduced to 64 by specializing some of them.
-
--Note that the FES library **requires** at least of the equations to be
-+Note that the libFES library **requires** at least of the equations to be
- non-linear.
-
- AUTHORS:
-@@ -69,7 +71,7 @@ from libc.stdint cimport uint64_t
- cdef extern from "fes_interface.h":
- ctypedef int (*solution_callback_t)(void *, uint64_t)
-
-- void exhaustive_search_wrapper(int n, int n_eqs, int degree, int ***coeffs, solution_callback_t callback, void* callback_state, int verbose)
-+ void exhaustive_search_wrapper(int n, int n_eqs, int degree, int ***coeffs, solution_callback_t callback, void* callback_state, int verbose, int T)
-
-
- from sage.rings.integer import Integer
-@@ -215,7 +215,7 @@ def exhaustive_search(eqs, max_sols=Infinity, verbose=False):
-
- # ------- runs the library
- sig_on()
-- exhaustive_search_wrapper(n, len(eqs), degree, coeffs, report_solution, <void *> internal_state, verbose)
-+ exhaustive_search_wrapper(n, len(eqs), degree, coeffs, report_solution, <void *> internal_state, verbose, 0)
- sig_off()
-
- # ------- frees memory occupied by the dense representation of the equations
---
-cgit v1.0-1-gd88e
-
Modified: package.patch
===================================================================
--- package.patch 2020-01-04 12:33:33 UTC (rev 547883)
+++ package.patch 2020-01-04 12:33:58 UTC (rev 547884)
@@ -1,3 +1,18 @@
+--- src/module_list.py
++++ src/module_list.py
+@@ -510,12 +510,6 @@ ext_modules = [
+ Extension('sage.libs.ecl',
+ sources = ["sage/libs/ecl.pyx"]),
+
+- OptionalExtension("sage.libs.fes",
+- ["sage/libs/fes.pyx"],
+- language = "c",
+- libraries = ['fes'],
+- package = 'fes'),
+-
+ Extension('sage.libs.flint.flint',
+ sources = ["sage/libs/flint/flint.pyx"],
+ extra_compile_args = ["-D_XPG6"]),
--- src/sage/misc/package.py.orig 2014-11-23 15:58:13.000000000 +0100
+++ src/sage/misc/package.py 2015-01-22 20:32:25.651383902 +0100
@@ -336,7 +336,7 @@
More information about the arch-commits
mailing list