media-sound/timidity++: further Clang 16 fixes

Fixes: 8ebfae3dd7d5badea7fa7dd04bbd59bfd96762b5
Signed-off-by: Sam James <sam@gentoo.org>

3 files changed, 79 insertions, 28 deletions

diff --git a/media-sound/timidity++/files/timidity++-2.15.0-clang-15-configure.patch b/media-sound/timidity++/files/timidity++-2.15.0-clang-15-configure.patch
deleted file mode 100644
index 80fa7a904d12..000000000000
--- a/media-sound/timidity++/files/timidity++-2.15.0-clang-15-configure.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-conftest.c:114:4: error: call to undeclared library function 'exit' with type 'void (int) __attribute__((noreturn))'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
---- a/configure.in
-+++ b/configure.in
-@@ -696,6 +696,7 @@ dnl ***
- AC_CACHE_CHECK([for an implementation of va_copy()],lib_cv_va_copy,[
- 	AC_RUN_IFELSE([AC_LANG_SOURCE([[
- 	#include <stdarg.h>
-+	#include <stdlib.h>
- 	void f (int i, ...) {
- 	va_list args1, args2;
- 	va_start (args1, i);
-@@ -715,6 +716,7 @@ AC_CACHE_CHECK([for an implementation of va_copy()],lib_cv_va_copy,[
- AC_CACHE_CHECK([for an implementation of __va_copy()],lib_cv___va_copy,[
- 	AC_RUN_IFELSE([AC_LANG_SOURCE([[
- 	#include <stdarg.h>
-+	#include <stdlib.h>
- 	void f (int i, ...) {
- 	va_list args1, args2;
- 	va_start (args1, i);
-@@ -745,6 +747,7 @@ fi
- AC_CACHE_CHECK([whether va_lists can be copied by value],lib_cv_va_val_copy,[
- 	AC_RUN_IFELSE([AC_LANG_SOURCE([[
- 	#include <stdarg.h>
-+	#include <stdlib.h>
- 	void f (int i, ...) {
- 	va_list args1, args2;
- 	va_start (args1, i);
diff --git a/media-sound/timidity++/files/timidity++-2.15.0-clang-16-configure.patch b/media-sound/timidity++/files/timidity++-2.15.0-clang-16-configure.patch
new file mode 100644
index 000000000000..6e29a11cad3b
--- /dev/null
+++ b/media-sound/timidity++/files/timidity++-2.15.0-clang-16-configure.patch
@@ -0,0 +1,78 @@
+From 41c0a19ae6e67e518f9f9c43bc7d7b61971bef4e Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sun, 6 Nov 2022 03:27:57 +0000
+Subject: [PATCH] Fix configure with Clang 15
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/autoconf/utils.m4
++++ b/autoconf/utils.m4
+@@ -62,11 +62,12 @@ yes) i_dlfcn=define;;
+ *)   i_dlfcn=undef;;
+ esac
+ cat > dyna.c <<EOM
+-fred () { }
++int fred (void) { }
+ EOM
+ 
+ cat > fred.c <<EOM
+ #include <stdio.h>
++#include <stdlib,h>
+ #$i_dlfcn I_DLFCN
+ #ifdef I_DLFCN
+ #include <dlfcn.h>      /* the dynamic linker include file for Sunos/Solaris */
+@@ -76,9 +77,9 @@ cat > fred.c <<EOM
+ #include <link.h>
+ #endif
+ 
+-extern int fred() ;
++extern int fred(void) ;
+ 
+-main()
++int main(void)
+ {
+     void * handle ;
+     void * symbol ;
+--- a/configure.in
++++ b/configure.in
+@@ -696,6 +696,7 @@ dnl ***
+ AC_CACHE_CHECK([for an implementation of va_copy()],lib_cv_va_copy,[
+ 	AC_RUN_IFELSE([AC_LANG_SOURCE([[
+ 	#include <stdarg.h>
++	#include <stdlib.h>
+ 	void f (int i, ...) {
+ 	va_list args1, args2;
+ 	va_start (args1, i);
+@@ -704,7 +705,7 @@ AC_CACHE_CHECK([for an implementation of va_copy()],lib_cv_va_copy,[
+ 	  exit (1);
+ 	va_end (args1); va_end (args2);
+ 	}
+-	int main() {
++	int main(void) {
+ 	  f (0, 42);
+ 	  return 0;
+ 	}]])],
+@@ -715,6 +716,7 @@ AC_CACHE_CHECK([for an implementation of va_copy()],lib_cv_va_copy,[
+ AC_CACHE_CHECK([for an implementation of __va_copy()],lib_cv___va_copy,[
+ 	AC_RUN_IFELSE([AC_LANG_SOURCE([[
+ 	#include <stdarg.h>
++	#include <stdlib.h>
+ 	void f (int i, ...) {
+ 	va_list args1, args2;
+ 	va_start (args1, i);
+@@ -723,7 +725,7 @@ AC_CACHE_CHECK([for an implementation of __va_copy()],lib_cv___va_copy,[
+ 	  exit (1);
+ 	va_end (args1); va_end (args2);
+ 	}
+-	int main() {
++	int main(void) {
+ 	  f (0, 42);
+ 	  return 0;
+ 	}]])],
+@@ -745,6 +747,7 @@ fi
+ AC_CACHE_CHECK([whether va_lists can be copied by value],lib_cv_va_val_copy,[
+ 	AC_RUN_IFELSE([AC_LANG_SOURCE([[
+ 	#include <stdarg.h>
++	#include <stdlib.h>
+ 	void f (int i, ...) {
+ 	va_list args1, args2;
+ 	va_start (args1, i);
diff --git a/media-sound/timidity++/timidity++-2.15.0-r5.ebuild b/media-sound/timidity++/timidity++-2.15.0-r6.ebuild
index 0cfd3912605d..df0a65c5b44c 100644
--- a/media-sound/timidity++/timidity++-2.15.0-r5.ebuild
+++ b/media-sound/timidity++/timidity++-2.15.0-r6.ebuild
@@ -67,7 +67,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.15.0-pkg-config.patch
 	"${FILESDIR}"/${PN}-2.14.0-CVE-2017-1154{6,7}.patch
 	"${FILESDIR}"/${PN}-2.15.0-lto-workaround.patch
-	"${FILESDIR}"/${PN}-2.15.0-clang-15-configure.patch
+	"${FILESDIR}"/${PN}-2.15.0-clang-16-configure.patch
 )
 
 src_prepare() {