pyrox.dev
wily: fix build for gcc14
+123
pkgs/by-name/wi/wily/fix-gcc14-build.patch
+123
pkgs/by-name/wi/wily/fix-gcc14-build.patch
···
1
+
diff --git a/include/libc.h b/include/libc.h
2
+
index d056f70..1a2679d 100644
3
+
--- a/include/libc.h
4
+
+++ b/include/libc.h
5
+
@@ -60,3 +60,8 @@ extern int notify (void(*)(void *, char *));
6
+
extern int errstr(char *);
7
+
extern char* getuser(void);
8
+
extern void exits(char*);
9
+
+
10
+
+#include <string.h>
11
+
+#include <stdlib.h>
12
+
+#include <stdio.h>
13
+
+#include <unistd.h>
14
+
diff --git a/libXg/arith.c b/libXg/arith.c
15
+
index 5cf6f65..5fe0703 100644
16
+
--- a/libXg/arith.c
17
+
+++ b/libXg/arith.c
18
+
@@ -107,17 +107,20 @@ rshift(Rectangle r, int a)
19
+
return r;
20
+
}
21
+
22
+
+int
23
+
eqpt(Point p, Point q)
24
+
{
25
+
return p.x==q.x && p.y==q.y;
26
+
}
27
+
28
+
+int
29
+
eqrect(Rectangle r, Rectangle s)
30
+
{
31
+
return r.min.x==s.min.x && r.max.x==s.max.x &&
32
+
r.min.y==s.min.y && r.max.y==s.max.y;
33
+
}
34
+
35
+
+int
36
+
rectXrect(Rectangle r, Rectangle s)
37
+
{
38
+
return r.min.x<s.max.x && s.min.x<r.max.x &&
39
+
@@ -134,6 +137,7 @@ rectinrect(Rectangle r, Rectangle s)
40
+
return r.max.x<=s.max.x && r.max.y<=s.max.y;
41
+
}
42
+
43
+
+int
44
+
ptinrect(Point p, Rectangle r)
45
+
{
46
+
return p.x>=r.min.x && p.x<r.max.x &&
47
+
diff --git a/libXg/clipline.c b/libXg/clipline.c
48
+
index b8bbaad..dd3870a 100644
49
+
--- a/libXg/clipline.c
50
+
+++ b/libXg/clipline.c
51
+
@@ -133,6 +133,7 @@ gsetline(Point *pp0, Point *pp1, Linedesc *l)
52
+
*/
53
+
54
+
static
55
+
+int
56
+
code(Point *p, Rectangle *r)
57
+
{
58
+
return( (p->x<r->min.x? 1 : p->x>=r->max.x? 2 : 0) |
59
+
diff --git a/libXg/gcs.c b/libXg/gcs.c
60
+
index 4d7d3d6..959cfbe 100644
61
+
--- a/libXg/gcs.c
62
+
+++ b/libXg/gcs.c
63
+
@@ -160,7 +160,7 @@ GC
64
+
_getgc(Bitmap *b, unsigned long gcvm, XGCValues *pgcv)
65
+
{
66
+
static GC gc0, gcn;
67
+
- static clipset = 0;
68
+
+ static int clipset = 0;
69
+
GC g;
70
+
XRectangle xr;
71
+
72
+
diff --git a/libXg/gwin.c b/libXg/gwin.c
73
+
index 24abb61..172cb46 100644
74
+
--- a/libXg/gwin.c
75
+
+++ b/libXg/gwin.c
76
+
@@ -25,6 +25,9 @@ static void Keyaction(Widget, XEvent *, String *, Cardinal*);
77
+
static void Mouseaction(Widget, XEvent *, String *, Cardinal*);
78
+
static String SelectSwap(Widget, String);
79
+
80
+
+long unicode(unsigned char *k);
81
+
+long latin1(unsigned char *k);
82
+
+
83
+
/* Data */
84
+
85
+
#define Offset(field) XtOffsetOf(GwinRec, gwin.field)
86
+
diff --git a/libXg/rectclip.c b/libXg/rectclip.c
87
+
index 9e03614..ae01bf6 100644
88
+
--- a/libXg/rectclip.c
89
+
+++ b/libXg/rectclip.c
90
+
@@ -2,6 +2,7 @@
91
+
#include <libc.h>
92
+
#include <libg.h>
93
+
94
+
+int
95
+
rectclip(Rectangle *rp, Rectangle b) /* first by reference, second by value */
96
+
{
97
+
Rectangle *bp = &b;
98
+
diff --git a/libXg/xtbinit.c b/libXg/xtbinit.c
99
+
index a711319..2870805 100644
100
+
--- a/libXg/xtbinit.c
101
+
+++ b/libXg/xtbinit.c
102
+
@@ -127,6 +127,12 @@ ioerr(Display *d)
103
+
return 0;
104
+
}
105
+
106
+
+static
107
+
+int ioerr_wrapped(Display *d, XErrorEvent *_)
108
+
+{
109
+
+ return ioerr(d);
110
+
+}
111
+
+
112
+
void
113
+
xtbinit(Errfunc f, char *class, int *pargc, char **argv, char **fallbacks)
114
+
{
115
+
@@ -174,7 +180,7 @@ xtbinit(Errfunc f, char *class, int *pargc, char **argv, char **fallbacks)
116
+
XtSetArg(args[n], XtNcomposeMod, &compose); n++;
117
+
XtGetValues(widg, args, n);
118
+
XSetIOErrorHandler(ioerr);
119
+
- XSetErrorHandler(ioerr);
120
+
+ XSetErrorHandler(ioerr_wrapped);
121
+
122
+
if (compose < 0 || compose > 5) {
123
+
n = 0;
+1
-7
pkgs/by-name/wi/wily/package.nix
+1
-7
pkgs/by-name/wi/wily/package.nix
···
20
20
libXt
21
21
];
22
22
23
-
env.NIX_CFLAGS_COMPILE = toString (
24
-
lib.optionals stdenv.cc.isClang [
25
-
"-Wno-error=implicit-int"
26
-
"-Wno-error=implicit-function-declaration"
27
-
"-Wno-error=incompatible-function-pointer-types"
28
-
]
29
-
);
23
+
patches = [ ./fix-gcc14-build.patch ];
30
24
31
25
preInstall = ''
32
26
mkdir -p $out/bin