1 |
commit: 1c794609d902a5f054580dbf597a557e32a2e197 |
2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Apr 26 21:05:15 2020 +0000 |
4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu May 7 22:24:24 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c794609 |
7 |
|
8 |
x11-wm/amiwm: Drop old 0.21_p2 |
9 |
|
10 |
Package-Manager: Portage-2.3.99, Repoman-2.3.22 |
11 |
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> |
12 |
|
13 |
x11-wm/amiwm/Manifest | 1 - |
14 |
x11-wm/amiwm/amiwm-0.21_p2.ebuild | 62 -------- |
15 |
.../amiwm/files/amiwm-0.21_p2-flex-2.6.3-fix.patch | 31 ---- |
16 |
x11-wm/amiwm/files/amiwm-0.21_p2-gentoo.diff | 160 --------------------- |
17 |
x11-wm/amiwm/files/amiwm-0.21_p2-implicts.patch | 73 ---------- |
18 |
5 files changed, 327 deletions(-) |
19 |
|
20 |
diff --git a/x11-wm/amiwm/Manifest b/x11-wm/amiwm/Manifest |
21 |
index 39acc8033f5..d2c039c17bb 100644 |
22 |
--- a/x11-wm/amiwm/Manifest |
23 |
+++ b/x11-wm/amiwm/Manifest |
24 |
@@ -1,2 +1 @@ |
25 |
DIST amiwm-0.22.01_p20200826.tar.gz 153787 BLAKE2B eebd61436bff6c063c0946f61632f5a56ba01d62f01e2761de62fed1c2c5049a191dbbaf836ac0b0771b38a84dc6f52a40ee53b9c73666855cfe03b6a829f9a8 SHA512 a4329eb8ea98b631611a6e069f27a6c640bfac94aa5a2c3591c9c35c4b08ea6f123fadcd56597353b27ec67bc079e8268e1b700fe85c0d545c9bb93439362c1b |
26 |
-DIST amiwm0.21pl2.tar.gz 195128 BLAKE2B de7c843e6b756797b7a72a8e0b6fde6d4c02893e3eae8262d85d4417a7ad6309c10add802c04dde2d092bc7c8a604edbc96c4a9fc3c7f1166897a7933a978ccb SHA512 6504a4fd4c30a571b0c501b46fdc442fcc993c27b4595753f7bfa12a38c0b997a01d939c7a35e6c499aa0f8972bc0fda7cc88a9fe77091f363f8cd5a9e8d50de |
27 |
|
28 |
diff --git a/x11-wm/amiwm/amiwm-0.21_p2.ebuild b/x11-wm/amiwm/amiwm-0.21_p2.ebuild |
29 |
deleted file mode 100644 |
30 |
index 0fba9046d07..00000000000 |
31 |
--- a/x11-wm/amiwm/amiwm-0.21_p2.ebuild |
32 |
+++ /dev/null |
33 |
@@ -1,62 +0,0 @@ |
34 |
-# Copyright 1999-2018 Gentoo Foundation |
35 |
-# Distributed under the terms of the GNU General Public License v2 |
36 |
- |
37 |
-EAPI=6 |
38 |
- |
39 |
-inherit eutils multilib toolchain-funcs |
40 |
- |
41 |
-MY_P=${PN}${PV/_p/pl} |
42 |
-DESCRIPTION="Windowmanager ala Amiga(R) Workbench(R)" |
43 |
-HOMEPAGE="http://www.lysator.liu.se/~marcus/amiwm.html" |
44 |
-SRC_URI="ftp://ftp.lysator.liu.se/pub/X11/wm/${PN}/${MY_P}.tar.gz" |
45 |
- |
46 |
-LICENSE="amiwm" |
47 |
-SLOT="0" |
48 |
-KEYWORDS="~amd64 ~ppc ~x86" |
49 |
-IUSE="" |
50 |
- |
51 |
-COMMON_DEPEND="x11-libs/libX11 |
52 |
- x11-libs/libXmu |
53 |
- x11-libs/libXext" |
54 |
- |
55 |
-RDEPEND="${COMMON_DEPEND} |
56 |
- media-gfx/xloadimage |
57 |
- x11-apps/xrdb |
58 |
- x11-apps/xsetroot |
59 |
- x11-terms/xterm" |
60 |
-DEPEND="${COMMON_DEPEND} |
61 |
- x11-base/xorg-proto" |
62 |
- |
63 |
-S="${WORKDIR}/${MY_P}" |
64 |
- |
65 |
-PATCHES=( |
66 |
- "${FILESDIR}/${P}-gentoo.diff" |
67 |
- "${FILESDIR}/${P}-implicts.patch" |
68 |
- "${FILESDIR}/${P}-flex-2.6.3-fix.patch" |
69 |
-) |
70 |
- |
71 |
-pkg_setup() { |
72 |
- tc-export CC |
73 |
-} |
74 |
- |
75 |
-src_prepare() { |
76 |
- default |
77 |
- sed -e "s:\$(exec_prefix)/lib:\$(exec_prefix)/$(get_libdir):" \ |
78 |
- -e '/^STRIPFLAG/s@-s@@' \ |
79 |
- -e '/$(LN_S)/s@$(DESTDIR)$(AMIWM_HOME)@../..$(AMIWM_HOME)@' \ |
80 |
- -i Makefile.in || die |
81 |
- sed -i -e "s:/bin/ksh:/bin/sh:g" Xsession{,2}.in || die |
82 |
- |
83 |
- cat <<- EOF > "${T}"/amiwm |
84 |
- #!/bin/sh |
85 |
- exec /usr/bin/amiwm |
86 |
- EOF |
87 |
-} |
88 |
- |
89 |
-src_install() { |
90 |
- local DOCS=( README* ) |
91 |
- default |
92 |
- |
93 |
- exeinto /etc/X11/Sessions |
94 |
- doexe "${T}"/amiwm |
95 |
-} |
96 |
|
97 |
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 |
98 |
deleted file mode 100644 |
99 |
index ae89aafdae8..00000000000 |
100 |
--- a/x11-wm/amiwm/files/amiwm-0.21_p2-flex-2.6.3-fix.patch |
101 |
+++ /dev/null |
102 |
@@ -1,31 +0,0 @@ |
103 |
---- amiwm0.21pl2/lex.l |
104 |
-+++ amiwm0.21pl2/lex.l |
105 |
-@@ -1,5 +1,6 @@ |
106 |
-+%option noyywrap |
107 |
- %{ |
108 |
- #include <stdio.h> |
109 |
- #include "gram.h" |
110 |
- extern char *progname; |
111 |
- extern int ParseError; |
112 |
---- amiwm0.21pl2/kbdlexer.l |
113 |
-+++ amiwm0.21pl2/kbdlexer.l |
114 |
-@@ -1,5 +1,6 @@ |
115 |
-+%option noyywrap |
116 |
- %{ |
117 |
- #include <X11/Xmu/CharSet.h> |
118 |
- #include <string.h> |
119 |
- |
120 |
- #include "libami.h" |
121 |
-@@ -134,12 +135,9 @@ int parse_keyword(char *str, YYSTYPE *va |
122 |
- |
123 |
- . { fprintf(stderr, "%s: illegal character \"%s\" ignored\n", |
124 |
- progname, yytext); } |
125 |
- %% |
126 |
- |
127 |
--#ifndef yywrap |
128 |
--int yywrap() { return 1; } |
129 |
--#endif |
130 |
- #undef input |
131 |
- #define input() ((*inptr)?(*inptr++):0) |
132 |
- #undef unput |
133 |
- #define unput(c) (*--inptr=c) |
134 |
|
135 |
diff --git a/x11-wm/amiwm/files/amiwm-0.21_p2-gentoo.diff b/x11-wm/amiwm/files/amiwm-0.21_p2-gentoo.diff |
136 |
deleted file mode 100644 |
137 |
index fa875a4a43b..00000000000 |
138 |
--- a/x11-wm/amiwm/files/amiwm-0.21_p2-gentoo.diff |
139 |
+++ /dev/null |
140 |
@@ -1,160 +0,0 @@ |
141 |
-Fix parallel build, don't strip binaries, respect CC LDFLAGS, fix install dirs |
142 |
-Fix incompatible implicit declaration of built-in function {strlen,memset,strcpy} |
143 |
- |
144 |
-http://bugs.gentoo.org/show_bug.cgi?id=248680 |
145 |
-http://bugs.gentoo.org/show_bug.cgi?id=299918 |
146 |
- |
147 |
---- a/Makefile.in |
148 |
-+++ b/Makefile.in |
149 |
-@@ -14,7 +14,7 @@ |
150 |
- exec_prefix = @exec_prefix@ |
151 |
- bindir = $(exec_prefix)/bin |
152 |
- libdir = $(exec_prefix)/lib |
153 |
--mandir = $(prefix)/man |
154 |
-+mandir = $(prefix)/share/man |
155 |
- INSTALL = @INSTALL@ |
156 |
- LN_S = @LN_S@ |
157 |
- RM = -rm -f |
158 |
-@@ -45,13 +45,19 @@ |
159 |
- |
160 |
- AMIWM_HOME = $(libdir)/amiwm |
161 |
- |
162 |
-+.PHONY: yaccs all clean lib_all lexs |
163 |
-+ |
164 |
-+.SUFFIXES: .c |
165 |
-+ |
166 |
- all : lib_all |
167 |
- @$(MAKE) local_all |
168 |
- |
169 |
- local_all : $(PROGS) $(MODULES) |
170 |
- |
171 |
-+$(OBJS): lexs |
172 |
-+ |
173 |
- lib_all : |
174 |
-- @( cd libami; $(MAKE) all ) |
175 |
-+ @$(MAKE) -C libami all |
176 |
- |
177 |
- .c.o: |
178 |
- $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $< |
179 |
-@@ -71,83 +77,75 @@ |
180 |
- ppmtoinfo.o : ppmtoinfo.c |
181 |
- $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -DAMIWM_HOME=\"$(AMIWM_HOME)\" $< |
182 |
- |
183 |
--gram.h gram.c: gram.y |
184 |
-- $(YACC) $(YFLAGS) $< |
185 |
-- mv y.tab.c gram.c |
186 |
-- mv y.tab.h gram.h |
187 |
-+yaccs: gram.c kbdmodule.c |
188 |
-+lexs: yaccs lex.c kbdlexer.c |
189 |
-+ |
190 |
-+%.c: %.y |
191 |
-+ $(YACC) $(YFLAGS) $< -o $@ |
192 |
- |
193 |
--lex.c : lex.l |
194 |
-- $(LEX) -t $< > lex.c |
195 |
- |
196 |
--kbdmodule.h kbdmodule.c: kbdmodule.y |
197 |
-- $(YACC) $(YFLAGS) $< |
198 |
-- mv y.tab.c kbdmodule.c |
199 |
-- mv y.tab.h kbdmodule.h |
200 |
-+lex.c : lex.l |
201 |
-+ $(LEX) -t $< > lex.c |
202 |
- |
203 |
- kbdlexer.c : kbdlexer.l |
204 |
- $(LEX) -t $< > kbdlexer.c |
205 |
- |
206 |
--install : $(PROGS) $(MODULES) Xsession Xsession2 Xinitrc amiwm-init |
207 |
-- -mkdir -p $(AMIWM_HOME) |
208 |
-- $(INSTALL) $(STRIPFLAG) requestchoice $(AMIWM_HOME)/requestchoice |
209 |
-- $(INSTALL) $(STRIPFLAG) executecmd $(AMIWM_HOME)/executecmd |
210 |
-+install : Xsession Xsession2 Xinitrc amiwm-init |
211 |
-+ $(INSTALL) -D requestchoice $(DESTDIR)$(AMIWM_HOME)/requestchoice |
212 |
-+ $(INSTALL) executecmd $(DESTDIR)$(AMIWM_HOME)/executecmd |
213 |
- for module in $(MODULES); do \ |
214 |
- if [ "$$module" = "$(srcdir)/Background" ]; then \ |
215 |
-- $(INSTALL) $$module $(AMIWM_HOME)/Background; \ |
216 |
-+ $(INSTALL) $$module $(DESTDIR)$(AMIWM_HOME)/Background; \ |
217 |
- else \ |
218 |
-- $(INSTALL) $(STRIPFLAG) $$module $(AMIWM_HOME)/$$module; \ |
219 |
-+ $(INSTALL) $(STRIPFLAG) $$module $(DESTDIR)$(AMIWM_HOME)/$$module; \ |
220 |
- fi; \ |
221 |
- done |
222 |
-- $(INSTALL) -m 644 $(srcdir)/system.amiwmrc $(AMIWM_HOME)/system.amiwmrc |
223 |
-- $(INSTALL) -m 644 $(srcdir)/def_tool.info $(AMIWM_HOME)/def_tool.info |
224 |
-- $(INSTALL) -m 644 $(srcdir)/system.map $(AMIWM_HOME)/system.map |
225 |
-- $(INSTALL) -m 644 $(srcdir)/magicwb.map $(AMIWM_HOME)/magicwb.map |
226 |
-- $(INSTALL) -m 644 $(srcdir)/schwartz.map $(AMIWM_HOME)/schwartz.map |
227 |
-- $(INSTALL) -m 755 Xsession $(AMIWM_HOME)/Xsession |
228 |
-- $(INSTALL) -m 755 Xsession2 $(AMIWM_HOME)/Xsession2 |
229 |
-- $(INSTALL) -m 755 Xinitrc $(AMIWM_HOME)/Xinitrc |
230 |
-- $(INSTALL) -m 755 $(srcdir)/amiwm-init $(AMIWM_HOME)/amiwm-init |
231 |
-- -mkdir -p $(bindir) |
232 |
-- $(INSTALL) $(STRIPFLAG) amiwm $(bindir)/amiwm |
233 |
-- $(INSTALL) $(STRIPFLAG) ppmtoinfo $(bindir)/ppmtoinfo |
234 |
-- $(RM) $(bindir)/requestchoice |
235 |
-- $(LN_S) $(AMIWM_HOME)/requestchoice $(bindir)/requestchoice |
236 |
-- -mkdir -p $(mandir)/man1 |
237 |
-- $(INSTALL) -m 644 $(srcdir)/amiwm.1 $(mandir)/man1/amiwm.1 |
238 |
-+ $(INSTALL) -m 644 $(srcdir)/system.amiwmrc $(DESTDIR)$(AMIWM_HOME)/system.amiwmrc |
239 |
-+ $(INSTALL) -m 644 $(srcdir)/def_tool.info $(DESTDIR)$(AMIWM_HOME)/def_tool.info |
240 |
-+ $(INSTALL) -m 644 $(srcdir)/system.map $(DESTDIR)$(AMIWM_HOME)/system.map |
241 |
-+ $(INSTALL) -m 644 $(srcdir)/magicwb.map $(DESTDIR)$(AMIWM_HOME)/magicwb.map |
242 |
-+ $(INSTALL) -m 644 $(srcdir)/schwartz.map $(DESTDIR)$(AMIWM_HOME)/schwartz.map |
243 |
-+ $(INSTALL) -m 755 Xsession $(DESTDIR)$(AMIWM_HOME)/Xsession |
244 |
-+ $(INSTALL) -m 755 Xsession2 $(DESTDIR)$(AMIWM_HOME)/Xsession2 |
245 |
-+ $(INSTALL) -m 755 Xinitrc $(DESTDIR)$(AMIWM_HOME)/Xinitrc |
246 |
-+ $(INSTALL) -m 755 $(srcdir)/amiwm-init $(DESTDIR)$(AMIWM_HOME)/amiwm-init |
247 |
-+ $(INSTALL) -D amiwm $(DESTDIR)$(bindir)/amiwm |
248 |
-+ $(INSTALL) ppmtoinfo $(DESTDIR)$(bindir)/ppmtoinfo |
249 |
-+ $(RM) $(DESTDIR)$(bindir)/requestchoice |
250 |
-+ $(LN_S) $(DESTDIR)$(AMIWM_HOME)/requestchoice $(DESTDIR)$(bindir)/requestchoice |
251 |
-+ $(INSTALL) -D -m 644 $(srcdir)/amiwm.1 $(DESTDIR)$(mandir)/man1/amiwm.1 |
252 |
- |
253 |
- fs-install : Filesystem |
254 |
-- $(INSTALL) $(STRIPFLAG) Filesystem $(AMIWM_HOME)/Filesystem |
255 |
-- $(INSTALL) -m 644 def_disk.info $(AMIWM_HOME)/def_disk.info |
256 |
-- $(INSTALL) -m 644 def_drawer.info $(AMIWM_HOME)/def_disk.info |
257 |
-+ $(INSTALL) Filesystem $(DESTDIR)$(AMIWM_HOME)/Filesystem |
258 |
-+ $(INSTALL) -m 644 def_disk.info $(DESTDIR)$(AMIWM_HOME)/def_disk.info |
259 |
-+ $(INSTALL) -m 644 def_drawer.info $(DESTDIR)$(AMIWM_HOME)/def_disk.info |
260 |
- |
261 |
- cde-install : Xresources.amiwm Amilogo.bm Amilogo.pm |
262 |
-- -mkdir -p $(DT_DIR)/config/C/Xresources.d |
263 |
-- $(INSTALL) -m 644 Xresources.amiwm $(DT_DIR)/config/C/Xresources.d/Xresources.amiwm |
264 |
-- -mkdir -p $(DT_DIR)/appconfig/icons/C |
265 |
-- $(INSTALL) -m 644 Amilogo.bm $(DT_DIR)/appconfig/icons/C/Amilogo.bm |
266 |
-+ $(INSTALL) -D -m 644 Xresources.amiwm $(DESTDIR)$(DT_DIR)/config/C/Xresources.d/Xresources.amiwm |
267 |
-+ $(INSTALL) -D -m 644 Amilogo.bm $(DESTDIR)$(DT_DIR)/appconfig/icons/C/Amilogo.bm |
268 |
- $(INSTALL) -m 644 Amilogo.pm $(DT_DIR)/appconfig/icons/C/Amilogo.pm |
269 |
- |
270 |
- |
271 |
- amiwm : $(OBJS) $(LIBAMI) |
272 |
-- $(CC) -o amiwm $(OBJS) $(LIBS) |
273 |
-+ $(CC) $(CFLAGS) $(LDFLAGS) -o amiwm $(OBJS) $(LIBS) |
274 |
- |
275 |
- requestchoice : requestchoice.o $(LIBAMI) |
276 |
-- $(CC) -o requestchoice requestchoice.o $(LIBS) |
277 |
-+ $(CC) $(CFLAGS) $(LDFLAGS) -o requestchoice requestchoice.o $(LIBS) |
278 |
- |
279 |
- executecmd : executecmd.o $(LIBAMI) |
280 |
-- $(CC) -o executecmd executecmd.o $(LIBS) |
281 |
-+ $(CC) $(CFLAGS) $(LDFLAGS) -o executecmd executecmd.o $(LIBS) |
282 |
- |
283 |
- Filesystem : filesystem.o $(LIBAMI) |
284 |
-- $(CC) -o Filesystem filesystem.o $(LIBS) |
285 |
-+ $(CC) $(CFLAGS) $(LDFLAGS) -o Filesystem filesystem.o $(LIBS) |
286 |
- |
287 |
- Keyboard : kbdmodule.o kbdlexer.o $(LIBAMI) |
288 |
-- $(CC) -o Keyboard kbdmodule.o kbdlexer.o $(LIBS) |
289 |
-+ $(CC) $(CFLAGS) $(LDFLAGS) -o Keyboard kbdmodule.o kbdlexer.o $(LIBS) |
290 |
- |
291 |
- ppmtoinfo : ppmtoinfo.o |
292 |
-- $(CC) -o ppmtoinfo ppmtoinfo.o -lm |
293 |
-+ $(CC) $(CFLAGS) $(LDFLAGS) -o ppmtoinfo ppmtoinfo.o -lm |
294 |
- |
295 |
- localetest : localetest.o $(LIBAMI) |
296 |
-- $(CC) -o localetest localetest.o $(LIBS) |
297 |
-+ $(CC) $(CFLAGS) $(LDFLAGS) -o localetest localetest.o $(LIBS) |
298 |
- |
299 |
- clean : |
300 |
- $(RM) core $(PROGS) $(LIBAMI) Keyboard *.o libami/*.o |
301 |
|
302 |
diff --git a/x11-wm/amiwm/files/amiwm-0.21_p2-implicts.patch b/x11-wm/amiwm/files/amiwm-0.21_p2-implicts.patch |
303 |
deleted file mode 100644 |
304 |
index 4a01347d0e8..00000000000 |
305 |
--- a/x11-wm/amiwm/files/amiwm-0.21_p2-implicts.patch |
306 |
+++ /dev/null |
307 |
@@ -1,73 +0,0 @@ |
308 |
---- a/main.c |
309 |
-+++ b/main.c |
310 |
-@@ -131,6 +131,7 @@ |
311 |
- extern void read_rc_file(char *filename, int manage_all); |
312 |
- extern void init_modules(); |
313 |
- extern void flushmodules(); |
314 |
-+extern void closescreen(); |
315 |
- extern void raiselowerclient(Client *, int); |
316 |
- |
317 |
- #ifndef AMIGAOS |
318 |
---- a/menu.c |
319 |
-+++ b/menu.c |
320 |
-@@ -45,6 +45,11 @@ |
321 |
- extern void mod_menuselect(struct module *, int, int, int); |
322 |
- extern void setfocus(Window); |
323 |
- extern void flushmodules(); |
324 |
-+extern void openscreen(char *, Window); |
325 |
-+extern void realizescreens(void); |
326 |
-+extern void screentoback(); |
327 |
-+extern void wberror(Scrn *, char *); |
328 |
-+extern void closescreen(); |
329 |
- |
330 |
- Scrn *mbdclick=NULL, *mbdscr=NULL; |
331 |
- |
332 |
---- a/icc.c |
333 |
-+++ b/icc.c |
334 |
-@@ -6,6 +6,7 @@ |
335 |
- #include "prefs.h" |
336 |
- |
337 |
- #include <string.h> |
338 |
-+#include <stdlib.h> |
339 |
- |
340 |
- #ifdef AMIGAOS |
341 |
- #include <pragmas/xlib_pragmas.h> |
342 |
---- a/libami/lists.c |
343 |
-+++ b/libami/lists.c |
344 |
-@@ -1,3 +1,4 @@ |
345 |
-+#include <string.h> |
346 |
- #include "libami.h" |
347 |
- |
348 |
- #ifndef AMIGAOS |
349 |
---- a/kbdmodule.y |
350 |
-+++ b/kbdmodule.y |
351 |
-@@ -2,6 +2,8 @@ |
352 |
- #include <stdio.h> |
353 |
- #include <string.h> |
354 |
- #include "libami.h" |
355 |
-+int yyerror(char *); |
356 |
-+int yylex (void); |
357 |
- |
358 |
- void docmd(XEvent *e, void *callback) |
359 |
- { |
360 |
---- a/gram.y |
361 |
-+++ b/gram.y |
362 |
-@@ -8,6 +8,8 @@ |
363 |
- #include "screen.h" |
364 |
- #include "icc.h" |
365 |
- #include "style.h" |
366 |
-+int yyerror(char *); |
367 |
-+int yylex (void); |
368 |
- extern void set_sys_palette(void); |
369 |
- extern void set_mwb_palette(void); |
370 |
- extern void set_schwartz_palette(void); |
371 |
---- a/ppmtoinfo.c |
372 |
-+++ b/ppmtoinfo.c |
373 |
-@@ -1,6 +1,7 @@ |
374 |
- #include <stdio.h> |
375 |
- #include <stdlib.h> |
376 |
- #include <string.h> |
377 |
-+#include <time.h> |
378 |
- #ifdef HAVE_UNISTD_H |
379 |
- #include <unistd.h> |
380 |
- #endif |