[gentoo-commits] repo/gentoo:master commit in: app-office/lyx/files/

["Conrad Kostecki" <conikost@gentoo.org>]

commit:     3eab9edb0ef990241033e674f4bea6438b82bfc7
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Mon Sep 14 17:18:44 2020 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Sep 20 14:38:21 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3eab9edb

app-office/lyx: remove unused patch(es)

Closes: https://github.com/gentoo/gentoo/pull/17538
Package-Manager: Portage-3.0.6, Repoman-3.0.1
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 app-office/lyx/files/lyx-2.3.0-python.patch | 30 -----------------------------
 1 file changed, 30 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
deleted file mode 100644
index e41c2604bf5..00000000000
--- a/app-office/lyx/files/lyx-2.3.0-python.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-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()) {