gentoo resync : 14.07.2018

3 files changed, 73 insertions, 0 deletions

diff --git a/app-office/lyx/files/lyx-2.3.0-autotools.patch b/app-office/lyx/files/lyx-2.3.0-autotools.patch
new file mode 100644
index 000000000000..31077ef02a6a
--- /dev/null
+++ b/app-office/lyx/files/lyx-2.3.0-autotools.patch
@@ -0,0 +1,27 @@
+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
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>