[sagemath] 01/01: Disable jmol as the default viewer.

[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 b0d45dd5d320cff62384c540ae22288af4288cb4
Author: Tobias Hansen <thansen at broeselmaschine.fc.up.pt>
Date:   Sat Nov 19 14:18:53 2016 +0000

    Disable jmol as the default viewer.
---
 debian/patches/disable-jmol.patch | 47 +++++++++++++++++++++++++++++++++++++++
 debian/patches/series             |  3 ++-
 2 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/debian/patches/disable-jmol.patch b/debian/patches/disable-jmol.patch
new file mode 100644
index 0000000..201a584
--- /dev/null
+++ b/debian/patches/disable-jmol.patch
@@ -0,0 +1,47 @@
+--- a/sage/src/sage/graphs/generic_graph.py
++++ b/sage/src/sage/graphs/generic_graph.py
+@@ -18475,7 +18475,7 @@
+                      vertex_colors=None, vertex_size=0.06, vertex_labels=False,
+                      edge_colors=None, edge_size=0.02, edge_size2=0.0325,
+                      pos3d=None, color_by_label=False,
+-                     engine='jmol', **kwds):
++                     engine='tachyon', **kwds):
+         r"""
+         Plot a graph in three dimensions.
+ 
+@@ -18706,7 +18706,7 @@
+     def show3d(self, bgcolor=(1,1,1), vertex_colors=None, vertex_size=0.06,
+                      edge_colors=None, edge_size=0.02, edge_size2=0.0325,
+                      pos3d=None, color_by_label=False,
+-                     engine='jmol', **kwds):
++                     engine='tachyon', **kwds):
+         """
+         Plots the graph using Tachyon, and shows the resulting plot.
+ 
+--- a/sage/src/sage/plot/plot3d/base.pyx
++++ b/sage/src/sage/plot/plot3d/base.pyx
+@@ -136,11 +136,11 @@
+             viewer = None
+         # select suitable default
+         if viewer is None:
+-            viewer = 'jmol'
++            viewer = 'canvas3d'
+         # fall back to 2d image if necessary
+-        if viewer == 'canvas3d' and not can_view_canvas3d:   viewer = 'jmol'
+-        if viewer == 'wavefront' and not can_view_wavefront: viewer = 'jmol'
+-        if viewer == 'jmol' and not can_view_jmol:           viewer = 'tachyon'
++        if viewer == 'jmol' and not can_view_jmol:           viewer = 'canvas3d'
++        if viewer == 'wavefront' and not can_view_wavefront: viewer = 'canvas3d'
++        if viewer == 'canvas3d' and not can_view_canvas3d:   viewer = 'tachyon'
+         ### Second, return the corresponding graphics file
+         if viewer == 'jmol':
+             return self._rich_repr_jmol(**opts)
+@@ -1747,7 +1747,7 @@
+         return self
+ 
+ # if you add any default parameters you must update some code below
+-SHOW_DEFAULTS = {'viewer': 'jmol',
++SHOW_DEFAULTS = {'viewer': 'canvas3d',
+                  'verbosity': 0,
+                  'figsize': 5,
+                  'aspect_ratio': "automatic",
diff --git a/debian/patches/series b/debian/patches/series
index 57a25ca..eefba8a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,10 +13,10 @@ fixsage-revert-lazy-import-dependent-on-python-patch.patch
 fixsage-revert-minor-feature-dependent-on-python-patch.patch
 fixsage-dont-require-DISPLAY.patch
 fixsage-allow-override-sage-local.patch
+fixsage-pbori-boost1.62-hashes.patch
 
 # due to us using a different version of a dependency than what Sage uses
 # we'll probably drop these when importing the next version of Sage
-fixsage-pbori-boost1.62-hashes.patch
 version-python-2.7.11.patch
 version-ecm-7.patch
 version-singular-4.patch
@@ -28,6 +28,7 @@ version-planarity-3.patch
 
 # due to Debian's inherent differences with upstream;
 # we're unlikely to forward these upstream
+disable-jmol.patch
 debian-fakeroot.patch
 debian-paths.patch
 debian-maxima.patch

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