diff options
author | James Le Cuirot <chewi@gentoo.org> | 2020-04-26 22:05:15 +0100 |
---|---|---|
committer | James Le Cuirot <chewi@gentoo.org> | 2020-05-07 23:24:24 +0100 |
commit | 1c794609d902a5f054580dbf597a557e32a2e197 (patch) | |
tree | 60a9e3dfcab074db70597fe1a8cbb0c06cbc155b /x11-wm/amiwm | |
parent | x11-wm/amiwm: Version bump to 0.22.01_p20200826 snapshot (diff) | |
download | gentoo-1c794609d902a5f054580dbf597a557e32a2e197.tar.gz gentoo-1c794609d902a5f054580dbf597a557e32a2e197.tar.bz2 gentoo-1c794609d902a5f054580dbf597a557e32a2e197.zip |
x11-wm/amiwm: Drop old 0.21_p2
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: James Le Cuirot <chewi@gentoo.org>
Diffstat (limited to 'x11-wm/amiwm')
-rw-r--r-- | x11-wm/amiwm/Manifest | 1 | ||||
-rw-r--r-- | x11-wm/amiwm/amiwm-0.21_p2.ebuild | 62 | ||||
-rw-r--r-- | x11-wm/amiwm/files/amiwm-0.21_p2-flex-2.6.3-fix.patch | 31 | ||||
-rw-r--r-- | x11-wm/amiwm/files/amiwm-0.21_p2-gentoo.diff | 160 | ||||
-rw-r--r-- | x11-wm/amiwm/files/amiwm-0.21_p2-implicts.patch | 73 |
5 files changed, 0 insertions, 327 deletions
diff --git a/x11-wm/amiwm/Manifest b/x11-wm/amiwm/Manifest index 39acc8033f5d..d2c039c17bb6 100644 --- a/x11-wm/amiwm/Manifest +++ b/x11-wm/amiwm/Manifest @@ -1,2 +1 @@ DIST amiwm-0.22.01_p20200826.tar.gz 153787 BLAKE2B eebd61436bff6c063c0946f61632f5a56ba01d62f01e2761de62fed1c2c5049a191dbbaf836ac0b0771b38a84dc6f52a40ee53b9c73666855cfe03b6a829f9a8 SHA512 a4329eb8ea98b631611a6e069f27a6c640bfac94aa5a2c3591c9c35c4b08ea6f123fadcd56597353b27ec67bc079e8268e1b700fe85c0d545c9bb93439362c1b -DIST amiwm0.21pl2.tar.gz 195128 BLAKE2B de7c843e6b756797b7a72a8e0b6fde6d4c02893e3eae8262d85d4417a7ad6309c10add802c04dde2d092bc7c8a604edbc96c4a9fc3c7f1166897a7933a978ccb SHA512 6504a4fd4c30a571b0c501b46fdc442fcc993c27b4595753f7bfa12a38c0b997a01d939c7a35e6c499aa0f8972bc0fda7cc88a9fe77091f363f8cd5a9e8d50de diff --git a/x11-wm/amiwm/amiwm-0.21_p2.ebuild b/x11-wm/amiwm/amiwm-0.21_p2.ebuild deleted file mode 100644 index 0fba9046d07d..000000000000 --- a/x11-wm/amiwm/amiwm-0.21_p2.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils multilib toolchain-funcs - -MY_P=${PN}${PV/_p/pl} -DESCRIPTION="Windowmanager ala Amiga(R) Workbench(R)" -HOMEPAGE="http://www.lysator.liu.se/~marcus/amiwm.html" -SRC_URI="ftp://ftp.lysator.liu.se/pub/X11/wm/${PN}/${MY_P}.tar.gz" - -LICENSE="amiwm" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="" - -COMMON_DEPEND="x11-libs/libX11 - x11-libs/libXmu - x11-libs/libXext" - -RDEPEND="${COMMON_DEPEND} - media-gfx/xloadimage - x11-apps/xrdb - x11-apps/xsetroot - x11-terms/xterm" -DEPEND="${COMMON_DEPEND} - x11-base/xorg-proto" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${FILESDIR}/${P}-gentoo.diff" - "${FILESDIR}/${P}-implicts.patch" - "${FILESDIR}/${P}-flex-2.6.3-fix.patch" -) - -pkg_setup() { - tc-export CC -} - -src_prepare() { - default - sed -e "s:\$(exec_prefix)/lib:\$(exec_prefix)/$(get_libdir):" \ - -e '/^STRIPFLAG/s@-s@@' \ - -e '/$(LN_S)/s@$(DESTDIR)$(AMIWM_HOME)@../..$(AMIWM_HOME)@' \ - -i Makefile.in || die - sed -i -e "s:/bin/ksh:/bin/sh:g" Xsession{,2}.in || die - - cat <<- EOF > "${T}"/amiwm - #!/bin/sh - exec /usr/bin/amiwm - EOF -} - -src_install() { - local DOCS=( README* ) - default - - exeinto /etc/X11/Sessions - doexe "${T}"/amiwm -} 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 deleted file mode 100644 index ae89aafdae86..000000000000 --- a/x11-wm/amiwm/files/amiwm-0.21_p2-flex-2.6.3-fix.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- amiwm0.21pl2/lex.l -+++ amiwm0.21pl2/lex.l -@@ -1,5 +1,6 @@ -+%option noyywrap - %{ - #include <stdio.h> - #include "gram.h" - extern char *progname; - extern int ParseError; ---- amiwm0.21pl2/kbdlexer.l -+++ amiwm0.21pl2/kbdlexer.l -@@ -1,5 +1,6 @@ -+%option noyywrap - %{ - #include <X11/Xmu/CharSet.h> - #include <string.h> - - #include "libami.h" -@@ -134,12 +135,9 @@ int parse_keyword(char *str, YYSTYPE *va - - . { fprintf(stderr, "%s: illegal character \"%s\" ignored\n", - progname, yytext); } - %% - --#ifndef yywrap --int yywrap() { return 1; } --#endif - #undef input - #define input() ((*inptr)?(*inptr++):0) - #undef unput - #define unput(c) (*--inptr=c) diff --git a/x11-wm/amiwm/files/amiwm-0.21_p2-gentoo.diff b/x11-wm/amiwm/files/amiwm-0.21_p2-gentoo.diff deleted file mode 100644 index fa875a4a43bf..000000000000 --- a/x11-wm/amiwm/files/amiwm-0.21_p2-gentoo.diff +++ /dev/null @@ -1,160 +0,0 @@ -Fix parallel build, don't strip binaries, respect CC LDFLAGS, fix install dirs -Fix incompatible implicit declaration of built-in function {strlen,memset,strcpy} - -http://bugs.gentoo.org/show_bug.cgi?id=248680 -http://bugs.gentoo.org/show_bug.cgi?id=299918 - ---- a/Makefile.in -+++ b/Makefile.in -@@ -14,7 +14,7 @@ - exec_prefix = @exec_prefix@ - bindir = $(exec_prefix)/bin - libdir = $(exec_prefix)/lib --mandir = $(prefix)/man -+mandir = $(prefix)/share/man - INSTALL = @INSTALL@ - LN_S = @LN_S@ - RM = -rm -f -@@ -45,13 +45,19 @@ - - AMIWM_HOME = $(libdir)/amiwm - -+.PHONY: yaccs all clean lib_all lexs -+ -+.SUFFIXES: .c -+ - all : lib_all - @$(MAKE) local_all - - local_all : $(PROGS) $(MODULES) - -+$(OBJS): lexs -+ - lib_all : -- @( cd libami; $(MAKE) all ) -+ @$(MAKE) -C libami all - - .c.o: - $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $< -@@ -71,83 +77,75 @@ - ppmtoinfo.o : ppmtoinfo.c - $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -DAMIWM_HOME=\"$(AMIWM_HOME)\" $< - --gram.h gram.c: gram.y -- $(YACC) $(YFLAGS) $< -- mv y.tab.c gram.c -- mv y.tab.h gram.h -+yaccs: gram.c kbdmodule.c -+lexs: yaccs lex.c kbdlexer.c -+ -+%.c: %.y -+ $(YACC) $(YFLAGS) $< -o $@ - --lex.c : lex.l -- $(LEX) -t $< > lex.c - --kbdmodule.h kbdmodule.c: kbdmodule.y -- $(YACC) $(YFLAGS) $< -- mv y.tab.c kbdmodule.c -- mv y.tab.h kbdmodule.h -+lex.c : lex.l -+ $(LEX) -t $< > lex.c - - kbdlexer.c : kbdlexer.l - $(LEX) -t $< > kbdlexer.c - --install : $(PROGS) $(MODULES) Xsession Xsession2 Xinitrc amiwm-init -- -mkdir -p $(AMIWM_HOME) -- $(INSTALL) $(STRIPFLAG) requestchoice $(AMIWM_HOME)/requestchoice -- $(INSTALL) $(STRIPFLAG) executecmd $(AMIWM_HOME)/executecmd -+install : Xsession Xsession2 Xinitrc amiwm-init -+ $(INSTALL) -D requestchoice $(DESTDIR)$(AMIWM_HOME)/requestchoice -+ $(INSTALL) executecmd $(DESTDIR)$(AMIWM_HOME)/executecmd - for module in $(MODULES); do \ - if [ "$$module" = "$(srcdir)/Background" ]; then \ -- $(INSTALL) $$module $(AMIWM_HOME)/Background; \ -+ $(INSTALL) $$module $(DESTDIR)$(AMIWM_HOME)/Background; \ - else \ -- $(INSTALL) $(STRIPFLAG) $$module $(AMIWM_HOME)/$$module; \ -+ $(INSTALL) $(STRIPFLAG) $$module $(DESTDIR)$(AMIWM_HOME)/$$module; \ - fi; \ - done -- $(INSTALL) -m 644 $(srcdir)/system.amiwmrc $(AMIWM_HOME)/system.amiwmrc -- $(INSTALL) -m 644 $(srcdir)/def_tool.info $(AMIWM_HOME)/def_tool.info -- $(INSTALL) -m 644 $(srcdir)/system.map $(AMIWM_HOME)/system.map -- $(INSTALL) -m 644 $(srcdir)/magicwb.map $(AMIWM_HOME)/magicwb.map -- $(INSTALL) -m 644 $(srcdir)/schwartz.map $(AMIWM_HOME)/schwartz.map -- $(INSTALL) -m 755 Xsession $(AMIWM_HOME)/Xsession -- $(INSTALL) -m 755 Xsession2 $(AMIWM_HOME)/Xsession2 -- $(INSTALL) -m 755 Xinitrc $(AMIWM_HOME)/Xinitrc -- $(INSTALL) -m 755 $(srcdir)/amiwm-init $(AMIWM_HOME)/amiwm-init -- -mkdir -p $(bindir) -- $(INSTALL) $(STRIPFLAG) amiwm $(bindir)/amiwm -- $(INSTALL) $(STRIPFLAG) ppmtoinfo $(bindir)/ppmtoinfo -- $(RM) $(bindir)/requestchoice -- $(LN_S) $(AMIWM_HOME)/requestchoice $(bindir)/requestchoice -- -mkdir -p $(mandir)/man1 -- $(INSTALL) -m 644 $(srcdir)/amiwm.1 $(mandir)/man1/amiwm.1 -+ $(INSTALL) -m 644 $(srcdir)/system.amiwmrc $(DESTDIR)$(AMIWM_HOME)/system.amiwmrc -+ $(INSTALL) -m 644 $(srcdir)/def_tool.info $(DESTDIR)$(AMIWM_HOME)/def_tool.info -+ $(INSTALL) -m 644 $(srcdir)/system.map $(DESTDIR)$(AMIWM_HOME)/system.map -+ $(INSTALL) -m 644 $(srcdir)/magicwb.map $(DESTDIR)$(AMIWM_HOME)/magicwb.map -+ $(INSTALL) -m 644 $(srcdir)/schwartz.map $(DESTDIR)$(AMIWM_HOME)/schwartz.map -+ $(INSTALL) -m 755 Xsession $(DESTDIR)$(AMIWM_HOME)/Xsession -+ $(INSTALL) -m 755 Xsession2 $(DESTDIR)$(AMIWM_HOME)/Xsession2 -+ $(INSTALL) -m 755 Xinitrc $(DESTDIR)$(AMIWM_HOME)/Xinitrc -+ $(INSTALL) -m 755 $(srcdir)/amiwm-init $(DESTDIR)$(AMIWM_HOME)/amiwm-init -+ $(INSTALL) -D amiwm $(DESTDIR)$(bindir)/amiwm -+ $(INSTALL) ppmtoinfo $(DESTDIR)$(bindir)/ppmtoinfo -+ $(RM) $(DESTDIR)$(bindir)/requestchoice -+ $(LN_S) $(DESTDIR)$(AMIWM_HOME)/requestchoice $(DESTDIR)$(bindir)/requestchoice -+ $(INSTALL) -D -m 644 $(srcdir)/amiwm.1 $(DESTDIR)$(mandir)/man1/amiwm.1 - - fs-install : Filesystem -- $(INSTALL) $(STRIPFLAG) Filesystem $(AMIWM_HOME)/Filesystem -- $(INSTALL) -m 644 def_disk.info $(AMIWM_HOME)/def_disk.info -- $(INSTALL) -m 644 def_drawer.info $(AMIWM_HOME)/def_disk.info -+ $(INSTALL) Filesystem $(DESTDIR)$(AMIWM_HOME)/Filesystem -+ $(INSTALL) -m 644 def_disk.info $(DESTDIR)$(AMIWM_HOME)/def_disk.info -+ $(INSTALL) -m 644 def_drawer.info $(DESTDIR)$(AMIWM_HOME)/def_disk.info - - cde-install : Xresources.amiwm Amilogo.bm Amilogo.pm -- -mkdir -p $(DT_DIR)/config/C/Xresources.d -- $(INSTALL) -m 644 Xresources.amiwm $(DT_DIR)/config/C/Xresources.d/Xresources.amiwm -- -mkdir -p $(DT_DIR)/appconfig/icons/C -- $(INSTALL) -m 644 Amilogo.bm $(DT_DIR)/appconfig/icons/C/Amilogo.bm -+ $(INSTALL) -D -m 644 Xresources.amiwm $(DESTDIR)$(DT_DIR)/config/C/Xresources.d/Xresources.amiwm -+ $(INSTALL) -D -m 644 Amilogo.bm $(DESTDIR)$(DT_DIR)/appconfig/icons/C/Amilogo.bm - $(INSTALL) -m 644 Amilogo.pm $(DT_DIR)/appconfig/icons/C/Amilogo.pm - - - amiwm : $(OBJS) $(LIBAMI) -- $(CC) -o amiwm $(OBJS) $(LIBS) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o amiwm $(OBJS) $(LIBS) - - requestchoice : requestchoice.o $(LIBAMI) -- $(CC) -o requestchoice requestchoice.o $(LIBS) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o requestchoice requestchoice.o $(LIBS) - - executecmd : executecmd.o $(LIBAMI) -- $(CC) -o executecmd executecmd.o $(LIBS) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o executecmd executecmd.o $(LIBS) - - Filesystem : filesystem.o $(LIBAMI) -- $(CC) -o Filesystem filesystem.o $(LIBS) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o Filesystem filesystem.o $(LIBS) - - Keyboard : kbdmodule.o kbdlexer.o $(LIBAMI) -- $(CC) -o Keyboard kbdmodule.o kbdlexer.o $(LIBS) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o Keyboard kbdmodule.o kbdlexer.o $(LIBS) - - ppmtoinfo : ppmtoinfo.o -- $(CC) -o ppmtoinfo ppmtoinfo.o -lm -+ $(CC) $(CFLAGS) $(LDFLAGS) -o ppmtoinfo ppmtoinfo.o -lm - - localetest : localetest.o $(LIBAMI) -- $(CC) -o localetest localetest.o $(LIBS) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o localetest localetest.o $(LIBS) - - clean : - $(RM) core $(PROGS) $(LIBAMI) Keyboard *.o libami/*.o diff --git a/x11-wm/amiwm/files/amiwm-0.21_p2-implicts.patch b/x11-wm/amiwm/files/amiwm-0.21_p2-implicts.patch deleted file mode 100644 index 4a01347d0e86..000000000000 --- a/x11-wm/amiwm/files/amiwm-0.21_p2-implicts.patch +++ /dev/null @@ -1,73 +0,0 @@ ---- a/main.c -+++ b/main.c -@@ -131,6 +131,7 @@ - extern void read_rc_file(char *filename, int manage_all); - extern void init_modules(); - extern void flushmodules(); -+extern void closescreen(); - extern void raiselowerclient(Client *, int); - - #ifndef AMIGAOS ---- a/menu.c -+++ b/menu.c -@@ -45,6 +45,11 @@ - extern void mod_menuselect(struct module *, int, int, int); - extern void setfocus(Window); - extern void flushmodules(); -+extern void openscreen(char *, Window); -+extern void realizescreens(void); -+extern void screentoback(); -+extern void wberror(Scrn *, char *); -+extern void closescreen(); - - Scrn *mbdclick=NULL, *mbdscr=NULL; - ---- a/icc.c -+++ b/icc.c -@@ -6,6 +6,7 @@ - #include "prefs.h" - - #include <string.h> -+#include <stdlib.h> - - #ifdef AMIGAOS - #include <pragmas/xlib_pragmas.h> ---- a/libami/lists.c -+++ b/libami/lists.c -@@ -1,3 +1,4 @@ -+#include <string.h> - #include "libami.h" - - #ifndef AMIGAOS ---- a/kbdmodule.y -+++ b/kbdmodule.y -@@ -2,6 +2,8 @@ - #include <stdio.h> - #include <string.h> - #include "libami.h" -+int yyerror(char *); -+int yylex (void); - - void docmd(XEvent *e, void *callback) - { ---- a/gram.y -+++ b/gram.y -@@ -8,6 +8,8 @@ - #include "screen.h" - #include "icc.h" - #include "style.h" -+int yyerror(char *); -+int yylex (void); - extern void set_sys_palette(void); - extern void set_mwb_palette(void); - extern void set_schwartz_palette(void); ---- a/ppmtoinfo.c -+++ b/ppmtoinfo.c -@@ -1,6 +1,7 @@ - #include <stdio.h> - #include <stdlib.h> - #include <string.h> -+#include <time.h> - #ifdef HAVE_UNISTD_H - #include <unistd.h> - #endif |