diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2018-03-30 19:28:31 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2018-03-30 20:09:30 +0200 |
| commit | e3a198c8cee1f6effc78352b2460f7700b74562d (patch) | |
| tree | 52e0fced0e8b2caa87ff7ad41517f7d85aec5019 /app-office/lyx/files | |
| parent | dev-python/hyper-h2: stable 2.5.1 for hppa, bug #622648 (diff) | |
| download | gentoo-e3a198c8cee1f6effc78352b2460f7700b74562d.tar.gz gentoo-e3a198c8cee1f6effc78352b2460f7700b74562d.tar.bz2 gentoo-e3a198c8cee1f6effc78352b2460f7700b74562d.zip | |
app-office/lyx: 2.3.0 version bump
Thanks-to: pavel sanda <ps@twin.jikos.cz>
Bug: https://bugs.gentoo.org/631798
Package-Manager: Portage-2.3.27, Repoman-2.3.9
Diffstat (limited to 'app-office/lyx/files')
| -rw-r--r-- | app-office/lyx/files/lyx-2.3.0-python.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/app-office/lyx/files/lyx-2.3.0-python.patch b/app-office/lyx/files/lyx-2.3.0-python.patch new file mode 100644 index 000000000000..e41c2604bf5c --- /dev/null +++ b/app-office/lyx/files/lyx-2.3.0-python.patch @@ -0,0 +1,30 @@ +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 8eea49370a..d7a0f81aa3 100644 +--- a/src/support/os.cpp ++++ b/src/support/os.cpp +@@ -65,10 +65,10 @@ int timeout_min() + string const python(bool reset) + { + // Check whether the first python in PATH is the right one. +- static string command = python23("python -tt"); ++ static string command = python23("python2 -tt"); + // FIXME THREAD + if (reset) { +- command = python23("python -tt"); ++ command = python23("python2 -tt"); + } + + if (command.empty()) { |