commit 4e61ab6

hovercats  ·  2026-02-02 11:00:14 +0000 UTC
parent b12b128 
tinyx: fix build with gcc 15.x.x
5 files changed,  +40, -2
M repo/tinyx/build
M repo/tinyx/checksums
A repo/tinyx/patches/0002-dbe.c-fix-number-of-arguments.patch
M repo/tinyx/sources
M repo/tinyx/version
M repo/tinyx/build
+3, -1 
 1@@ -4,7 +4,9 @@ export LDFLAGS="$LDFLAGS -static-pie"
 2 export XSERVERCFLAGS_CFLAGS="-fPIE"
 3 export XSERVERLIBS_LIBS="/usr/lib/*.a -lz -lfreetype -lpng16"
 4 
 5-patch -p1 < 0001-Xext-INITARGS-does-not-specify-a-type.-change-to-int.patch
 6+for p in *.patch; do
 7+	patch -p1 < "$p"
 8+done
 9 
10 ./configure \
11   --prefix=/usr \
M repo/tinyx/checksums
+1, -0 
1@@ -1,3 +1,4 @@
2 6126c1285a84968a0a4c9caafdae653e51108a89d9f74d82a52bb24b90f3ba1ebe
3 78fb9658f2ce79b689d57ae9dc3f9a19e4d0cb859a8d5b404f660eaa2b36a68eac
4 095cbd64b386c1851ade3e38b6b711346f5faf6e3f7deaabf70d6f5257c20f36f2
5+b2c930e2d215542d6b7c88e3405bf9317c405e51c5f2b87dd968f48209780f6347
A repo/tinyx/patches/0002-dbe.c-fix-number-of-arguments.patch
+34, -0 
 1@@ -0,0 +1,34 @@
 2+From a7a76e7a10adb4211798dfd135af785f50f276c0 Mon Sep 17 00:00:00 2001
 3+From: hovercats <hovercatswithlasereyes@protonmail.com>
 4+Date: Mon, 2 Feb 2026 11:55:56 +0100
 5+Subject: [PATCH] dbe.c: fix number of arguments
 6+
 7+---
 8+ dbe/dbe.c | 4 ++--
 9+ 1 file changed, 2 insertions(+), 2 deletions(-)
10+
11+diff --git a/dbe/dbe.c b/dbe/dbe.c
12+index 2e945be..c51efe6 100644
13+--- a/dbe/dbe.c
14++++ b/dbe/dbe.c
15+@@ -52,7 +52,7 @@
16+ /* GLOBALS */
17+ 
18+ /* Per-screen initialization functions [init'ed by DbeRegisterFunction()] */
19+-static Bool (*DbeInitFunct[MAXSCREENS]) ();     /* pScreen, pDbeScreenPriv */
20++static Bool (*DbeInitFunct[MAXSCREENS]) (ScreenPtr pScreen, DbeScreenPrivPtr pDbeScreenPriv);
21+ 
22+ /* These are static globals copied to DBE's screen private for use by DDX */
23+ static int dbeScreenPrivIndex;
24+@@ -116,7 +116,7 @@ DbeValidateBuffer(WindowPtr pWin, XID drawID, Bool dstbuf)
25+  *****************************************************************************/
26+ 
27+ void
28+-DbeRegisterFunction(ScreenPtr pScreen, Bool (*funct) ( /* ??? */ ))
29++DbeRegisterFunction(ScreenPtr pScreen, void *funct)
30+ {
31+     int i;
32+ 
33+-- 
34+2.49.0
35+
M repo/tinyx/sources
+1, -0 
1@@ -1,3 +1,4 @@
2 https://github.com/hovercats/tinyx/releases/download/pre-gen-eed4902840732f170a7020cedb381017de99f2e6/tinyx-eed4902840732f170a7020cedb381017de99f2e6.tar.gz
3 https://github.com/kyx0r/repo-main/releases/download/tinyxfont_1.0/tinyxfont.tar.gz
4 patches/0001-Xext-INITARGS-does-not-specify-a-type.-change-to-int.patch
5+patches/0002-dbe.c-fix-number-of-arguments.patch
M repo/tinyx/version
+1, -1 
1@@ -1 +1 @@
2-eed4902840732f170a7020cedb381017de99f2e6 2
3+eed4902840732f170a7020cedb381017de99f2e6 3