[sagemath] 01/01: Apply patch for Cython 0.26.

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository sagemath.

commit 3deaaabb802779e6bc6ce3e51060114cfce34886
Author: Tobias Hansen <thansen at debian.org>
Date:   Sat Jul 22 16:23:17 2017 +0000

    Apply patch for Cython 0.26.
---
 debian/changelog                            |  1 +
 debian/patches/d0-cython-sys-path.patch     |  2 +-
 debian/patches/d1-install-paths.patch       |  2 +-
 debian/patches/series                       |  1 +
 debian/patches/u0-version-cython-0.26.patch | 31 +++++++++++++++++++++++++++++
 5 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 631f453..71c1aed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -35,6 +35,7 @@ sagemath (8.0~rc2-0~sage1) UNRELEASED; urgency=medium
     - d1-sage-env.patch
   * New patches:
     - df-revert-lazy-imports-22755.patch
+    - u0-version-cython-0.26.patch
 
   [ Ximin Luo ]
   * Use libgcrypt-dev instead of obsolete libgcrypt11-dev. (Closes: #864132)
diff --git a/debian/patches/d0-cython-sys-path.patch b/debian/patches/d0-cython-sys-path.patch
index 3593ef3..6979df2 100644
--- a/debian/patches/d0-cython-sys-path.patch
+++ b/debian/patches/d0-cython-sys-path.patch
@@ -5,7 +5,7 @@ Origin: https://git.archlinux.org/svntogit/community.git/tree/trunk?h=packages/s
 
 --- a/sage/src/setup.py
 +++ b/sage/src/setup.py
-@@ -416,6 +416,7 @@
+@@ -422,6 +422,7 @@
              build_dir=self.build_dir,
              force=self.force,
              aliases=aliases,
diff --git a/debian/patches/d1-install-paths.patch b/debian/patches/d1-install-paths.patch
index c6c1f7b..f7b86b9 100644
--- a/debian/patches/d1-install-paths.patch
+++ b/debian/patches/d1-install-paths.patch
@@ -20,7 +20,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
      from sage.misc.sageinspect import loadable_module_extension
 --- a/sage/src/setup.py
 +++ b/sage/src/setup.py
-@@ -191,9 +191,9 @@
+@@ -196,9 +196,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.]
diff --git a/debian/patches/series b/debian/patches/series
index 5cca13b..466f678 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,6 @@
 # Patches already applied upstream or committed in a side branch
 # Or nearly-finished patches that they'll very probably merge.
+u0-version-cython-0.26.patch               #23360
 
 # Patches that have open upstream tickets
 u1-version-pbori-boost1.62-hashes.patch    #22243
diff --git a/debian/patches/u0-version-cython-0.26.patch b/debian/patches/u0-version-cython-0.26.patch
new file mode 100644
index 0000000..cacc3e9
--- /dev/null
+++ b/debian/patches/u0-version-cython-0.26.patch
@@ -0,0 +1,31 @@
+From 44030be5598fe725d747dd4abe3a664da37e37f2 Mon Sep 17 00:00:00 2001
+From: Jeroen Demeyer <jdemeyer at cage.ugent.be>
+Date: Tue, 4 Jul 2017 10:33:00 +0200
+Subject: Upgrade to Cython 0.26
+
+Bug: https://trac.sagemath.org/ticket/23360
+
+--- a/sage/src/setup.py
++++ b/sage/src/setup.py
+@@ -95,7 +95,12 @@
+ 
+ # Manually add -fno-strict-aliasing, which is needed to compile Cython
+ # and disappears from the default flags if the user has set CFLAGS.
+-extra_compile_args = [ "-fno-strict-aliasing" ]
++#
++# Add -DCYTHON_CLINE_IN_TRACEBACK=1 which causes the .c line number to
++# always appear in exception tracebacks (by default, this is a runtime
++# setting in Cython which causes some overhead every time an exception
++# is raised).
++extra_compile_args = ["-fno-strict-aliasing", "-DCYTHON_CLINE_IN_TRACEBACK=1"]
+ extra_link_args = [ ]
+ 
+ DEVEL = False
+@@ -336,6 +341,7 @@
+ 
+         # Cython compiler directives
+         self.cython_directives = dict(
++            auto_pickle=False,
+             autotestdict=False,
+             cdivision=True,
+             embedsignature=True,

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/sagemath.git