[sagemath] 03/04: Refresh patches for sage 6.7.
Tobias Hansen
thansen at moszumanska.debian.org
Sat May 23 10:51:40 UTC 2015
This is an automated email from the git hooks/post-receive script.
thansen pushed a commit to branch master
in repository sagemath.
commit f59737bf955b803fa9905835ab45333ccb7f2f69
Author: Tobias Hansen <tobias.han at gmx.de>
Date: Sat May 23 10:25:00 2015 +0000
Refresh patches for sage 6.7.
* silence_tachyon_version_check.patch removed: solved upstream
* python_installs_in_userdir.patch did only apply partially (may need to be checked).
---
debian/patches/python_installs_in_userdir.patch | 39 ++++++++--------------
debian/patches/rubiks_executables_renames.patch | 6 ++--
debian/patches/sagedoc_avoid_exception.patch | 2 +-
debian/patches/series | 1 -
.../patches/silence_matplotlib_1_3_changes.patch | 2 +-
debian/patches/silence_tachyon_version_check.patch | 11 ------
debian/patches/silent_debian_bug_780186.patch | 2 +-
debian/patches/singular_doc.patch | 4 +--
debian/patches/trac_17872.patch | 2 +-
debian/patches/unbreak.patch | 38 ++++++++++++---------
10 files changed, 45 insertions(+), 62 deletions(-)
diff --git a/debian/patches/python_installs_in_userdir.patch b/debian/patches/python_installs_in_userdir.patch
index c0fd756..a587274 100644
--- a/debian/patches/python_installs_in_userdir.patch
+++ b/debian/patches/python_installs_in_userdir.patch
@@ -1,33 +1,20 @@
---- a/sage/build/deps
-+++ b/sage/build/deps
-@@ -519,7 +519,7 @@
- $(INST)/csage
- if [ -z "$$SAGE_INSTALL_FETCH_ONLY" ]; then \
- cd $(SAGE_SRC) && source bin/sage-env && \
-- $(PIPE) 'time python setup.py install 2>&1' 'tee -a $(SAGE_LOGS)/sage-$(SAGE_VERSION).log' && \
-+ $(PIPE) 'time python setup.py install --user 2>&1' 'tee -a $(SAGE_LOGS)/sage-$(SAGE_VERSION).log' && \
- touch $@; \
- fi
-
---- a/sage/src/bin/sage-build
-+++ b/sage/src/bin/sage-build
-@@ -27,4 +27,4 @@
-
- # build sage library
- cd "$SAGE_SRC"
--python setup.py install
-+python setup.py install --user
--- a/sage/build/pkgs/sagenb/spkg-install
+++ b/sage/build/pkgs/sagenb/spkg-install
-@@ -40,9 +40,9 @@
+@@ -46,7 +46,7 @@
# Install dependencies
for PKG in $(cat src/install_order); do
-- easy_install -H None "src/$PKG" || die "Error installing $PKG !"
-+ easy_install --user -H None "src/$PKG" || die "Error installing $PKG !"
- done
- PKG=$(ls -1 src | GREP_OPTIONS= grep sagenb-)
+- easy_install -Z -H None "src/$PKG"
++ easy_install --user -Z -H None "src/$PKG"
+ if [ $? -ne 0 ]; then
+ echo >&2 "Error: Installing $PKG failed."
+ exit 1
+@@ -56,7 +56,7 @@
# Install sagenb into site-packages
--easy_install -H None "src/$PKG" || die "Error installing sagenb !"
-+easy_install --user -H None "src/$PKG" || die "Error installing sagenb !"
+ PKG=$(ls -1 src | GREP_OPTIONS= grep sagenb-)
+-easy_install -Z -H None "src/$PKG"
++easy_install --user -Z -H None "src/$PKG"
+ if [ $? -ne 0 ]; then
+ echo >&2 "Error: Installing SageNB failed."
+ exit 1
diff --git a/debian/patches/rubiks_executables_renames.patch b/debian/patches/rubiks_executables_renames.patch
index d5578f1..4acc8f0 100644
--- a/debian/patches/rubiks_executables_renames.patch
+++ b/debian/patches/rubiks_executables_renames.patch
@@ -1,6 +1,6 @@
--- a/sage/src/sage/interfaces/rubik.py
+++ b/sage/src/sage/interfaces/rubik.py
-@@ -88,7 +88,7 @@
+@@ -87,7 +87,7 @@
"""
Interface to Michael Reid's optimal Rubik's Cube solver.
"""
@@ -9,7 +9,7 @@
def __init__(self, verbose=False, wait=True):
self.verbose = verbose
-@@ -176,7 +176,7 @@
+@@ -175,7 +175,7 @@
class CubexSolver:
@@ -18,7 +18,7 @@
def __call__(self, facets):
return self.solve(facets)
-@@ -230,7 +230,7 @@
+@@ -229,7 +229,7 @@
class DikSolver:
diff --git a/debian/patches/sagedoc_avoid_exception.patch b/debian/patches/sagedoc_avoid_exception.patch
index a6db75f..0510eab 100644
--- a/debian/patches/sagedoc_avoid_exception.patch
+++ b/debian/patches/sagedoc_avoid_exception.patch
@@ -1,6 +1,6 @@
--- a/sage/src/sage/misc/sagedoc.py
+++ b/sage/src/sage/misc/sagedoc.py
-@@ -1474,7 +1474,8 @@
+@@ -1446,7 +1446,8 @@
if hasattr(module, '_sage_doc_'):
from sage.misc.sageinspect import sage_getdef, _sage_getdoc_unformatted
docstr = 'Help on ' + str(module) + '\n'
diff --git a/debian/patches/series b/debian/patches/series
index 7d64066..fbe799f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,4 +10,3 @@ sagedoc_avoid_exception.patch
silence_matplotlib_1_3_changes.patch
rubiks_executables_renames.patch
python_installs_in_userdir.patch
-silence_tachyon_version_check.patch
diff --git a/debian/patches/silence_matplotlib_1_3_changes.patch b/debian/patches/silence_matplotlib_1_3_changes.patch
index 305f35d..4d4c16e 100644
--- a/debian/patches/silence_matplotlib_1_3_changes.patch
+++ b/debian/patches/silence_matplotlib_1_3_changes.patch
@@ -1,6 +1,6 @@
--- a/sage/src/sage/plot/graphics.py
+++ b/sage/src/sage/plot/graphics.py
-@@ -2108,7 +2108,7 @@
+@@ -2221,7 +2221,7 @@
sage: subplot = Figure().add_subplot(111)
sage: p._objects[0]._render_on_subplot(subplot)
sage: p._matplotlib_tick_formatter(subplot, **d)
diff --git a/debian/patches/silence_tachyon_version_check.patch b/debian/patches/silence_tachyon_version_check.patch
index 63962ae..e69de29 100644
--- a/debian/patches/silence_tachyon_version_check.patch
+++ b/debian/patches/silence_tachyon_version_check.patch
@@ -1,11 +0,0 @@
---- a/sage/src/sage/interfaces/tachyon.py
-+++ b/sage/src/sage/interfaces/tachyon.py
-@@ -128,7 +128,7 @@
- sage: t(syntax_error, outfile=os.devnull)
- Traceback (most recent call last):
- ...
-- RuntimeError: Tachyon Parallel/Multiprocessor Ray Tracer Version 0.98.9
-+ RuntimeError: Tachyon Parallel/Multiprocessor Ray Tracer...
- ...
- Parser failed due to an input file syntax error.
- Aborting render.
diff --git a/debian/patches/silent_debian_bug_780186.patch b/debian/patches/silent_debian_bug_780186.patch
index 6682404..6766fc0 100644
--- a/debian/patches/silent_debian_bug_780186.patch
+++ b/debian/patches/silent_debian_bug_780186.patch
@@ -1,6 +1,6 @@
--- a/sage/src/sage/ext/memory.pyx
+++ b/sage/src/sage/ext/memory.pyx
-@@ -1,17 +1,6 @@
+@@ -2,17 +2,6 @@
"""
Low-level memory allocation functions
diff --git a/debian/patches/singular_doc.patch b/debian/patches/singular_doc.patch
index 798e43f..a642347 100644
--- a/debian/patches/singular_doc.patch
+++ b/debian/patches/singular_doc.patch
@@ -30,5 +30,5 @@ and not in the user home.
+ sage: from site import getusersitepackages
+ sage: site_packages = getusersitepackages()
sage: files_by_module = installed_files_by_module(site_packages)
- sage: files_by_module['sage.structure.sage_object']
- {'sage/structure/sage_object.so'}
+ sage: from sage.misc.sageinspect import loadable_module_extension
+ sage: files_by_module['sage.structure.sage_object'] == \
diff --git a/debian/patches/trac_17872.patch b/debian/patches/trac_17872.patch
index c5ae59b..47b4b1a 100644
--- a/debian/patches/trac_17872.patch
+++ b/debian/patches/trac_17872.patch
@@ -1,6 +1,6 @@
--- a/sage/src/sage/libs/singular/function.pyx
+++ b/sage/src/sage/libs/singular/function.pyx
-@@ -1339,7 +1339,8 @@
+@@ -1350,7 +1350,8 @@
"""%(self._name,self._name)
# Trac ticket #11268: Include the Singular documentation as a block of code
singular_doc = get_docstring(self._name).split('\n')
diff --git a/debian/patches/unbreak.patch b/debian/patches/unbreak.patch
index b964ad9..439e3ec 100644
--- a/debian/patches/unbreak.patch
+++ b/debian/patches/unbreak.patch
@@ -73,7 +73,7 @@
# Allow git to work without warning messages after relocating Sage.
# See trac #15901.
-@@ -429,8 +429,6 @@
+@@ -420,8 +420,6 @@
unset R_HOME
unset R_PROFILE
@@ -82,7 +82,7 @@
############ architecture flags
# Support flags to change the build architecture. Currently, this is
-@@ -602,9 +600,6 @@
+@@ -593,9 +591,6 @@
LD_LIBRARY_PATH="$SAGE_LOCAL/bin:$LD_LIBRARY_PATH" && export LD_LIBRARY_PATH
fi
@@ -102,10 +102,10 @@
- '$SAGE_LOCAL/include/NTL/', 'include']
+includes = ['/usr/include/', '/usr/include/python$PYV/',
+ '/usr/include/NTL/', '/usr/include/Lfunction', 'include']
- cFiles = Split( "interrupt.c mpn_pylong.c mpz_pylong.c") + \
- Split( "mpz_longlong.c stdsage.c" )
+ cFiles = Split( "interrupt.c")
cppFiles = Split( "ntl_wrap.cpp" )
-@@ -138,7 +138,7 @@
+ srcFiles = cFiles + cppFiles
+@@ -136,7 +136,7 @@
lib = env.SharedLibrary( "csage", [ "src/" + x for x in srcFiles ],
LIBS=['ntl', 'pari', 'gmp', 'python$PYV'],
@@ -136,7 +136,7 @@
#########################################################
### BLAS setup
-@@ -715,7 +715,7 @@
+@@ -739,7 +739,7 @@
sources = ['sage/libs/lcalc/lcalc_Lfunction.pyx'],
libraries = ['m', 'ntl', 'mpfr', 'gmp', 'gmpxx',
'Lfunction'],
@@ -190,7 +190,7 @@
base, ext = os.path.splitext(filename)
+ if filename.find('sagedev') != -1 or filename.find('sage/dev') != -1:
+ return True
- if ext not in ('.py', '.pyx', '.pxi', '.sage', '.spyx', '.rst', '.tex'):
+ if ext not in ('.py', '.pyx', '.pxd', '.pxi', '.sage', '.spyx', '.rst', '.tex'):
return True
with open(filename) as F:
--- a/sage/src/sage/env.py
@@ -331,8 +331,8 @@
print 'The gap-4.5.5.spkg (or later) seems to be not installed!'
--- a/sage/src/sage/libs/pari/decl.pxi
+++ b/sage/src/sage/libs/pari/decl.pxi
-@@ -3958,5 +3958,5 @@
-
+@@ -4266,5 +4266,5 @@
+
extern gp_data* GP_DATA
-cdef extern from 'pari/anal.h':
@@ -341,7 +341,7 @@
+cdef extern char* closure_func_err()
--- a/sage/src/sage/libs/singular/singular.pyx
+++ b/sage/src/sage/libs/singular/singular.pyx
-@@ -713,11 +713,9 @@
+@@ -712,15 +712,13 @@
cdef void *handle = NULL
@@ -349,13 +349,21 @@
- lib = os.environ['SAGE_LOCAL']+"/lib/libsingular."+extension
- if os.path.exists(lib):
- handle = dlopen(lib, RTLD_GLOBAL|RTLD_LAZY)
+- if not handle:
+- err = dlerror()
+- if err:
+- print err
- break
+ lib = "/usr/lib/libsingular.so"
+ if os.path.exists(lib):
+ handle = dlopen(lib, RTLD_GLOBAL|RTLD_LAZY)
++ if not handle:
++ err = dlerror()
++ if err:
++ print err
if handle == NULL:
- print dlerror()
+ raise ImportError, "cannot load libSINGULAR library"
--- a/sage/src/sage/misc/cython.py
+++ b/sage/src/sage/misc/cython.py
@@ -68,9 +68,9 @@
@@ -371,7 +379,7 @@
os.path.join(SAGE_SRC,'sage','ext'), \
os.path.join(SAGE_SRC), \
os.path.join(SAGE_SRC,'sage','gsl')]
-@@ -337,7 +337,7 @@
+@@ -336,7 +336,7 @@
sage: code = [
... "#clang C++",
@@ -440,7 +448,7 @@
"""
--- a/sage/src/sage/tests/cmdline.py
+++ b/sage/src/sage/tests/cmdline.py
-@@ -548,12 +548,6 @@
+@@ -537,12 +537,6 @@
sage: ret
0
@@ -466,7 +474,7 @@
for path in libgap.eval('GAP_ROOT_PATHS').sage():
--- a/sage/src/setup.py
+++ b/sage/src/setup.py
-@@ -146,9 +146,9 @@
+@@ -139,9 +139,9 @@
# (that are likely to change on an upgrade) here:
# [At least at the moment. Make sure the headers aren't copied with "-p",
# or explicitly touch them in the respective spkg's spkg-install.]
@@ -479,7 +487,7 @@
}
# In the loop below, don't append to any list, since many of these
-@@ -174,7 +174,7 @@
+@@ -167,7 +167,7 @@
m.extra_compile_args = m.extra_compile_args + extra_compile_args
m.extra_link_args = m.extra_link_args + extra_link_args
--
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