gentoo auto-resync : 04:07:2024 - 08:06:07

3 files changed, 81 insertions, 3 deletions

diff --git a/net-p2p/ncdc/Manifest b/net-p2p/ncdc/Manifest
index b38ca4332456..7094633b7a71 100644
--- a/net-p2p/ncdc/Manifest
+++ b/net-p2p/ncdc/Manifest
@@ -1,7 +1,8 @@
+AUX ncdc-1.24-fix-clang16-c99-errors.patch 2247 BLAKE2B acc6c9e59ce4b28c040f830abd82ae7cb3c0dfee4db9e2eb66c8c20e7eb4bd80904c4d31a743c62a7c206debc54f6b96c4f5247d175b72db59d292a5a0ae38de SHA512 f483eed3037761bf80172782743d88da2df3d1a090dedf5cb1cda95d343a3f32229ec85e713398f4294804cf367399907bdd533e2b31198f5bac8446c17d04fb
 DIST ncdc-1.23.1.tar.gz 378481 BLAKE2B 0eb59b88351008c281e7380fb5899b0cfb5f99dac5f17eed391a7da4f95a431a0a68a70c228dec17c235029bae89f8170319f9b28c5a2dc04706ea21b8c91879 SHA512 9e38387ac816499c25a28bf70e548d560265c84d12b9bfd1701decea642c4ab33b3bb5ea9c015c3048e491f9f208c6c26a63d2ce722e831f84f703a6c9f2b86c
 DIST ncdc-1.23.1.tar.gz.asc 833 BLAKE2B ce9f4bd4a612fe862ab34e659e41c2134f31394e285af9d0e3f9ec034f44ccaead2c56db3b9cbb4eee32dab61c86ddb308cbb18023ce1aaf11af9b2ec6d4c67b SHA512 28270437bd08fbcc40a645eef8d71f2ab350314507b66fbd504c7ccab4899af51f483038cefa17d879213a419465ae27a4da8a3fe0598244357f2836a6a5d771
 DIST ncdc-1.24.tar.gz 377617 BLAKE2B 8528de13d6ee12358c335b921c7edc0f7df719245d23f4fb4a94512f4812249e3294f822452e3b1f508e8c7446bcd01bd347ad7745a63fbd360f1233c9e8be64 SHA512 332fd467d10d3acb2a2171395c41112280cadfea06369820dcc4481eae3c24602c98aa5056f479d3a2e80b3992a02b280819933b43ae5bc39885696703d46b39
 DIST ncdc-1.24.tar.gz.asc 833 BLAKE2B 1729293836f2e414ca19c4cbe25cf23099666b5f7eed6787717ee2c39f425ced147b02c2eb10da5d17093f7381ba9668b2a5567d13df862a9a809c5e7523b1ff SHA512 148353be0b899c18427abe0a33c6788324a80e83ecb1ef6f59f008debc9c20ad48403e145ed865c0d9e73d14ab6d082525ab7eb60fe05a7893946b1c414d039e
 EBUILD ncdc-1.23.1.ebuild 974 BLAKE2B 76e617f1fd2deac1e17b4739d1f4cb7ede4e769384ddc845822d16d0f240f0bc280cf199387b15a65bbce0ec6906395875be2feb7dcde44988ba9328a4d150cb SHA512 9685940fdd9f5e0ed0b41b21429e7d7526e220f10b23ddaa80f788710de9e1ca13b4298f5ef61ae4286fc6a69411fc31f5ff26528b9c7424222699af71eb95c3
-EBUILD ncdc-1.24.ebuild 976 BLAKE2B a35bb91cb45c03a35d50dacb4c9fad79a6c8e9d26a13d2d658abdd3d7327cedf65b09c85d40d744299681e8f5664d754eba2dba2f8579d31beeae7fbd9ee662e SHA512 177aa73d80ed2465714b5360d65b82d527c3efe99cc1cad409f44dcca7b35f52adac893776919a9cf857aeae234fdeb7efd3ef2be1eeff540664a31a09b7c54b
+EBUILD ncdc-1.24-r1.ebuild 1044 BLAKE2B 4568ec496907bb0d34f13a2f178730a7ff4d945fc1e56ff9dd91044b640ee8c25199dd8e5f0973edba29f8e0699e13e382aa1c12f019875c194a37421108fdb0 SHA512 418c4fb157e69829a774e1dbcf1aabd8412cc1936bafe48bae5c84b251e9e0eef00f9d6775490de3c68be27061579b38e27cc66a233cd89b5a4d0b271752abee
 MISC metadata.xml 724 BLAKE2B f319a94fe3aaad903ab2d19c81fd2390d8ae0228439d320fb48d158668c3cb96985319b67eef969982dbf07bf574045fab6fa5a2ee251f89fbee8db4414be2c4 SHA512 31461ee63515cd2c7d0cfd4d7ed22acbf2a15dea699755df33aace50d674a854b79413b67f810cb29688d841f50081e1bb8a349af8bf374d4015781e08115e40
diff --git a/net-p2p/ncdc/files/ncdc-1.24-fix-clang16-c99-errors.patch b/net-p2p/ncdc/files/ncdc-1.24-fix-clang16-c99-errors.patch
new file mode 100644
index 000000000000..4be7472e00fd
--- /dev/null
+++ b/net-p2p/ncdc/files/ncdc-1.24-fix-clang16-c99-errors.patch
@@ -0,0 +1,72 @@
+Upstream PR: https://code.blicky.net/yorhel/ncdc/pulls/108 .
+
+From 42590da4741baf93889773df96e0f3546d2e7f20 Mon Sep 17 00:00:00 2001
+From: Eric Joldasov <bratishkaerik@landless-city.net>
+Date: Tue, 9 Apr 2024 00:09:53 +0500
+Subject: [PATCH] Fix Clang 16 errors for invalid C99 constructs
+ (-Wincompatible-pointer-types)
+
+These errors were caused by `t_title` function having "void" parameter
+instead of "ui_tab_t *tab", like everywhere else:
+
+```
+src/uit_conn.c:398:41: error: initialization of char * (*)(ui_tab_t *) from incompatible pointer type char * (*)(void) [-Wincompatible-pointer-types]
+  398 | ui_tab_type_t uit_conn[1] = { { t_draw, t_title, t_key, t_close } };
+      |                                         ^~~~~~~
+```
+
+Also renamed `t` param in `t_title` of "src/uit_main.c" to `tab`,
+for consistency with other functions.
+
+This error appeared only in 1.24 release cycle, because changing
+prototypes from "()" to "(void)" in 2cf47a7ec9f35d1afaf24a6f9644fbecf6df92df
+changed meaning of the type from "any parameters, including ui_tab_t *"
+to "no parameters at all", and this is where Clang starts to complain.
+
+Bug: https://bugs.gentoo.org/928946
+Signed-off-by: Eric Joldasov <bratishkaerik@landless-city.net>
+---
+ src/uit_conn.c | 2 +-
+ src/uit_dl.c   | 2 +-
+ src/uit_main.c | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/uit_conn.c b/src/uit_conn.c
+index f0fa171..ba00cb3 100644
+--- a/src/uit_conn.c
++++ b/src/uit_conn.c
+@@ -97,7 +97,7 @@ static void t_close(ui_tab_t *tab) {
+ }
+ 
+ 
+-static char *t_title(void) {
++static char *t_title(ui_tab_t *tab) {
+   return g_strdup("Connection list");
+ }
+ 
+diff --git a/src/uit_dl.c b/src/uit_dl.c
+index 118f323..f8cda84 100644
+--- a/src/uit_dl.c
++++ b/src/uit_dl.c
+@@ -124,7 +124,7 @@ static void t_close(ui_tab_t *tab) {
+ }
+ 
+ 
+-static char *t_title(void) {
++static char *t_title(ui_tab_t *tab) {
+   return g_strdup("Download queue");
+ }
+ 
+diff --git a/src/uit_main.c b/src/uit_main.c
+index e3fdfad..79b3ffa 100644
+--- a/src/uit_main.c
++++ b/src/uit_main.c
+@@ -65,7 +65,7 @@ static void t_draw(ui_tab_t *t) {
+ }
+ 
+ 
+-static char *t_title(ui_tab_t *t) {
++static char *t_title(ui_tab_t *tab) {
+   return g_strdup_printf("Welcome to ncdc %s!", main_version);
+ }
+ 
diff --git a/net-p2p/ncdc/ncdc-1.24.ebuild b/net-p2p/ncdc/ncdc-1.24-r1.ebuild
index cff76b11e27f..f3f6d1e46814 100644
--- a/net-p2p/ncdc/ncdc-1.24.ebuild
+++ b/net-p2p/ncdc/ncdc-1.24-r1.ebuild
@@ -11,10 +11,11 @@ SRC_URI="
 	https://dev.yorhel.nl/download/${P}.tar.gz
 	verify-sig? ( https://dev.yorhel.nl/download/${P}.tar.gz.asc )
 "
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-
 LICENSE="MIT"
 SLOT="0"
+
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
 IUSE="geoip"
 
 RDEPEND="
@@ -36,6 +37,10 @@ BDEPEND="
 
 VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/yoranheling.asc
 
+PATCHES=(
+	"${FILESDIR}/ncdc-1.24-fix-clang16-c99-errors.patch"
+)
+
 src_configure() {
 	local myeconfargs=(
 		$(use_with geoip)