From d87262dd706fec50cd150aab3e93883b6337466d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 20:56:41 +0100 Subject: gentoo resync : 14.07.2018 --- app-office/lyx/files/lyx-2.3.0-autotools.patch | 27 ----------------------- app-office/lyx/files/lyx-2.3.0-python.patch | 30 -------------------------- app-office/lyx/files/lyx-2.3.0-qt-5.11.patch | 16 -------------- 3 files changed, 73 deletions(-) delete mode 100644 app-office/lyx/files/lyx-2.3.0-autotools.patch delete mode 100644 app-office/lyx/files/lyx-2.3.0-python.patch delete mode 100644 app-office/lyx/files/lyx-2.3.0-qt-5.11.patch (limited to 'app-office/lyx/files') diff --git a/app-office/lyx/files/lyx-2.3.0-autotools.patch b/app-office/lyx/files/lyx-2.3.0-autotools.patch deleted file mode 100644 index 31077ef02a6a..000000000000 --- a/app-office/lyx/files/lyx-2.3.0-autotools.patch +++ /dev/null @@ -1,27 +0,0 @@ -Index: INSTALL -=================================================================== ---- a/INSTALL (revision 9aa280993f159f065da82d5fac30eb86a6599f4d) -+++ b/INSTALL (revision 3abfd72b2720c21eba51bb2338f0b8b835dae720) -@@ -38,5 +38,5 @@ - - If you have checked this out from Git, you need to have: --* automake (supported versions are 1.14--1.15) -+* automake (supported versions are 1.14--1.16) - * autoconf (supported versions are 2.65--2.69) - Then type "./autogen.sh" to build the needed configuration -Index: autogen.sh -=================================================================== ---- a/autogen.sh (revision 86ae7dad3fc1cad3744663d0da8034625dc9ffb1) -+++ b/autogen.sh (revision 3abfd72b2720c21eba51bb2338f0b8b835dae720) -@@ -17,9 +17,9 @@ - - case $automake_version in -- *' '1.1[45]*) -+ *' '1.1[456]*) - ;; - *) - echo "This automake version is not supported by LyX." -- echo "LyX only supports automake 1.14 to 1.15." -+ echo "LyX only supports automake 1.14 through 1.16." - exit 1 - ;; 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()) { diff --git a/app-office/lyx/files/lyx-2.3.0-qt-5.11.patch b/app-office/lyx/files/lyx-2.3.0-qt-5.11.patch deleted file mode 100644 index 6f1848142bb3..000000000000 --- a/app-office/lyx/files/lyx-2.3.0-qt-5.11.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/src/frontends/qt4/GuiDocument.cpp 2018-02-25 01:11:18.000000000 +0100 -+++ b/src/frontends/qt4/GuiDocument.cpp 2018-03-30 19:45:47.283928297 +0200 -@@ -68,11 +68,12 @@ - #include "frontends/alert.h" - - #include --#include -+#include - #include - #include - #include - #include -+#include - #include - #include - #include -- cgit v1.2.3