diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-03-31 10:55:17 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-03-31 10:55:17 +0100 |
| commit | 75fc75ae1f0481ffdb78450e801a9b443ba641bd (patch) | |
| tree | cef96ea0860ae39a202bbf1e226100335209627d /app-office/lyx/files | |
| parent | 1173ad5704ce725916e0c332416aff326d850d06 (diff) | |
gentoo resync : 31.03.2018
Diffstat (limited to 'app-office/lyx/files')
| -rw-r--r-- | app-office/lyx/files/lyx-2.3.0-python.patch | 30 | ||||
| -rw-r--r-- | app-office/lyx/files/lyx-2.3.0-qt-5.11.patch | 16 |
2 files changed, 46 insertions, 0 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 new file mode 100644 index 000000000000..e41c2604bf5c --- /dev/null +++ b/app-office/lyx/files/lyx-2.3.0-python.patch @@ -0,0 +1,30 @@ +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 new file mode 100644 index 000000000000..6f1848142bb3 --- /dev/null +++ b/app-office/lyx/files/lyx-2.3.0-qt-5.11.patch @@ -0,0 +1,16 @@ +--- 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 <QAbstractItemModel> +-#include <QHeaderView> ++#include <QButtonGroup> + #include <QColor> + #include <QColorDialog> + #include <QCloseEvent> + #include <QFontDatabase> ++#include <QHeaderView> + #include <QScrollBar> + #include <QTextBoundaryFinder> + #include <QTextCursor> |