dlan 14/04/18 04:29:32 Added: 2.1-python.patch 2.0.8-python.patch Log: bump 2.0.8, 2.1.0, thanks @pavel sanda (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0xAABEFD55)
Revision Changes Path 1.1 app-office/lyx/files/2.1-python.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/lyx/files/2.1-python.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/lyx/files/2.1-python.patch?rev=1.1&content-type=text/plain Index: 2.1-python.patch =================================================================== 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()) { 1.1 app-office/lyx/files/2.0.8-python.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/lyx/files/2.0.8-python.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/lyx/files/2.0.8-python.patch?rev=1.1&content-type=text/plain Index: 2.0.8-python.patch =================================================================== 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()) {
