| 1 |
commit: ceac2c53741cde2446ce458a60b09082e6756c2a |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Apr 2 21:08:12 2018 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Apr 2 21:29:24 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ceac2c53 |
| 7 |
|
| 8 |
app-office/lyx: Fix build with automake-1.16 |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/648318 |
| 11 |
Bug: https://bugs.gentoo.org/631798 |
| 12 |
Thanks-to: pavel sanda <ps <AT> twin.jikos.cz> |
| 13 |
Package-Manager: Portage-2.3.28, Repoman-2.3.9 |
| 14 |
|
| 15 |
app-office/lyx/files/lyx-2.3.0-autotools.patch | 27 ++++++++++++++++++++++++++ |
| 16 |
app-office/lyx/lyx-2.3.0.ebuild | 1 + |
| 17 |
2 files changed, 28 insertions(+) |
| 18 |
|
| 19 |
diff --git a/app-office/lyx/files/lyx-2.3.0-autotools.patch b/app-office/lyx/files/lyx-2.3.0-autotools.patch |
| 20 |
new file mode 100644 |
| 21 |
index 00000000000..31077ef02a6 |
| 22 |
--- /dev/null |
| 23 |
+++ b/app-office/lyx/files/lyx-2.3.0-autotools.patch |
| 24 |
@@ -0,0 +1,27 @@ |
| 25 |
+Index: INSTALL |
| 26 |
+=================================================================== |
| 27 |
+--- a/INSTALL (revision 9aa280993f159f065da82d5fac30eb86a6599f4d) |
| 28 |
++++ b/INSTALL (revision 3abfd72b2720c21eba51bb2338f0b8b835dae720) |
| 29 |
+@@ -38,5 +38,5 @@ |
| 30 |
+ |
| 31 |
+ If you have checked this out from Git, you need to have: |
| 32 |
+-* automake (supported versions are 1.14--1.15) |
| 33 |
++* automake (supported versions are 1.14--1.16) |
| 34 |
+ * autoconf (supported versions are 2.65--2.69) |
| 35 |
+ Then type "./autogen.sh" to build the needed configuration |
| 36 |
+Index: autogen.sh |
| 37 |
+=================================================================== |
| 38 |
+--- a/autogen.sh (revision 86ae7dad3fc1cad3744663d0da8034625dc9ffb1) |
| 39 |
++++ b/autogen.sh (revision 3abfd72b2720c21eba51bb2338f0b8b835dae720) |
| 40 |
+@@ -17,9 +17,9 @@ |
| 41 |
+ |
| 42 |
+ case $automake_version in |
| 43 |
+- *' '1.1[45]*) |
| 44 |
++ *' '1.1[456]*) |
| 45 |
+ ;; |
| 46 |
+ *) |
| 47 |
+ echo "This automake version is not supported by LyX." |
| 48 |
+- echo "LyX only supports automake 1.14 to 1.15." |
| 49 |
++ echo "LyX only supports automake 1.14 through 1.16." |
| 50 |
+ exit 1 |
| 51 |
+ ;; |
| 52 |
|
| 53 |
diff --git a/app-office/lyx/lyx-2.3.0.ebuild b/app-office/lyx/lyx-2.3.0.ebuild |
| 54 |
index ad0929130f0..8ae1f6e35db 100644 |
| 55 |
--- a/app-office/lyx/lyx-2.3.0.ebuild |
| 56 |
+++ b/app-office/lyx/lyx-2.3.0.ebuild |
| 57 |
@@ -79,6 +79,7 @@ DOCS=( ANNOUNCE NEWS README RELEASE-NOTES UPGRADING ) |
| 58 |
PATCHES=( |
| 59 |
"${FILESDIR}"/${P}-python.patch |
| 60 |
"${FILESDIR}"/${P}-qt-5.11.patch |
| 61 |
+ "${FILESDIR}"/${P}-autotools.patch |
| 62 |
) |
| 63 |
|
| 64 |
S="${WORKDIR}/${MY_P}" |
Archives