This commit is contained in:
Mid Favila 2021-09-16 19:06:34 -03:00
parent 1cc8484bfa
commit eb3c1deb53
37 changed files with 396 additions and 23 deletions

View File

@ -1,10 +1,4 @@
#!/bin/sh -e
sed -i 's/.*install.*\(-p\).*//g' Makefile
sed -i 's/.*install.*\(-p\).*//g' font/Makefile
sed -i 's/.*-m[0-9][0-9]*.*\(-d\)//g' font/Makefile
sed -i 's/.*-d[0-9][0-9]*.*/.*-Dm.*/g' font/Makefile
make DESTDIR="$1" CC="${CC:-cc}"
make DESTDIR="$1" install

8
ports/aewm/build Executable file
View File

@ -0,0 +1,8 @@
#!/bin/sh -e
for file in *.patch
do patch -p1 < $file
done
make
make DESTDIR="$1" install

8
ports/aewm/checksums Normal file
View File

@ -0,0 +1,8 @@
5aff43d9112e303f8da76865b0f2532f2df45492ebc90475a1d98c4f8951715f
5476d537f3a8f0dd84c535d9831f439db7b208e8c9e29814a0dc052903e0a35c
01d5332361a5ca159776975d0414d4e101ba79614325ce5f8dbd8c71a22308df
ccec7342f9aa696cf85dc28aee111bffcdb02e27aa10b29db9ee033c74dc7744
9ce7fa43633e7ca2e49beb63428d1094297af7581d4728fb0de83edc5e5d2d65
01dcb4d822ad00fca9d62040ef87227c3a34bb8743a4d29400973fa4ab0b1504
f8efc4eb75e15c64e6f30f24732433fe2ca5f142f0d97e4c30716d4869c4883e
59ce24198ed5d7a54ea7e5edcffc05b857326193b11b2eb4697c84bce4754a85

12
ports/aewm/depends Normal file
View File

@ -0,0 +1,12 @@
atk
cairo
fontconfig
freetype-harfbuzz
gdk-pixbuf
glib
gtk+2
libX11
libX11
libXext
libXft
pango

View File

@ -0,0 +1,70 @@
From: Decklin Foster <decklin@red-bean.com>
Subject: Changes to original sources
---
Makefile | 14 +++++++-------
aewm.h | 2 +-
doc/aewmrc.ex | 2 +-
3 files changed, 9 insertions(+), 9 deletions(-)
--- a/Makefile
+++ b/Makefile
@@ -3,15 +3,15 @@
# Set this to the location where you want to install
DESTDIR =
-XROOT = /usr/X11R6
+XROOT = /usr
# Uncomment to enable Shape extension support
-#OPT_WMFLAGS += -DSHAPE
-#OPT_WMLIB += -lXext
+OPT_WMFLAGS += -DSHAPE
+OPT_WMLIB += -lXext
# Uncomment to add Xft support
-#OPT_WMFLAGS += -DXFT `pkg-config --cflags xft`
-#OPT_WMLIB += `pkg-config --libs xft` -lXext
+OPT_WMFLAGS += -DXFT `pkg-config --cflags xft`
+OPT_WMLIB += `pkg-config --libs xft` -lXext
# Uncomment for debugging (abandon all hope, ye who enter here)
#OPT_WMFLAGS += -DDEBUG
@@ -21,7 +21,7 @@
CFLAGS = -g -O2 -Wall
BINDIR = $(DESTDIR)$(XROOT)/bin
-MANDIR = $(DESTDIR)$(XROOT)/man/man1
+MANDIR = $(DESTDIR)$(XROOT)/share/man/man1
CFGDIR = $(DESTDIR)/etc/X11/aewm
PLAINOBJ = aesession.o parser.o
@@ -62,7 +62,7 @@
X11LIB = -L$(XROOT)/lib -lX11
WMLIB = $(X11LIB) $(OPT_WMLIB)
-GTKLIB = `pkg-config --libs gtk+-2.0`
+GTKLIB = `pkg-config --libs gtk+-2.0` -lX11
$(PLAINBIN): %: %.o
$(CC) $^ -o $@
--- a/aewm.h
+++ b/aewm.h
@@ -29,7 +29,7 @@
#define DEF_IMAP 0
#define DEF_NEW1 "aemenu --switch"
-#define DEF_NEW2 "xterm"
+#define DEF_NEW2 "x-terminal-emulator"
#define DEF_NEW3 "aemenu --launch"
#define DEF_NEW4 "aedesk -1"
#define DEF_NEW5 "aedesk +1"
--- a/doc/aewmrc.ex
+++ b/doc/aewmrc.ex
@@ -19,5 +19,5 @@
# Clients to launch when the root window is clicked
button1 "aemenu"
-button2 "xterm"
+button2 "x-terminal-emulator"
button3 "aemenu --switch"

View File

@ -0,0 +1,18 @@
From: Jari Aalto <jari.aalto@cante.net>
Subject: Do not strip unconditionally; see debian/rules (Closes: #436379).
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/Makefile
+++ b/Makefile
@@ -81,7 +81,7 @@
install: all
mkdir -p $(BINDIR) $(MANDIR) $(CFGDIR)
- install -s $(ALLBIN) $(BINDIR)
+ install $(ALLBIN) $(BINDIR)
for i in $(AEMAN); do \
install -m 644 doc/$$i $(MANDIR); \
gzip -9 $(MANDIR)/$$i; \

View File

@ -0,0 +1,59 @@
From: Jari Aalto <jari.aalto@cante.net>
Subject: Add build flags support
---
Makefile | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@
#OPT_WMLIB += -lefence
CC = gcc
-CFLAGS = -g -O2 -Wall
+# CFLAGS = -g -O2 -Wall
BINDIR = $(DESTDIR)$(XROOT)/bin
MANDIR = $(DESTDIR)$(XROOT)/share/man/man1
@@ -49,32 +49,32 @@
GTKFLAGS = `pkg-config --cflags gtk+-2.0`
$(PLAINOBJ): %.o: %.c
- $(CC) $(CFLAGS) -c $< -o $@
+ $(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@
$(X11OBJ): %.o: %.c
- $(CC) $(CFLAGS) $(X11FLAGS) -c $< -o $@
+ $(CC) $(CPPFLAGS) $(CFLAGS) $(X11FLAGS) -c $< -o $@
$(WMOBJ): %.o: %.c
- $(CC) $(CFLAGS) $(WMFLAGS) -c $< -o $@
+ $(CC) $(CPPFLAGS) $(CFLAGS) $(WMFLAGS) -c $< -o $@
$(GTKOBJ): %.o: %.c
- $(CC) $(CFLAGS) $(GTKFLAGS) -c $< -o $@
+ $(CC) $(CPPFLAGS) $(CFLAGS) $(GTKFLAGS) -c $< -o $@
X11LIB = -L$(XROOT)/lib -lX11
WMLIB = $(X11LIB) $(OPT_WMLIB)
GTKLIB = `pkg-config --libs gtk+-2.0` -lX11
$(PLAINBIN): %: %.o
- $(CC) $^ -o $@
+ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $^ -o $@
$(X11BIN): %: %.o
- $(CC) $^ $(X11LIB) -o $@
+ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $^ $(X11LIB) -o $@
$(WMBIN): %:
- $(CC) $^ $(WMLIB) -o $@
+ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $^ $(WMLIB) -o $@
$(GTKBIN): %: %.o
- $(CC) $^ $(GTKLIB) -o $@
+ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $^ $(GTKLIB) -o $@
AEMAN = aewm.1x aeclients.1x
AERC = aewmrc clientsrc

View File

@ -0,0 +1,18 @@
From: Jari Aalto <jari.aalto@cante.net>
Subject: Fix hyphen
---
doc/aeclients.1x | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/doc/aeclients.1x
+++ b/doc/aeclients.1x
@@ -75,7 +75,7 @@
.B aedesk
changes to a new virtual desktop, specfied by
.IR num ,
-or sets the number of available desktops, with -n.
+or sets the number of available desktops, with \-n.
.SH "FILES"
.I $HOME/.aewm/clientsrc
.SH "SEE ALSO"

View File

@ -0,0 +1,14 @@
Description: Man spelling fixed.
Author: Daniel Pimentel <d4n1@d4n1.org>
Last-Update: 2019-07-23
--- aewm-1.3.12.orig/doc/aeclients.1x
+++ aewm-1.3.12/doc/aeclients.1x
@@ -73,7 +73,7 @@ without killing your X session. The auth
anyone except WM hackers to find this useful.
.PP
.B aedesk
-changes to a new virtual desktop, specfied by
+changes to a new virtual desktop, specified by
.IR num ,
or sets the number of available desktops, with \-n.
.SH "FILES"

View File

@ -0,0 +1,33 @@
Description: Fix ftbfs with GCC-10
Author: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
Bug-Debian: https://bugs.debian.org/956983
Forwarded: no
---
--- aewm-1.3.12.orig/aedesk.c
+++ aewm-1.3.12/aedesk.c
@@ -11,10 +11,6 @@
#define UMOD(x, y) ((((long)(x) % (long)(y)) + (y)) % (y))
-Display *dpy;
-Window root;
-Atom net_cur_desk, net_num_desks;
-
static unsigned long parse_desk(char *spec);
int main(int argc, char **argv)
--- aewm-1.3.12.orig/aepanel.c
+++ aewm-1.3.12/aepanel.c
@@ -36,9 +36,6 @@ void setup_panel_atoms();
void sig_handler(int);
void set_strut(Window, strut_t *);
-Atom net_wm_strut;
-Atom net_wm_strut_partial;
-Atom net_wm_wintype;
Atom net_wm_wintype_dock;
#define NAME_SIZE 48

View File

@ -0,0 +1,48 @@
Description: Fix FTCBFS by making pkg-config substitutable.
From: Helmut Grohne <helmut@subdivi.de>
---
diff --git a/Makefile b/Makefile
index 9d6c209..024ec8a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,8 @@
# aewm - Copyright 1998-2007 Decklin Foster <decklin@red-bean.com>.
# This program is free software; see LICENSE for details.
+PKG_CONFIG ?= pkg-config
+
# Set this to the location where you want to install
DESTDIR =
XROOT = /usr
@@ -10,8 +12,8 @@ OPT_WMFLAGS += -DSHAPE
OPT_WMLIB += -lXext
# Uncomment to add Xft support
-OPT_WMFLAGS += -DXFT `pkg-config --cflags xft`
-OPT_WMLIB += `pkg-config --libs xft` -lXext
+OPT_WMFLAGS += -DXFT `$(PKG_CONFIG) --cflags xft`
+OPT_WMLIB += `$(PKG_CONFIG) --libs xft` -lXext
# Uncomment for debugging (abandon all hope, ye who enter here)
#OPT_WMFLAGS += -DDEBUG
@@ -46,7 +48,7 @@ aepanel: $(CLIENTOBJ) menu.o parser.o
X11FLAGS = -I$(XROOT)/include
WMFLAGS = $(X11FLAGS) $(OPT_WMFLAGS)
-GTKFLAGS = `pkg-config --cflags gtk+-2.0`
+GTKFLAGS = `$(PKG_CONFIG) --cflags gtk+-2.0`
$(PLAINOBJ): %.o: %.c
$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@
@@ -62,7 +64,7 @@ $(GTKOBJ): %.o: %.c
X11LIB = -L$(XROOT)/lib -lX11
WMLIB = $(X11LIB) $(OPT_WMLIB)
-GTKLIB = `pkg-config --libs gtk+-2.0` -lX11
+GTKLIB = `$(PKG_CONFIG) --libs gtk+-2.0` -lX11
$(PLAINBIN): %: %.o
$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $^ -o $@

8
ports/aewm/sources Normal file
View File

@ -0,0 +1,8 @@
https://deb.debian.org/debian/pool/main/a/aewm/aewm_1.3.12.orig.tar.gz
patches/05-source-changes.patch
patches/10-makefile-no-strip.patch
patches/20-makefile-harden.patch
patches/30-manpage.patch
patches/40_man-spelling-fix.patch
patches/fix_ftbfs.patch
patches/fix_pkg-config.patch

1
ports/aewm/version Normal file
View File

@ -0,0 +1 @@
1.3 1

6
ports/clearsans-font/build Executable file
View File

@ -0,0 +1,6 @@
#!/bin/sh -e
for file in TTF/*
do
install -Dm644 $file "$1/usr/share/fonts/TTF/"
done

View File

@ -0,0 +1 @@
41809a296870dd7b4753d6532b4093821d61f9806281e6c053ccb11083ad1190

View File

@ -0,0 +1 @@
https://01.org/sites/default/files/downloads/clear-sans/clearsans-1.00.zip

View File

@ -0,0 +1 @@
1.00 1

16
ports/es-git/build Executable file
View File

@ -0,0 +1,16 @@
#!/bin/sh -e
ls
aclocal
autoconf
libtoolize -qi
patch < musl.patch
sed -i 's|/doc/es\.1|/es\.1|g' Makefile.in
./configure \
--prefix="$1/usr" \
--with-readline
make
make DESTDIR="$1" install

1
ports/es-git/checksums Normal file
View File

@ -0,0 +1 @@
a77acdf451ac5d0d079d1a272de64ec4c628ed65f658b30246d51b4849eea44f

4
ports/es-git/depends Normal file
View File

@ -0,0 +1,4 @@
readline
autoconf
automake
libtool

View File

@ -0,0 +1,33 @@
--- print.c.orig
+++ print.c
@@ -273,15 +273,10 @@
va_list saveargs = format->args;
#endif
-
VA_START(format->args, fmt);
n += printfmt(format, fmt);
va_end(format->args);
-#ifndef __va_copy
- format->args = saveargs;
-#else
- __va_copy(format->args, saveargs);
-#endif
+ va_copy(format->args, saveargs);
return n + format->flushed;
}
--- stdenv.h.orig
+++ stdenv.h
@@ -204,6 +204,11 @@
#define VARARGS2(t1, v1, t2, v2) (v1, v2, va_alist) t1 v1; t2 v2; va_dcl
#define VA_START(ap, var) va_start(ap)
+/* __va_* are defined by the compiler */
+#define va_start(ap) __va_start(ap)
+#define va_copy(dest, src) __va_copy(dest, src)
+#define va_end(ap) __va_end(ap)
+
#endif

2
ports/es-git/sources Normal file
View File

@ -0,0 +1,2 @@
git+https://github.com/wryun/es-shell
patches/musl.patch

1
ports/es-git/version Normal file
View File

@ -0,0 +1 @@
git 1

1
ports/libvte9/.#depends Symbolic link
View File

@ -0,0 +1 @@
midfavila@speculatores.390

7
ports/libvte9/build Executable file
View File

@ -0,0 +1,7 @@
#!/bin/sh -e
./configure \
--prefix=/usr
make
make DESTDIR="$1" install

1
ports/libvte9/checksums Normal file
View File

@ -0,0 +1 @@
86cf0b81aa023fa93ed415653d51c96767f20b2d7334c893caba71e42654b0ae

1
ports/libvte9/depends Normal file
View File

@ -0,0 +1 @@
gtk+2

1
ports/libvte9/sources Normal file
View File

@ -0,0 +1 @@
https://deb.debian.org/debian/pool/main/v/vte/vte_0.28.2.orig.tar.xz

1
ports/libvte9/version Normal file
View File

@ -0,0 +1 @@
.28 1

View File

@ -5,6 +5,14 @@ patch -p1 < 01-links-tabbed.patch
./configure \
--prefix=/usr \
--enable-graphics \
--without-ipv6 \
--without-libevent \
--without-gpm \
--without-libjpeg \
--without-libtiff \
--without-librsvg \
--disable-png-pkgconfig \
--with-x \
--mandir=/usr/share/man
make

View File

@ -1,17 +0,0 @@
/var/db/kiss/installed/links2/version
/var/db/kiss/installed/links2/sources
/var/db/kiss/installed/links2/manifest
/var/db/kiss/installed/links2/depends
/var/db/kiss/installed/links2/checksums
/var/db/kiss/installed/links2/build
/var/db/kiss/installed/links2/
/var/db/kiss/installed/
/var/db/kiss/
/var/db/
/var/
/usr/man/man1/links.1
/usr/man/man1/
/usr/man/
/usr/bin/links
/usr/bin/
/usr/

7
ports/lxterminal/build Executable file
View File

@ -0,0 +1,7 @@
#!/bin/sh -e
./configure \
--prefix=/usr
make
make DESTDIR="$1" install

View File

@ -0,0 +1 @@
9db8748923b3fa09a82ae2210ed1fa4cdb4c45312009da9caed103d48f8e9be7

2
ports/lxterminal/depends Normal file
View File

@ -0,0 +1,2 @@
libvte9
gtk+2

1
ports/lxterminal/sources Normal file
View File

@ -0,0 +1 @@
https://deb.debian.org/debian/pool/main/l/lxterminal/lxterminal_0.4.0.orig.tar.xz

1
ports/lxterminal/version Normal file
View File

@ -0,0 +1 @@
.4 1

View File

@ -4,5 +4,6 @@
# uses it. It is also much better than the ancient# logical X font description.
patch -p1 < tabbed-0.6-xft.diff
${EDITOR:=vi} config.def.h
make
make DESTDIR="$1" PREFIX=/usr install