[sagemath] 04/14: Remove fixsage-mpfi.patch (seems to be applied) and refresh some patches.
Tobias Hansen
thansen at moszumanska.debian.org
Tue Oct 25 00:51:24 UTC 2016
This is an automated email from the git hooks/post-receive script.
thansen pushed a commit to branch sage-7.4
in repository sagemath.
commit b5f50384160e92f7cf18a6503eb2315efdbb832b
Author: Tobias Hansen <thansen at broeselmaschine.fc.up.pt>
Date: Mon Oct 24 22:47:13 2016 +0000
Remove fixsage-mpfi.patch (seems to be applied) and refresh some patches.
---
debian/patches/fixsage-mpfi.patch | 50 ----------------------
debian/patches/fixsage-proper-scipy-rtol.patch | 8 ++--
...ert-lazy-import-dependent-on-python-patch.patch | 38 +++++-----------
...t-minor-feature-dependent-on-python-patch.patch | 2 +-
.../patches/fixsage-use-lexists-not-exists.patch | 2 +-
debian/patches/python_security.patch | 2 +-
debian/patches/series | 1 -
7 files changed, 18 insertions(+), 85 deletions(-)
diff --git a/debian/patches/fixsage-mpfi.patch b/debian/patches/fixsage-mpfi.patch
deleted file mode 100644
index fb92317..0000000
--- a/debian/patches/fixsage-mpfi.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-Description: Remove private MPFI functions
- Don't try to link against private MPFI functions. MPFI upstream very clearly
- mark these as private in src/mpfi-impl.h, and Sage should not be attempting
- to link to or use them in its Cython modules.
-Author: Ximin Luo <infinity0 at debian.org>
-Bug: TODO
-Forwarded: TODO
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/sage/src/sage/libs/mpfi.pxd
-+++ b/sage/src/sage/libs/mpfi.pxd
-@@ -193,24 +193,6 @@
- bint (*mpfi_is_strictly_pos) (mpfi_srcptr)
- bint (*mpfi_is_strictly_neg) (mpfi_srcptr)
-
-- # default comparison functions
-- bint mpfi_is_pos_default(mpfi_srcptr)
-- bint mpfi_is_nonneg_default(mpfi_srcptr)
-- bint mpfi_is_neg_default(mpfi_srcptr)
-- bint mpfi_is_nonpos_default(mpfi_srcptr)
-- bint mpfi_is_zero_default(mpfi_srcptr)
-- bint mpfi_is_strictly_neg_default(mpfi_srcptr a)
-- bint mpfi_is_strictly_pos_default(mpfi_srcptr a)
--
-- int mpfi_cmp_default(mpfi_srcptr, mpfi_srcptr)
-- int mpfi_cmp_d_default(mpfi_srcptr, double)
-- int mpfi_cmp_ui_default(mpfi_srcptr, unsigned long)
-- int mpfi_cmp_si_default(mpfi_srcptr, long)
-- int mpfi_cmp_z_default(mpfi_srcptr, mpz_srcptr)
-- int mpfi_cmp_q_default(mpfi_srcptr, mpq_srcptr)
-- int mpfi_cmp_fr_default(mpfi_srcptr, mpfr_srcptr)
--
--
- bint mpfi_has_zero(mpfi_srcptr)
-
- bint mpfi_nan_p(mpfi_srcptr)
---- a/sage/src/sage/rings/real_mpfi.pyx
-+++ b/sage/src/sage/rings/real_mpfi.pyx
-@@ -3137,9 +3137,9 @@
- elif field.rnd == MPFR_RNDU:
- mpfi_get_right(x.value, self.value)
- elif field.rnd == MPFR_RNDZ:
-- if mpfi_is_strictly_pos_default(self.value): # interval is > 0
-+ if mpfi_is_strictly_pos(self.value): # interval is > 0
- mpfi_get_left(x.value, self.value)
-- elif mpfi_is_strictly_neg_default(self.value): # interval is < 0
-+ elif mpfi_is_strictly_neg(self.value): # interval is < 0
- mpfi_get_right(x.value, self.value)
- else:
- mpfr_set_zero(x.value, 1) # interval contains 0
diff --git a/debian/patches/fixsage-proper-scipy-rtol.patch b/debian/patches/fixsage-proper-scipy-rtol.patch
index a5fa74c..b6b854e 100644
--- a/debian/patches/fixsage-proper-scipy-rtol.patch
+++ b/debian/patches/fixsage-proper-scipy-rtol.patch
@@ -8,7 +8,7 @@ Forwarded: TODO
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/sage/src/sage/numerical/optimize.py
+++ b/sage/src/sage/numerical/optimize.py
-@@ -14,8 +14,11 @@
+@@ -15,8 +15,11 @@
from sage.modules.free_module_element import vector
from sage.rings.real_double import RDF
@@ -23,7 +23,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
(or `[b,a]`) if possible, where ``f`` is a function in the one variable.
--- a/sage/src/sage/symbolic/expression.pyx
+++ b/sage/src/sage/symbolic/expression.pyx
-@@ -10884,7 +10884,7 @@
+@@ -10969,7 +10969,7 @@
ret = ret[0]
return ret
@@ -32,7 +32,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
"""
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.
-@@ -11000,7 +11000,7 @@
+@@ -11085,7 +11085,7 @@
"""
if is_a_relational(self._gobj) and self.operator() is not operator.eq:
raise ValueError("Symbolic equation must be an equality.")
@@ -41,7 +41,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
if self.number_of_arguments() == 0:
if bool(self == 0):
return a
-@@ -11009,7 +11009,7 @@
+@@ -11094,7 +11094,7 @@
elif self.number_of_arguments() == 1:
f = self._fast_float_(self.default_variable())
return find_root(f, a=a, b=b, xtol=xtol,
diff --git a/debian/patches/fixsage-revert-lazy-import-dependent-on-python-patch.patch b/debian/patches/fixsage-revert-lazy-import-dependent-on-python-patch.patch
index f31ba45..e461355 100644
--- a/debian/patches/fixsage-revert-lazy-import-dependent-on-python-patch.patch
+++ b/debian/patches/fixsage-revert-lazy-import-dependent-on-python-patch.patch
@@ -10,32 +10,16 @@ Forwarded: not-needed
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/sage/src/sage/misc/lazy_import.pyx
+++ b/sage/src/sage/misc/lazy_import.pyx
-@@ -45,14 +45,19 @@
- #*****************************************************************************
- # Copyright (C) 2009 Robert Bradshaw <robertwb at math.washington.edu>
- #
--# This program is free software: you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation, either version 2 of the License, or
--# (at your option) any later version.
-+# Distributed under the terms of the GNU General Public License (GPL)
-+#
-+# This code is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+# General Public License for more details.
-+#
-+# The full text of the GPL is available at:
-+#
- # http://www.gnu.org/licenses/
+@@ -53,7 +53,7 @@
#*****************************************************************************
+ from __future__ import absolute_import
-from cpython.object cimport PyObject_RichCompare
+from cpython.object cimport Py_LT, Py_LE, Py_EQ, Py_NE, Py_GT, Py_GE
- import os, cPickle as pickle, operator
- import inspect
-@@ -70,7 +75,6 @@
+ import os
+ from six.moves import cPickle as pickle
+@@ -73,7 +73,6 @@
# boolean to determine whether Sage is still starting up
cdef bint startup_guard = True
@@ -43,7 +27,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
cpdef finish_startup():
"""
This function must be called exactly once at the end of the Sage
-@@ -172,7 +176,9 @@
+@@ -175,7 +174,9 @@
self._at_startup = at_startup
self._deprecation = deprecation
@@ -54,7 +38,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
"""
Return the wrapped object, importing it if necessary.
-@@ -231,41 +237,39 @@
+@@ -234,41 +235,39 @@
sage: type(Foo.__dict__['plot'])
<type 'function'>
"""
@@ -129,7 +113,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
return self._object
def _get_deprecation_ticket(self):
-@@ -465,7 +469,18 @@
+@@ -471,7 +470,18 @@
left = (<LazyImport>left)._get_object()
if isinstance(right, LazyImport):
right = (<LazyImport>right)._get_object()
@@ -149,7 +133,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
def __len__(self):
"""
-@@ -511,7 +526,7 @@
+@@ -517,7 +527,7 @@
documentation of :meth:`_get_object` for an explanation of
this.
"""
@@ -158,7 +142,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
if hasattr(obj, "__get__"):
return obj.__get__(instance, owner)
return obj
-@@ -537,7 +552,7 @@
+@@ -543,7 +553,7 @@
sage: type(foo)
<type 'sage.misc.lazy_import.LazyImport'>
sage: foo[1] = 100
@@ -167,7 +151,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
[0, 100, 2, 3, 4, 5, 6, 7, 8, 9]
"""
self._get_object()[key] = value
-@@ -551,7 +566,7 @@
+@@ -557,7 +567,7 @@
sage: type(foo)
<type 'sage.misc.lazy_import.LazyImport'>
sage: del foo[1]
diff --git a/debian/patches/fixsage-revert-minor-feature-dependent-on-python-patch.patch b/debian/patches/fixsage-revert-minor-feature-dependent-on-python-patch.patch
index f0ac175..9c81588 100644
--- a/debian/patches/fixsage-revert-minor-feature-dependent-on-python-patch.patch
+++ b/debian/patches/fixsage-revert-minor-feature-dependent-on-python-patch.patch
@@ -9,7 +9,7 @@ Forwarded: not-needed
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/sage/src/sage/rings/integer.pyx
+++ b/sage/src/sage/rings/integer.pyx
-@@ -754,16 +754,6 @@
+@@ -756,16 +756,6 @@
4
sage: v[Integer(2):Integer(4)]
[3, 4]
diff --git a/debian/patches/fixsage-use-lexists-not-exists.patch b/debian/patches/fixsage-use-lexists-not-exists.patch
index 8d1e9c6..79f40be 100644
--- a/debian/patches/fixsage-use-lexists-not-exists.patch
+++ b/debian/patches/fixsage-use-lexists-not-exists.patch
@@ -6,7 +6,7 @@ Bug: TODO, file to sage
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/sage/src/sage_setup/docbuild/ext/multidocs.py
+++ b/sage/src/sage_setup/docbuild/ext/multidocs.py
-@@ -278,7 +278,7 @@
+@@ -283,7 +283,7 @@
app.builder.info(bold('linking _static directory.'))
static_dir = os.path.join(app.builder.outdir, '_static')
master_static_dir = os.path.join('..', '_static')
diff --git a/debian/patches/python_security.patch b/debian/patches/python_security.patch
index e285db4..46db283 100644
--- a/debian/patches/python_security.patch
+++ b/debian/patches/python_security.patch
@@ -1,6 +1,6 @@
--- a/sage/src/sage/doctest/control.py
+++ b/sage/src/sage/doctest/control.py
-@@ -559,19 +559,20 @@
+@@ -558,19 +558,20 @@
``sage/tests/cmdline.py`` for a doctest that this works, see
also :trac:`13579`.
diff --git a/debian/patches/series b/debian/patches/series
index 08da36b..14fd008 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,7 +4,6 @@ python_security.patch
silence_debian_bug_780186.patch
silence_ecl_opt_signals.patch
sagedoc_avoid_exception.patch
-fixsage-mpfi.patch
fixsage-sphinx.patch
fixsage-libgap-systemwide.patch
fixsage-use-lexists-not-exists.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/sagemath.git
More information about the debian-science-commits
mailing list