app-office/lyx: Fix build with automake-1.16

Bug: https://bugs.gentoo.org/648318
Bug: https://bugs.gentoo.org/631798
Thanks-to: pavel sanda <ps@twin.jikos.cz>
Package-Manager: Portage-2.3.28, Repoman-2.3.9

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 (file)
index 0000000..31077ef
--- /dev/null
+++ b/app-office/lyx/files/lyx-2.3.0-autotools.patch
@@ -0,0 +1,27 @@
+Index: INSTALL\r
+===================================================================\r
+--- a/INSTALL  (revision 9aa280993f159f065da82d5fac30eb86a6599f4d)\r
++++ b/INSTALL  (revision 3abfd72b2720c21eba51bb2338f0b8b835dae720)\r
+@@ -38,5 +38,5 @@\r
+ \r
+ If you have checked this out from Git, you need to have:\r
+-* automake (supported versions are 1.14--1.15)\r
++* automake (supported versions are 1.14--1.16)\r
+ * autoconf (supported versions are 2.65--2.69)\r
+ Then type "./autogen.sh" to build the needed configuration\r
+Index: autogen.sh\r
+===================================================================\r
+--- a/autogen.sh       (revision 86ae7dad3fc1cad3744663d0da8034625dc9ffb1)\r
++++ b/autogen.sh       (revision 3abfd72b2720c21eba51bb2338f0b8b835dae720)\r
+@@ -17,9 +17,9 @@\r
+ \r
+ case $automake_version in\r
+-    *' '1.1[45]*)\r
++    *' '1.1[456]*)\r
+       ;;\r
+     *)\r
+       echo "This automake version is not supported by LyX."\r
+-      echo "LyX only supports automake 1.14 to 1.15."\r
++      echo "LyX only supports automake 1.14 through 1.16."\r
+       exit 1\r
+       ;;\r

diff --git a/app-office/lyx/lyx-2.3.0.ebuild b/app-office/lyx/lyx-2.3.0.ebuild
index ad0929130f0c11def2efc55d70fcaf07409f8a5c..8ae1f6e35db9d2629644b78feff4dac9db269ec8 100644 (file)
--- a/app-office/lyx/lyx-2.3.0.ebuild
+++ b/app-office/lyx/lyx-2.3.0.ebuild
@@ -79,6 +79,7 @@ DOCS=( ANNOUNCE NEWS README RELEASE-NOTES UPGRADING )
 PATCHES=(
        "${FILESDIR}"/${P}-python.patch
        "${FILESDIR}"/${P}-qt-5.11.patch
+       "${FILESDIR}"/${P}-autotools.patch
 )
 
 S="${WORKDIR}/${MY_P}"