gentoo auto-resync : 06:11:2022 - 09:19:37

4 files changed, 81 insertions, 30 deletions

diff --git a/media-sound/timidity++/Manifest b/media-sound/timidity++/Manifest
index 1ebcd53b3e1e..dc90ed7a7d41 100644
--- a/media-sound/timidity++/Manifest
+++ b/media-sound/timidity++/Manifest
@@ -6,7 +6,7 @@ AUX timidity++-2.14.0-CVE-2017-11547.patch 2480 BLAKE2B 6db9598d7f8c9b969163f8ce
 AUX timidity++-2.14.0-ar.patch 822 BLAKE2B ecd76b6297cfc6fa04fdc1760dad9879a2835db79378df98a224e758d22aaa08fa7cd6f82c16b394e6d6b4bd103b9f69b7ff84b2c7ebb1b0c82c487cc8eb5dd5 SHA512 b0c26daa94361bc471034431c0632052ceb2a8e001caabfb7e08bd3f401932724981dc2c903132f9319d16038f7bac05843ca8da1112a5a3bab626c88244514b
 AUX timidity++-2.14.0-configure-flags.patch 4241 BLAKE2B d1d083ad5e397aa0e827cd21eb98b4143638559c31d38d9541f41a6d4dc12358a1c17c8115f956e177359f9ca122ee44e775abd7b6009777ca1eaaaeeadd59a1 SHA512 be9ca5a580a47af5eb29e180c81b141628692e2cb538113b3ec596e4b800fb6d4792fa4c72921414ba41a8e6932ae655e9b9a1428021333471e2929fdab07b17
 AUX timidity++-2.14.0-params.patch 716 BLAKE2B d4426e36db91fea9561a81bacb5337c8da3e385a598ebd61a38cb00ff2ab8be5b07c6259068ea31e11d0e755b28ba5769ee0cf9e6a7c31a272d1145d70e0521c SHA512 b35596de8ba6ffc4ff91a8ab7a2a0a25c658af97f8aa4e226737e910227e2a11bf4b227a5f8c61ddc1452cd614e03f75736787a2240cc530e90aba437371a09a
-AUX timidity++-2.15.0-clang-15-configure.patch 1067 BLAKE2B 0d8bc594306b4f8fdb121639ffbaf4adc8c89a0959b3fb2b43f51dc9a590c926632f408f5427f3151350b2d1afc05c1665fe669a6596d6abff39332fbd1833a6 SHA512 60b5b06657ce441d52e8ce5f9372dd4a620b7f3d279a6ec92626d41fac83ccab6bbf679a1b24e22771eeffec1d7b3a33f37bb6ed2c93699e70d5828d731bfedf
+AUX timidity++-2.15.0-clang-16-configure.patch 2049 BLAKE2B 44b63118a07200ae9daf639363af684704e1a28af8c7834f3ba75d2a73e3c06501ec4bb4ca8b1419b1fc038f7258fefd88fae15db9e17676ac6b0ac7b28336e3 SHA512 d1dfb05e97e4f76d8037a7cb23c729421aee33616512ed814f47b17d47636fe63e905b021083be29066a8d8856eb78500044e259974dfa58640a6657b25e1ee3
 AUX timidity++-2.15.0-lto-workaround.patch 319 BLAKE2B a0aa616e6e3626a5694879e8e61bfb2242e71b5e216bdb5b4aa7d5eee95aa0a800a0ff4987e1492badf12e2e1aa1c3a4c58539994718e21839d8d2fe6db669c6 SHA512 ee7949bd54e2be657c3f45b1b4848162d2655682f86acf5474c69343c35dc7bff677b588820735ec2ad29a0e8d6e9a868c8c0ecdf9a9c79d4d4e69764ef9f214
 AUX timidity++-2.15.0-pkg-config.patch 4257 BLAKE2B f9e81fdc50ff485636aaab4b0c74e7a7caba49eb8884b5176b2a71a3a582542300872786ec56886d645f8b6ec23b5312908053c47c5b107d8ecf905dbdd27402 SHA512 e6ae48d17d0b7b9589df3e90e5923cd53c86b59b2730306c2ec76f8c20013e8befd70e36d4c2629bae906cb967c1404b3595334a6f208f8799d7fbd6e030fe08
 AUX timidity.cfg-r1 669 BLAKE2B 023edf8f503f23817c1941a0cb1a0341f0ff1475405fc906a9acf4adb36ca8769bc015df5c30af50a828dd522d214bf9d6c4feabe2db3419e8100ebd431fdbdb SHA512 98f0690bda6deed6022e97e74a6114334d5f965d646d7c7d150ac177f6eb78277e931ed0b4c5613ef16ba648eaad66a3ed72ed933ca936698ca81365151b223b
@@ -14,5 +14,5 @@ AUX timidity.desktop.2 257 BLAKE2B 6c7f88a3ccd9fc4ea90cd228e6d04d799430a78361d6d
 AUX timidity.service 190 BLAKE2B 909311fae666b9970a8b4d56e1848f907ffeff1fc9e0cacc7a89027ec1ce6a555ea01570328d75425b006752d6332cf278642ec9a7c27b9c9adb2cb7621e241e SHA512 1022c1e37e2a97fba414673860ec89bc146da208981dd50d9486c525b47c74ae146acef2d75ceec26335c3ab98b2c928ce480a161637990ecd737507a6c21b49
 AUX timidity.xpm 1522 BLAKE2B 9aee528dbf843d992d548adc923f817373013760128ae96df7becb6bc844a95ddc056b072dbaea1528d9db5c2d4836b09f8316b740c75033fc23a0bb76186fab SHA512 1630fc235e450e5420c598357ad98eed6f04b1d1035fd6284dfeb2e633ce5d80135f89ea593d58b4eac2b9405383787e4d891b9c22ff8b5ac3ece64e9abe7d4e
 DIST TiMidity++-2.15.0.tar.xz 1363040 BLAKE2B 63612dc96ddef9b24ca35a8fa24c22fee8b0573efb09543e6017070b2d0a68494bc34afe8ffc50b5f7fe2d95397a971d5dc7afd4c9adbb524b119012e716b7f7 SHA512 36c3c79d941903109d5d6d529963d12e8192a857e80402ad5ab0d1e223451a7cf5dc8fdd046b22ae7da96f413d68db8587a8fce348635838eba2f30f7019192f
-EBUILD timidity++-2.15.0-r5.ebuild 5991 BLAKE2B 90f322af98cb128d9fed68a4100004cb5fb0658b1cc9f2d9a9f47a21ec534bee00ba3a03e867d64bc6213c6f409331bd0a92ac7a2b7e9c143fce3406ef52c3a9 SHA512 b6522cc30aded35718924f7e72db792c410d32e65d7c1f937cad5f0b0713acbe99a07ae04be1fa0b873281561c77c35a0f4585e72ef2294c21d1a9fe56765894
+EBUILD timidity++-2.15.0-r6.ebuild 5991 BLAKE2B a11daae2fa01f65bb72a3afa1239abd5c33994104446dbcfab385dd20ed431e8325f5647876c76f6897780081b425e7909e3dd385d5a07540d65bd1f96570588 SHA512 d66c08e73055f24b5dafbe1515485502f1f7b5a42aa6435c35693c79d2dddc5b6597a12322f0b840dfd758ac2c3f887aac3b8ed00ca3e3700bfbdb8c00205606
 MISC metadata.xml 332 BLAKE2B 417167c38c5b331872b74c9dd82d3c386cf4ea5f963201eb20744ff043ff74943867190193f87d7c5220435b38550d6a01a2879803df12934ead428d5f684126 SHA512 5e8adfac2728f35a8bda3e042450c5554ab9aa4a5addbf3dd4fa4dbe3a426a98a9a79fa8cca64c27934707d3564a26bfdc9e5acdb4f79590681885e07cd32bbb
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() {