diff options
| author |   Pavel Sanda <ps@twin.jikos.cz> | 2015-11-29 18:27:16 -0800 |
|---|---|---|
| committer | Pavel Sanda <ps@twin.jikos.cz> | 2015-11-29 18:27:16 -0800 |
| commit | ce5df77004ae21bbda90a2d68217e9ba072c112d (patch) | |
| tree | 204410f0fd33899e6d90d71d46bb18845e59d146 /app-office/lyx/files | |
| parent | lyx 2.2 prerelease (diff) | |
| download | rebutia-ce5df77004ae21bbda90a2d68217e9ba072c112d.tar.gz rebutia-ce5df77004ae21bbda90a2d68217e9ba072c112d.tar.bz2 rebutia-ce5df77004ae21bbda90a2d68217e9ba072c112d.zip | |
Bump lyx alpha2
Diffstat (limited to 'app-office/lyx/files')
| -rw-r--r-- | app-office/lyx/files/2.1-python.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/app-office/lyx/files/2.1-python.patch b/app-office/lyx/files/2.1-python.patch new file mode 100644 index 0000000..5fb2165 --- /dev/null +++ b/app-office/lyx/files/2.1-python.patch @@ -0,0 +1,29 @@ +diff --git a/src/graphics/GraphicsConverter.cpp b/src/graphics/GraphicsConverter.cpp +index 97c4f68..8f05e62 100644 +--- a/src/graphics/GraphicsConverter.cpp ++++ b/src/graphics/GraphicsConverter.cpp +@@ -262,7 +262,7 @@ static void build_script(FileName const & from_file, + LYXERR(Debug::GRAPHICS, "build_script ... "); + typedef Graph::EdgePath EdgePath; + +- script << "#!/usr/bin/env python\n" ++ script << "#!/usr/bin/env python2\n" + "# -*- coding: utf-8 -*-\n" + "import os, shutil, sys\n\n" + "def unlinkNoThrow(file):\n" +diff --git a/src/support/os.cpp b/src/support/os.cpp +index 8f60c68..2f1cb91 100644 +--- a/src/support/os.cpp ++++ b/src/support/os.cpp +@@ -63,9 +63,9 @@ int timeout_min() + string const python(bool reset) + { + // Check whether the first python in PATH is the right one. +- static string command = python2("python -tt"); ++ static string command = python2("python2 -tt"); + if (reset) { +- command = python2("python -tt"); ++ command = python2("python2 -tt"); + } + + if (command.empty()) { |