From 8b4ace9c50842c5b83401ea7b179dcab940387e1 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 23 Sep 2020 10:22:15 +0100 Subject: gentoo resync : 23.09.2020 --- app-office/lyx/Manifest | 1 - app-office/lyx/files/lyx-2.3.0-python.patch | 30 ----------------------------- 2 files changed, 31 deletions(-) delete mode 100644 app-office/lyx/files/lyx-2.3.0-python.patch (limited to 'app-office/lyx') diff --git a/app-office/lyx/Manifest b/app-office/lyx/Manifest index af9dce46d7f5..bbafa1aa40e6 100644 --- a/app-office/lyx/Manifest +++ b/app-office/lyx/Manifest @@ -1,4 +1,3 @@ -AUX lyx-2.3.0-python.patch 1049 BLAKE2B 94591099e6b0d52429fa1e066475283ae35ba89a5d07f190dd80aa38ad040cbf53dda3f85f4f12894fc39822309aa7b4cc2bf947d8720caf228c734b7fcee8b1 SHA512 8f2fda91c4c35ffdf3325fc6613df1c5ecd87ced88e4d690aef5c7085edda1b66c0ae704e266521627f7a82eb8b4e2f35fed0f14b37feb367422ef1c5693e31d DIST lyx-2.3.5.2.tar.xz 16139804 BLAKE2B e6ea7b2fbec330bfe31b8f88e0a5cc25ff65991421f99b04e98d26945bba48a95f389e2a7e6023d4c9720d43f80136682eb40ac4be51799f01e038e4b0fad206 SHA512 90c5459ad0a77568d588e05a360482985988382927583b14914d6a23b788756e957d0237c18b9ab0681dfc2ad7aa34d21e97304e3a74d19ef047c38f692fba03 EBUILD lyx-2.3.5.2-r1.ebuild 4015 BLAKE2B f73c8116b0ca5e554e468501fa325c49ce1f440a99c1087495483b1ce82087ae578a04fd4f05d8264f26e16e96c36e17b502327670214003220f136d8d2f0190 SHA512 a732f221b4da3844c7d6e535e87bbe9fffb62c4d92ae3745c9b2a6c2c8d8fbb93136ec460ff0da971d1eaa68a5f1aa94b443bfdbb367bd700c3c3426c4379551 MISC metadata.xml 1429 BLAKE2B a1bcde398c387c4d6f468a296144ca8d75a2dc78b170d0b94f6cd0c8896583d878bb423f039e509f40eefa634b1be96ea9211f1c4841fbd30684e32e172410f7 SHA512 79ed9557e4883159a71f9ed2a5ebdd5507924a6ed5a0f50dad3047a1d51638847f5facfe757548b6bf9fe781026ff8987cadf84498a6f6aa8e3d260e19e7284e 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 e41c2604bf5c..000000000000 --- 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()) { -- cgit v1.2.3