1 |
commit: e7b23d8f7f6b6d140360fe27f7a388b5e61e138a |
2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Dec 23 19:20:03 2016 +0000 |
4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Dec 23 19:20:40 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7b23d8f |
7 |
|
8 |
media-libs/aalib: add epatch_user, fix implicit function declarations on gcc-6 |
9 |
|
10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
11 |
|
12 |
media-libs/aalib/aalib-1.4_rc5-r8.ebuild | 71 ++++++++++++++++++++++ |
13 |
...-OOB.patch => aalib-1.4_rc5-key-down-OOB.patch} | 0 |
14 |
.../aalib/files/aalib-1.4_rc5-more-protos.patch | 55 +++++++++++++++++ |
15 |
3 files changed, 126 insertions(+) |
16 |
|
17 |
diff --git a/media-libs/aalib/aalib-1.4_rc5-r8.ebuild b/media-libs/aalib/aalib-1.4_rc5-r8.ebuild |
18 |
new file mode 100644 |
19 |
index 00000000..bfc4f24 |
20 |
--- /dev/null |
21 |
+++ b/media-libs/aalib/aalib-1.4_rc5-r8.ebuild |
22 |
@@ -0,0 +1,71 @@ |
23 |
+# Copyright 1999-2016 Gentoo Foundation |
24 |
+# Distributed under the terms of the GNU General Public License v2 |
25 |
+# $Id$ |
26 |
+ |
27 |
+EAPI=5 |
28 |
+ |
29 |
+inherit autotools-multilib eutils toolchain-funcs |
30 |
+ |
31 |
+MY_P="${P/_/}" |
32 |
+S="${WORKDIR}/${PN}-1.4.0" |
33 |
+ |
34 |
+DESCRIPTION="A ASCII-Graphics Library" |
35 |
+HOMEPAGE="http://aa-project.sourceforge.net/aalib/" |
36 |
+SRC_URI="mirror://sourceforge/aa-project/${MY_P}.tar.gz" |
37 |
+ |
38 |
+LICENSE="GPL-2" |
39 |
+SLOT="0" |
40 |
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" |
41 |
+IUSE="X slang gpm static-libs" |
42 |
+ |
43 |
+RDEPEND=" |
44 |
+ X? ( >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] ) |
45 |
+ gpm? ( >=sys-libs/gpm-1.20.7-r2[${MULTILIB_USEDEP}] ) |
46 |
+ slang? ( >=sys-libs/slang-2.2.4-r1[${MULTILIB_USEDEP}] ) |
47 |
+ >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] |
48 |
+" |
49 |
+DEPEND="${RDEPEND} |
50 |
+ virtual/pkgconfig |
51 |
+ X? ( x11-proto/xproto ) |
52 |
+" |
53 |
+ |
54 |
+DOCS="ANNOUNCE AUTHORS ChangeLog NEWS README*" |
55 |
+ |
56 |
+src_prepare() { |
57 |
+ epatch "${FILESDIR}"/${PN}-1.4_rc4-gentoo.patch |
58 |
+ epatch "${FILESDIR}"/${PN}-1.4_rc4-m4.patch |
59 |
+ epatch "${FILESDIR}"/${PN}-1.4_rc5-fix-protos.patch #224267 |
60 |
+ epatch "${FILESDIR}"/${PN}-1.4_rc5-fix-aarender.patch #214142 |
61 |
+ epatch "${FILESDIR}"/${PN}-1.4_rc5-tinfo.patch #468566 |
62 |
+ epatch "${FILESDIR}"/${PN}-1.4_rc5-key-down-OOB.patch |
63 |
+ epatch "${FILESDIR}"/${PN}-1.4_rc5-more-protos.patch |
64 |
+ |
65 |
+ sed -i -e 's:#include <malloc.h>:#include <stdlib.h>:g' "${S}"/src/*.c |
66 |
+ |
67 |
+ # Fix bug #165617. |
68 |
+ use gpm || sed -i \ |
69 |
+ 's/gpm_mousedriver_test=yes/gpm_mousedriver_test=no/' "${S}/configure.in" |
70 |
+ |
71 |
+ #467988 automake-1.13 |
72 |
+ mv configure.{in,ac} || die |
73 |
+ sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die |
74 |
+ |
75 |
+ epatch_user |
76 |
+ eautoreconf |
77 |
+} |
78 |
+ |
79 |
+src_configure() { |
80 |
+ local myeconfargs=( |
81 |
+ $(use_with slang slang-driver) |
82 |
+ $(use_with X x11-driver) |
83 |
+ $(use_enable static-libs static) |
84 |
+ ) |
85 |
+ |
86 |
+ PKG_CONFIG=$(tc-getPKG_CONFIG) \ |
87 |
+ autotools-multilib_src_configure |
88 |
+} |
89 |
+ |
90 |
+src_install() { |
91 |
+ autotools-multilib_src_install |
92 |
+ use static-libs || prune_libtool_files --all |
93 |
+} |
94 |
|
95 |
diff --git a/media-libs/aalib/files/aalib-1.4_rc6-key-down-OOB.patch b/media-libs/aalib/files/aalib-1.4_rc5-key-down-OOB.patch |
96 |
similarity index 100% |
97 |
rename from media-libs/aalib/files/aalib-1.4_rc6-key-down-OOB.patch |
98 |
rename to media-libs/aalib/files/aalib-1.4_rc5-key-down-OOB.patch |
99 |
|
100 |
diff --git a/media-libs/aalib/files/aalib-1.4_rc5-more-protos.patch b/media-libs/aalib/files/aalib-1.4_rc5-more-protos.patch |
101 |
new file mode 100644 |
102 |
index 00000000..58d37f1 |
103 |
--- /dev/null |
104 |
+++ b/media-libs/aalib/files/aalib-1.4_rc5-more-protos.patch |
105 |
@@ -0,0 +1,55 @@ |
106 |
+diff --git a/src/aakbdreg.c b/src/aakbdreg.c |
107 |
+index f4f8efb..b344dd8 100644 |
108 |
+--- a/src/aakbdreg.c |
109 |
++++ b/src/aakbdreg.c |
110 |
+@@ -1,2 +1,3 @@ |
111 |
+ #include <stdlib.h> |
112 |
++#include <string.h> /* strcmp */ |
113 |
+ #include "config.h" |
114 |
+diff --git a/src/aalinuxkbd.c b/src/aalinuxkbd.c |
115 |
+index a5379bb..e816eb2 100644 |
116 |
+--- a/src/aalinuxkbd.c |
117 |
++++ b/src/aalinuxkbd.c |
118 |
+@@ -10,2 +10,3 @@ |
119 |
+ #include "config.h" |
120 |
++#include <stdlib.h> /* atexit */ |
121 |
+ #ifdef LINUX_DRIVER |
122 |
+@@ -135,3 +136,3 @@ static int get_keyb_map(void) |
123 |
+ |
124 |
+- if (ioctl(tty_fd, KDGKBENT, (unsigned int) &keyb_ent)) |
125 |
++ if (ioctl(tty_fd, KDGKBENT, &keyb_ent)) |
126 |
+ return (0); |
127 |
+@@ -144,3 +145,3 @@ static int get_keyb_map(void) |
128 |
+ |
129 |
+- if (ioctl(tty_fd, KDGKBENT, (unsigned int) &keyb_ent)) |
130 |
++ if (ioctl(tty_fd, KDGKBENT, &keyb_ent)) |
131 |
+ return (0); |
132 |
+@@ -200,3 +201,3 @@ static int rawmode_init(void) |
133 |
+ if (!closed) |
134 |
+- return; |
135 |
++ return (1); |
136 |
+ mypid = getpid(); |
137 |
+diff --git a/src/aamoureg.c b/src/aamoureg.c |
138 |
+index bb55fe3..4a533b6 100644 |
139 |
+--- a/src/aamoureg.c |
140 |
++++ b/src/aamoureg.c |
141 |
+@@ -1,2 +1,3 @@ |
142 |
+ #include <stdlib.h> |
143 |
++#include <string.h> /* strcmp */ |
144 |
+ #include "config.h" |
145 |
+diff --git a/src/aaregist.c b/src/aaregist.c |
146 |
+index 765155e..f9190ab 100644 |
147 |
+--- a/src/aaregist.c |
148 |
++++ b/src/aaregist.c |
149 |
+@@ -1,2 +1,3 @@ |
150 |
+ #include <stdlib.h> |
151 |
++#include <string.h> /* strcmp */ |
152 |
+ #include "config.h" |
153 |
+diff --git a/src/aaxkbd.c b/src/aaxkbd.c |
154 |
+index dacc80f..c252cd9 100644 |
155 |
+--- a/src/aaxkbd.c |
156 |
++++ b/src/aaxkbd.c |
157 |
+@@ -7,2 +7,3 @@ |
158 |
+ #include <X11/Xlib.h> |
159 |
++#include <X11/Xutil.h> |
160 |
+ #include <X11/keysymdef.h> |