| 1 |
aballier 12/03/01 11:45:37 |
| 2 |
|
| 3 |
Added: 2.0-python.patch |
| 4 |
Log: |
| 5 |
version bump, thanks Pavel. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha89/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 app-office/lyx/files/2.0-python.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/lyx/files/2.0-python.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/lyx/files/2.0-python.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: 2.0-python.patch |
| 16 |
=================================================================== |
| 17 |
diff --git a/src/graphics/GraphicsConverter.cpp b/src/graphics/GraphicsConverter.cpp |
| 18 |
index 97c4f68..8f05e62 100644 |
| 19 |
--- a/src/graphics/GraphicsConverter.cpp |
| 20 |
+++ b/src/graphics/GraphicsConverter.cpp |
| 21 |
@@ -262,7 +262,7 @@ static void build_script(FileName const & from_file, |
| 22 |
LYXERR(Debug::GRAPHICS, "build_script ... "); |
| 23 |
typedef Graph::EdgePath EdgePath; |
| 24 |
|
| 25 |
- script << "#!/usr/bin/env python\n" |
| 26 |
+ script << "#!/usr/bin/env python2\n" |
| 27 |
"# -*- coding: utf-8 -*-\n" |
| 28 |
"import os, shutil, sys\n\n" |
| 29 |
"def unlinkNoThrow(file):\n" |
| 30 |
diff --git a/src/support/os.cpp b/src/support/os.cpp |
| 31 |
index f36331c..02f5a93 100644 |
| 32 |
--- a/src/support/os.cpp |
| 33 |
+++ b/src/support/os.cpp |
| 34 |
@@ -57,7 +57,7 @@ static string const python2(string const & binary, bool verbose = false) |
| 35 |
string const python() |
| 36 |
{ |
| 37 |
// Check whether the first python in PATH is the right one. |
| 38 |
- static string command = python2("python -tt"); |
| 39 |
+ static string command = python2("python2 -tt"); |
| 40 |
|
| 41 |
if (command.empty()) { |
| 42 |
// It was not, so check whether we can find it elsewhere in |
Archives