| 1 |
commit: 284d5a25df8d884fe6f71f5019ccaa21f0d677eb |
| 2 |
Author: Nicholas Vinson <nvinson234 <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Thu Jan 5 03:31:17 2017 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jan 5 06:49:55 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=284d5a25 |
| 7 |
|
| 8 |
x11-wm/amiwm: patch to add flex 2.6.3 support |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
| 11 |
Closes: https://github.com/gentoo/gentoo/pull/3333 |
| 12 |
|
| 13 |
x11-wm/amiwm/amiwm-0.21_p2.ebuild | 5 ++-- |
| 14 |
.../amiwm/files/amiwm-0.21_p2-flex-2.6.3-fix.patch | 31 ++++++++++++++++++++++ |
| 15 |
2 files changed, 34 insertions(+), 2 deletions(-) |
| 16 |
|
| 17 |
diff --git a/x11-wm/amiwm/amiwm-0.21_p2.ebuild b/x11-wm/amiwm/amiwm-0.21_p2.ebuild |
| 18 |
index 466c8be..462fed4 100644 |
| 19 |
--- a/x11-wm/amiwm/amiwm-0.21_p2.ebuild |
| 20 |
+++ b/x11-wm/amiwm/amiwm-0.21_p2.ebuild |
| 21 |
@@ -1,4 +1,4 @@ |
| 22 |
-# Copyright 1999-2011 Gentoo Foundation |
| 23 |
+# Copyright 1999-2017 Gentoo Foundation |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
# $Id$ |
| 26 |
|
| 27 |
@@ -37,7 +37,8 @@ pkg_setup() { |
| 28 |
|
| 29 |
src_prepare() { |
| 30 |
epatch "${FILESDIR}"/${P}-gentoo.diff \ |
| 31 |
- "${FILESDIR}"/${P}-implicts.patch |
| 32 |
+ "${FILESDIR}"/${P}-implicts.patch \ |
| 33 |
+ "${FILESDIR}"/${P}-flex-2.6.3-fix.patch |
| 34 |
sed -i -e "s:\$(exec_prefix)/lib:\$(exec_prefix)/$(get_libdir):" \ |
| 35 |
Makefile.in || die |
| 36 |
sed -i -e "s:/bin/ksh:/bin/sh:g" Xsession{,2}.in || die |
| 37 |
|
| 38 |
diff --git a/x11-wm/amiwm/files/amiwm-0.21_p2-flex-2.6.3-fix.patch b/x11-wm/amiwm/files/amiwm-0.21_p2-flex-2.6.3-fix.patch |
| 39 |
new file mode 100644 |
| 40 |
index 00000000..ae89aaf |
| 41 |
--- /dev/null |
| 42 |
+++ b/x11-wm/amiwm/files/amiwm-0.21_p2-flex-2.6.3-fix.patch |
| 43 |
@@ -0,0 +1,31 @@ |
| 44 |
+--- amiwm0.21pl2/lex.l |
| 45 |
++++ amiwm0.21pl2/lex.l |
| 46 |
+@@ -1,5 +1,6 @@ |
| 47 |
++%option noyywrap |
| 48 |
+ %{ |
| 49 |
+ #include <stdio.h> |
| 50 |
+ #include "gram.h" |
| 51 |
+ extern char *progname; |
| 52 |
+ extern int ParseError; |
| 53 |
+--- amiwm0.21pl2/kbdlexer.l |
| 54 |
++++ amiwm0.21pl2/kbdlexer.l |
| 55 |
+@@ -1,5 +1,6 @@ |
| 56 |
++%option noyywrap |
| 57 |
+ %{ |
| 58 |
+ #include <X11/Xmu/CharSet.h> |
| 59 |
+ #include <string.h> |
| 60 |
+ |
| 61 |
+ #include "libami.h" |
| 62 |
+@@ -134,12 +135,9 @@ int parse_keyword(char *str, YYSTYPE *va |
| 63 |
+ |
| 64 |
+ . { fprintf(stderr, "%s: illegal character \"%s\" ignored\n", |
| 65 |
+ progname, yytext); } |
| 66 |
+ %% |
| 67 |
+ |
| 68 |
+-#ifndef yywrap |
| 69 |
+-int yywrap() { return 1; } |
| 70 |
+-#endif |
| 71 |
+ #undef input |
| 72 |
+ #define input() ((*inptr)?(*inptr++):0) |
| 73 |
+ #undef unput |
| 74 |
+ #define unput(c) (*--inptr=c) |
Archives