commit 6b2ffb76f7a3185347e5fa4d4548ab8801ddcab8
parent 198703c61a52a126ffde4072b24ba7e190702f92
Author: phoebos <ben@bvnf.space>
Date: Fri, 11 Jul 2025 11:24:21 +0100
wily: 0.13.42
acme-like text editor for *NIX
Diffstat:
6 files changed, 435 insertions(+), 0 deletions(-)
diff --git a/wily/build b/wily/build
@@ -0,0 +1,13 @@
+#!/bin/sh -e
+
+patch -p1 < 0001-fixes.patch
+
+./configure
+
+make
+
+mkdir -p "$1/usr/bin/"
+cp wily/wily "$1/usr/bin/"
+
+mkdir -p "$1/usr/share/doc/wily/"
+cp -R Doc/. "$1/usr/share/doc/wily/"
diff --git a/wily/checksums b/wily/checksums
@@ -0,0 +1,2 @@
+2454caf08f3f2bd0e84a1cae0a9be8b232d0cb003e9e5a003b26d6ea4293112fc4
+87a3e856f20cb1cf35b6acad21adaceb1889a16b7547abd8124e436ac64b7c08c2
diff --git a/wily/manifest b/wily/manifest
@@ -0,0 +1,94 @@
+/var/db/kiss/installed/wily/version
+/var/db/kiss/installed/wily/sources
+/var/db/kiss/installed/wily/patches/0001-fixes.patch
+/var/db/kiss/installed/wily/patches/
+/var/db/kiss/installed/wily/manifest
+/var/db/kiss/installed/wily/depends
+/var/db/kiss/installed/wily/checksums
+/var/db/kiss/installed/wily/build
+/var/db/kiss/installed/wily/
+/var/db/kiss/installed/
+/var/db/kiss/
+/var/db/
+/var/
+/usr/share/doc/wily/winmanager.html
+/usr/share/doc/wily/user.html
+/usr/share/doc/wily/tute/typescript
+/usr/share/doc/wily/tute/start
+/usr/share/doc/wily/tute/send_to_gary
+/usr/share/doc/wily/tute/script
+/usr/share/doc/wily/tute/hello.c
+/usr/share/doc/wily/tute/findword
+/usr/share/doc/wily/tute/
+/usr/share/doc/wily/thumb.gif
+/usr/share/doc/wily/sam/version
+/usr/share/doc/wily/sam/utf.4
+/usr/share/doc/wily/sam/sam.tut.ms
+/usr/share/doc/wily/sam/sam.1
+/usr/share/doc/wily/sam/rune.3
+/usr/share/doc/wily/sam/rgbpix.3
+/usr/share/doc/wily/sam/regexp.6
+/usr/share/doc/wily/sam/keyboard.4
+/usr/share/doc/wily/sam/graphics.3
+/usr/share/doc/wily/sam/frame.3
+/usr/share/doc/wily/sam/font.4
+/usr/share/doc/wily/sam/event.3
+/usr/share/doc/wily/sam/cachechars.3
+/usr/share/doc/wily/sam/boilerplate
+/usr/share/doc/wily/sam/bitmap.6
+/usr/share/doc/wily/sam/bitblt.3
+/usr/share/doc/wily/sam/balloc.3
+/usr/share/doc/wily/sam/add.3
+/usr/share/doc/wily/sam/Sam.ad
+/usr/share/doc/wily/sam/README
+/usr/share/doc/wily/sam/
+/usr/share/doc/wily/pythonpaper.html
+/usr/share/doc/wily/python.html
+/usr/share/doc/wily/perl.txt
+/usr/share/doc/wily/onepage.html
+/usr/share/doc/wily/one.html
+/usr/share/doc/wily/old/wily.html
+/usr/share/doc/wily/old/wily.bib
+/usr/share/doc/wily/old/wily.1
+/usr/share/doc/wily/old/user.sgml
+/usr/share/doc/wily/old/tile.html
+/usr/share/doc/wily/old/pythonpaper.html
+/usr/share/doc/wily/old/python.sgml
+/usr/share/doc/wily/old/msg.sgml
+/usr/share/doc/wily/old/auug.tex
+/usr/share/doc/wily/old/
+/usr/share/doc/wily/mouse
+/usr/share/doc/wily/mailout
+/usr/share/doc/wily/intro.html
+/usr/share/doc/wily/index.html
+/usr/share/doc/wily/idioms.html
+/usr/share/doc/wily/hack.html
+/usr/share/doc/wily/fonts
+/usr/share/doc/wily/example.gif
+/usr/share/doc/wily/download.html
+/usr/share/doc/wily/demo.utf
+/usr/share/doc/wily/credits.html
+/usr/share/doc/wily/changes.txt
+/usr/share/doc/wily/cartoon.gif
+/usr/share/doc/wily/auug.html
+/usr/share/doc/wily/announce/1996.11
+/usr/share/doc/wily/announce/1995.8
+/usr/share/doc/wily/announce/1995.11
+/usr/share/doc/wily/announce/
+/usr/share/doc/wily/Tcl.txt
+/usr/share/doc/wily/Tcl.html
+/usr/share/doc/wily/TODO
+/usr/share/doc/wily/README
+/usr/share/doc/wily/LSM
+/usr/share/doc/wily/FAQ.txt
+/usr/share/doc/wily/FAQ.html
+/usr/share/doc/wily/Credits
+/usr/share/doc/wily/C.html
+/usr/share/doc/wily/AcmeVsWily.html
+/usr/share/doc/wily/00README
+/usr/share/doc/wily/
+/usr/share/doc/
+/usr/share/
+/usr/bin/wily
+/usr/bin/
+/usr/
diff --git a/wily/patches/0001-fixes.patch b/wily/patches/0001-fixes.patch
@@ -0,0 +1,323 @@
+From e26808392c53af97969fc7233958d841aeff5d3c Mon Sep 17 00:00:00 2001
+From: phoebos <ben@bvnf.space>
+Date: Fri, 11 Jul 2025 11:14:02 +0100
+Subject: [PATCH] fixes
+
+---
+ libXg/Gwin.h | 3 +++
+ libXg/arith.c | 4 ++++
+ libXg/balloc.c | 1 +
+ libXg/clipline.c | 2 ++
+ libXg/font.c | 1 +
+ libXg/gcs.c | 2 +-
+ libXg/getrect.c | 1 +
+ libXg/mkfont.c | 1 +
+ libXg/polysegment.c | 1 +
+ libXg/rdbitmap.c | 2 ++
+ libXg/rdbitmapfile.c | 2 ++
+ libXg/rectclip.c | 1 +
+ libXg/wrbitmap.c | 1 +
+ libXg/wrbitmapfile.c | 3 +++
+ libXg/xtbinit.c | 26 +++++++++++++++++++-------
+ 15 files changed, 43 insertions(+), 8 deletions(-)
+
+diff --git a/libXg/Gwin.h b/libXg/Gwin.h
+index 416d868..50ea622 100644
+--- a/libXg/Gwin.h
++++ b/libXg/Gwin.h
+@@ -2,6 +2,9 @@
+ #ifndef GWIN_H
+ #define GWIN_H
+
++long latin1(unsigned char *k);
++long unicode(unsigned char *k);
++
+ /* New resource names */
+
+ #define XtNscrollForwardR "scrollForwardR"
+diff --git a/libXg/arith.c b/libXg/arith.c
+index 5cf6f65..5fe0703 100644
+--- a/libXg/arith.c
++++ b/libXg/arith.c
+@@ -107,17 +107,20 @@ rshift(Rectangle r, int a)
+ return r;
+ }
+
++int
+ eqpt(Point p, Point q)
+ {
+ return p.x==q.x && p.y==q.y;
+ }
+
++int
+ eqrect(Rectangle r, Rectangle s)
+ {
+ return r.min.x==s.min.x && r.max.x==s.max.x &&
+ r.min.y==s.min.y && r.max.y==s.max.y;
+ }
+
++int
+ rectXrect(Rectangle r, Rectangle s)
+ {
+ return r.min.x<s.max.x && s.min.x<r.max.x &&
+@@ -134,6 +137,7 @@ rectinrect(Rectangle r, Rectangle s)
+ return r.max.x<=s.max.x && r.max.y<=s.max.y;
+ }
+
++int
+ ptinrect(Point p, Rectangle r)
+ {
+ return p.x>=r.min.x && p.x<r.max.x &&
+diff --git a/libXg/balloc.c b/libXg/balloc.c
+index a9d243e..e56fd64 100644
+--- a/libXg/balloc.c
++++ b/libXg/balloc.c
+@@ -1,6 +1,7 @@
+ /* Copyright (c) 1992 AT&T - All rights reserved. */
+ #include <libc.h>
+ #include <libg.h>
++#include <stdlib.h>
+ #include "libgint.h"
+
+ Bitmap*
+diff --git a/libXg/clipline.c b/libXg/clipline.c
+index b8bbaad..93fa55f 100644
+--- a/libXg/clipline.c
++++ b/libXg/clipline.c
+@@ -1,6 +1,7 @@
+ /* Copyright (c) 1992 AT&T - All rights reserved. */
+ #include <libc.h>
+ #include <libg.h>
++#include <stdlib.h>
+ #include "libgint.h"
+
+ typedef struct Linedesc
+@@ -133,6 +134,7 @@ gsetline(Point *pp0, Point *pp1, Linedesc *l)
+ */
+
+ static
++int
+ code(Point *p, Rectangle *r)
+ {
+ return( (p->x<r->min.x? 1 : p->x>=r->max.x? 2 : 0) |
+diff --git a/libXg/font.c b/libXg/font.c
+index d55a9db..bee35e9 100644
+--- a/libXg/font.c
++++ b/libXg/font.c
+@@ -1,6 +1,7 @@
+ /* Copyright (c) 1992 AT&T - All rights reserved. */
+ #include <libc.h>
+ #include <libg.h>
++#include <stdlib.h>
+ #include "libgint.h"
+
+ #define PJW 0 /* use NUL==pjw for invisible characters */
+diff --git a/libXg/gcs.c b/libXg/gcs.c
+index 4d7d3d6..959cfbe 100644
+--- a/libXg/gcs.c
++++ b/libXg/gcs.c
+@@ -160,7 +160,7 @@ GC
+ _getgc(Bitmap *b, unsigned long gcvm, XGCValues *pgcv)
+ {
+ static GC gc0, gcn;
+- static clipset = 0;
++ static int clipset = 0;
+ GC g;
+ XRectangle xr;
+
+diff --git a/libXg/getrect.c b/libXg/getrect.c
+index 2205a69..ee2e138 100644
+--- a/libXg/getrect.c
++++ b/libXg/getrect.c
+@@ -1,6 +1,7 @@
+ /* Copyright (c) 1992 AT&T - All rights reserved. */
+ #include <libc.h>
+ #include <libg.h>
++#include <unistd.h>
+ #include "libgint.h"
+
+ static Cursor sweep={
+diff --git a/libXg/mkfont.c b/libXg/mkfont.c
+index c555ecf..0addf79 100644
+--- a/libXg/mkfont.c
++++ b/libXg/mkfont.c
+@@ -2,6 +2,7 @@
+ #include <libc.h>
+ #include <libg.h>
+ #include <string.h>
++#include <stdlib.h>
+
+ /*
+ * Cobble fake font using existing subfont
+diff --git a/libXg/polysegment.c b/libXg/polysegment.c
+index 72cbe6f..b225203 100644
+--- a/libXg/polysegment.c
++++ b/libXg/polysegment.c
+@@ -1,6 +1,7 @@
+ /* Copyright (c) 1992 AT&T - All rights reserved. */
+ #include <libc.h>
+ #include <libg.h>
++#include <stdlib.h>
+ #include "libgint.h"
+
+ void
+diff --git a/libXg/rdbitmap.c b/libXg/rdbitmap.c
+index 63c508f..6142441 100644
+--- a/libXg/rdbitmap.c
++++ b/libXg/rdbitmap.c
+@@ -1,6 +1,8 @@
+ /* Copyright (c) 1992 AT&T - All rights reserved. */
+ #include <libc.h>
+ #include <libg.h>
++#include <stdlib.h>
++#include <string.h>
+ #include "libgint.h"
+
+ void
+diff --git a/libXg/rdbitmapfile.c b/libXg/rdbitmapfile.c
+index ae8ec52..c57dca9 100644
+--- a/libXg/rdbitmapfile.c
++++ b/libXg/rdbitmapfile.c
+@@ -1,6 +1,8 @@
+ /* Copyright (c) 1992 AT&T - All rights reserved. */
+ #include <libc.h>
+ #include <libg.h>
++#include <stdlib.h>
++#include <unistd.h>
+ #include "libgint.h"
+
+ #define CHUNK 6000
+diff --git a/libXg/rectclip.c b/libXg/rectclip.c
+index 9e03614..ae01bf6 100644
+--- a/libXg/rectclip.c
++++ b/libXg/rectclip.c
+@@ -2,6 +2,7 @@
+ #include <libc.h>
+ #include <libg.h>
+
++int
+ rectclip(Rectangle *rp, Rectangle b) /* first by reference, second by value */
+ {
+ Rectangle *bp = &b;
+diff --git a/libXg/wrbitmap.c b/libXg/wrbitmap.c
+index e1f43cd..0ae38cb 100644
+--- a/libXg/wrbitmap.c
++++ b/libXg/wrbitmap.c
+@@ -1,6 +1,7 @@
+ /* Copyright (c) 1992 AT&T - All rights reserved. */
+ #include <libc.h>
+ #include <libg.h>
++#include <stdlib.h>
+ #include "libgint.h"
+ #include <X11/Intrinsic.h>
+ #ifndef XtSpecificationRelease
+diff --git a/libXg/wrbitmapfile.c b/libXg/wrbitmapfile.c
+index eb1237a..c239882 100644
+--- a/libXg/wrbitmapfile.c
++++ b/libXg/wrbitmapfile.c
+@@ -1,6 +1,9 @@
+ /* Copyright (c) 1992 AT&T - All rights reserved. */
+ #include <libc.h>
+ #include <libg.h>
++#include <stdlib.h>
++#include <stdio.h>
++#include <unistd.h>
+ #include "libgint.h"
+
+ #define CHUNK 4096
+diff --git a/libXg/xtbinit.c b/libXg/xtbinit.c
+index a711319..43952ef 100644
+--- a/libXg/xtbinit.c
++++ b/libXg/xtbinit.c
+@@ -2,6 +2,8 @@
+ #include <libc.h>
+ #include <libg.h>
+ #include <stdio.h>
++#include <stdlib.h>
++#include <unistd.h>
+ #include "libgint.h"
+
+ #define COMPRESSMOUSE
+@@ -85,7 +87,7 @@ static Font * initfont(char *, XFontStruct *, char *);
+ static void reshaped(int, int, int, int);
+ static void gotchar(int);
+ static void gotmouse(Gwinmouse *);
+-static int log2(int);
++static int mylog2(int);
+ static void pixtocolor(Pixel, XColor *);
+ static Subfont *XFontStructtoSubfont(XFontStruct *);
+ static Ebuf *ebread(Esrc *);
+@@ -127,6 +129,16 @@ ioerr(Display *d)
+ return 0;
+ }
+
++static int
++ioerre(Display *d, XErrorEvent *e)
++{
++ if(onerr)
++ (*onerr)("ioerr");
++ else
++ exit(1);
++ return 0;
++}
++
+ void
+ xtbinit(Errfunc f, char *class, int *pargc, char **argv, char **fallbacks)
+ {
+@@ -174,7 +186,7 @@ xtbinit(Errfunc f, char *class, int *pargc, char **argv, char **fallbacks)
+ XtSetArg(args[n], XtNcomposeMod, &compose); n++;
+ XtGetValues(widg, args, n);
+ XSetIOErrorHandler(ioerr);
+- XSetErrorHandler(ioerr);
++ XSetErrorHandler(ioerre);
+
+ if (compose < 0 || compose > 5) {
+ n = 0;
+@@ -188,7 +200,7 @@ xtbinit(Errfunc f, char *class, int *pargc, char **argv, char **fallbacks)
+ pixtocolor(_fgpixel, &_fgcolor);
+ pixtocolor(_bgpixel, &_bgcolor);
+ screen.id = (int) XtWindow(widg);
+- screen.ldepth = log2(depth);
++ screen.ldepth = mylog2(depth);
+ screen.flag = SCR;
+ if(_fgpixel != 0)
+ screen.flag |= BL1;
+@@ -364,7 +376,7 @@ gottimeout(XtPointer cldata, XtIntervalId *id)
+ }
+
+ static int
+-log2(int n)
++mylog2(int n)
+ {
+ int i, v;
+
+@@ -592,7 +604,7 @@ void
+ einit(unsigned long keys)
+ {
+ /*
+- * Make sure Smouse = log2(Emouse) and Skeyboard == log2(Ekeyboard)
++ * Make sure Smouse = mylog2(Emouse) and Skeyboard == mylog2(Ekeyboard)
+ */
+ nsrc = 0;
+ if(keys&Emouse){
+@@ -653,7 +665,7 @@ estop(unsigned long key)
+ {
+ int s;
+
+- s = log2(key);
++ s = mylog2(key);
+ if (!esrc[s].inuse){
+ berror("key not in use");
+ }
+@@ -666,7 +678,7 @@ estoptimer(unsigned long key)
+ {
+ int s;
+
+- s = log2(key);
++ s = mylog2(key);
+ if (!esrc[s].inuse){
+ berror("key not in use");
+ }
+--
+2.49.0
+
diff --git a/wily/sources b/wily/sources
@@ -0,0 +1,2 @@
+https://downloads.sourceforge.net/project/wily/baseline/0.13.42/wily-0.13.42.tar.gz
+patches/0001-fixes.patch
diff --git a/wily/version b/wily/version
@@ -0,0 +1 @@
+0.13.42 1
