From ec15e79f2cb4cbef778b6b5bcbaaf341891dea61 Mon Sep 17 00:00:00 2001
From: Martin Diehl <mail@martin-diehl.net>
Date: Wed, 14 May 2025 23:12:01 +0200
Subject: [PATCH] compiles with GCC 15

---
 archimedes-tools/PKGBUILD                 | 18 ++++++++++++------
 archimedes-tools/showme_functions.patch   | 11 +++++++++++
 archimedes-tools/triangle_functions.patch | 13 +++++++++++++
 3 files changed, 36 insertions(+), 6 deletions(-)
 create mode 100644 archimedes-tools/showme_functions.patch
 create mode 100644 archimedes-tools/triangle_functions.patch

diff --git a/archimedes-tools/PKGBUILD b/archimedes-tools/PKGBUILD
index c16f88e..0300924 100644
--- a/archimedes-tools/PKGBUILD
+++ b/archimedes-tools/PKGBUILD
@@ -5,27 +5,33 @@
 pkgbase=archimedes-tools
 pkgname=('triangle' 'showme')
 pkgver=1.6
-pkgrel=8
+pkgrel=9
 arch=('i686' 'x86_64')
 url='http://www.cs.cmu.edu/~quake/archimedes.html'
 pkgdesc='Archimedes is a set of tools, including mesh generators, for performing unstructured finite element simulations'
 license=('custom')
 source=('http://www.netlib.org/voronoi/triangle.zip'
-        'triangle_definitions.patch')
+        'triangle_definitions.patch'
+        'showme_functions.patch'
+        'triangle_functions.patch')
 md5sums=('10aff8d7950f5e0e2fb6dd2e340be2c9'
-         '98844d1b1d9de73101b660412132cd07')
+         '98844d1b1d9de73101b660412132cd07'
+         'ec7def5c6a10d2e854440ab0a221c0b9'
+         '749da38851cac18494ec7cc2b56c6a19')
 makedepends=('libx11')
 
 prepare() {
   patch < ${srcdir}/triangle_definitions.patch triangle.h
+  patch < ${srcdir}/triangle_functions.patch triangle.c
+  patch < ${srcdir}/showme_functions.patch showme.c
 }
 
 build(){
-  gcc ${CFLAGS} -o triangle triangle.c -lm
-  gcc ${CFLAGS} -DTRILIBRARY -Wall -fpic -c triangle.c
+  gcc ${CFLAGS} -DANSI_DECLARATORS -o triangle triangle.c -lm
+  gcc ${CFLAGS} -DANSI_DECLARATORS -DTRILIBRARY -Wall -fpic -c triangle.c
   gcc ${CFLAGS} -shared -o libtriangle.so triangle.o
 
-  gcc ${CFLAGS} -o showme showme.c -lX11
+  gcc ${CFLAGS} -DANSI_DECLARATORS -o showme showme.c -lX11
 }
 
 package_triangle() {
diff --git a/archimedes-tools/showme_functions.patch b/archimedes-tools/showme_functions.patch
new file mode 100644
index 0000000..1ae8e23
--- /dev/null
+++ b/archimedes-tools/showme_functions.patch
@@ -0,0 +1,11 @@
+--- showme.c.orig	2005-07-28 17:44:26.000000000 +0200
++++ showme.c.new	2025-05-14 23:04:25.076290384 +0200
+@@ -107,7 +107,7 @@
+ 
+ /* A necessary forward declaration.                                          */
+ 
+-int load_image();
++int load_image(int inc, int image);
+ 
+ Display *display;
+ int screen;
diff --git a/archimedes-tools/triangle_functions.patch b/archimedes-tools/triangle_functions.patch
new file mode 100644
index 0000000..4a29496
--- /dev/null
+++ b/archimedes-tools/triangle_functions.patch
@@ -0,0 +1,13 @@
+--- triangle.c.orig	2005-07-29 00:11:32.000000000 +0200
++++ triangle.c.new	2025-05-14 22:57:38.610943287 +0200
+@@ -360,8 +360,8 @@
+ /* A few forward declarations.                                               */
+ 
+ #ifndef TRILIBRARY
+-char *readline();
+-char *findfield();
++char *readline(char *string, FILE *infile, char *infilename);
++char *findfield(char *string);
+ #endif /* not TRILIBRARY */
+ 
+ /* Labels that signify the result of point location.  The result of a        */