summarylogtreecommitdiffstats
path: root/koules-1.4-multiple-definition.patch
diff options
context:
space:
mode:
authorMarkus Heidelberg2023-12-21 01:23:32 +0100
committerMarkus Heidelberg2023-12-21 01:23:32 +0100
commit55774551f791d45649c00efc8aaa24bd2a41bd69 (patch)
treea1096883901bc60db0f73cfc3eab0e37c3d5cf08 /koules-1.4-multiple-definition.patch
parent87164a3484f9f6c7fb98419802886d22fe251b5f (diff)
downloadaur-koules.tar.gz
koules 1.4-6: fix for makedepends and link error
Combined package 'xorgproto' replaces 'xextproto' and 'xproto' since nearly six years: https://gitlab.archlinux.org/archlinux/packaging/packages/xorgproto/-/commit/34bcd7631dd89c2c1f8e91dcd76139cc014ae720 Link error fixed: /usr/bin/ld: server.o:(.bss+0x10000): multiple definition of `controls'; koules.o:(.bss+0x7d160): first defined here
Diffstat (limited to 'koules-1.4-multiple-definition.patch')
-rw-r--r--koules-1.4-multiple-definition.patch17
1 files changed, 17 insertions, 0 deletions
diff --git a/koules-1.4-multiple-definition.patch b/koules-1.4-multiple-definition.patch
new file mode 100644
index 000000000000..e6e043206ce4
--- /dev/null
+++ b/koules-1.4-multiple-definition.patch
@@ -0,0 +1,17 @@
+Remove duplicated global symbol, controls[] is already defined in koules.c
+
+Fixes this link error:
+/usr/bin/ld: server.o:(.bss+0x10000): multiple definition of `controls'; koules.o:(.bss+0x7d160): first defined here
+
+diff --git a/server.c b/server.c
+index 5463244..e8e80f4 100644
+--- a/server.c
++++ b/server.c
+@@ -80,7 +80,6 @@ static long sizes[MAXPACKET];
+ static long isizes[MAXPACKET];
+ char acceled[5];
+ #endif
+-struct control controls[MAXROCKETS];
+ static unsigned char Clientmap[5];
+ static int Socket;
+ /*static int tbreak; */