mirror of
https://src.fedoraproject.org/rpms/sagemath.git
synced 2025-04-21 11:19:02 -04:00
1a0bd1afc6
Also: - Drop -lrslib, -gap-hap, and -flask patches. - Drop obsolete scriplets to fix F24 to F25 upgrade (bz 1594429 and 1618934). - Drop obsolete mktexlsr invocations. - Fix more Singular paths. - Fix still more uses of /usr/bin/env. - Drop disallow/dissallow fixup for cython; now fixed in cython itself.
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-08-03 05:10:08.000000000 -0600
|
|
+++ src/sage/interfaces/jmoldata.py 2018-08-29 08:47:39.203938604 -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(SAGE_LOCAL, "share", "jmol", "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)
|