mirror of
https://src.fedoraproject.org/rpms/sagemath.git
synced 2025-04-18 10:19:03 -04:00
eaa777c690
Also: - Build for python 3 instead of python 2 due to upcoming python 2 removal. - Add -python3 and -escape patches to fix problems with python 3. - Drop -nofstring patch, only needed for python 2. - Drop upstreamed -eclib patch. - Switch from atlas to openblas and rename -atlas patch to -openblas. - Add -buildroot patch and only build cython interfaces once.
25 lines
1.3 KiB
Diff
25 lines
1.3 KiB
Diff
diff -up src/sage/interfaces/jmoldata.py.orig src/sage/interfaces/jmoldata.py
|
|
--- src/sage/interfaces/jmoldata.py.orig 2018-10-17 17:13:47.000000000 -0600
|
|
+++ src/sage/interfaces/jmoldata.py 2018-10-25 13:22:07.965272901 -0600
|
|
@@ -148,8 +148,6 @@ class JmolData(SageObject):
|
|
sage: print(os.path.exists(testfile)) # optional -- java
|
|
True
|
|
"""
|
|
- # Set up paths, file names and scripts
|
|
- jmolpath = os.path.join(JMOL_DIR, "JmolData.jar")
|
|
target_native = targetfile
|
|
|
|
if sys.platform == 'cygwin':
|
|
@@ -173,10 +171,8 @@ class JmolData(SageObject):
|
|
env = dict(os.environ)
|
|
env['LC_ALL'] = 'C'
|
|
env['LANG'] = 'C'
|
|
- subprocess.call(["java", "-Xmx512m", "-Djava.awt.headless=true",
|
|
- "-jar", jmolpath, "-iox", "-g", size_arg,
|
|
- "-J", launchscript, "-j", imagescript],
|
|
- stdout=jout, stderr=jout, env=env)
|
|
+ subprocess.call(["jmol", "-n", "-g", size_arg,
|
|
+ "-J", launchscript, "-j", imagescript], stdout=jout)
|
|
if not os.path.isfile(targetfile):
|
|
raise RuntimeError("Jmol failed to create file %s, see %s for details"%(repr(targetfile), repr(scratchout)))
|
|
os.unlink(scratchout)
|