Control: tags 1097437 + patch
Control: tags 1097437 + pending

Dear maintainer,

I've prepared an NMU for ncdc (versioned as 1.23.1-1.1) and uploaded
it to DELAYED/14. Please feel free to tell me if I should cancel it.

cu
Adrian
diffstat for ncdc-1.23.1 ncdc-1.23.1

 changelog                                                               |    7 
 patches/0001-Fix-Clang-16-errors-for-invalid-C99-constructs-Winco.patch |   73 ++++++++++
 patches/series                                                          |    1 
 3 files changed, 81 insertions(+)

diff -Nru ncdc-1.23.1/debian/changelog ncdc-1.23.1/debian/changelog
--- ncdc-1.23.1/debian/changelog	2020-01-01 02:00:01.000000000 +0200
+++ ncdc-1.23.1/debian/changelog	2025-11-30 05:04:27.000000000 +0200
@@ -1,3 +1,10 @@
+ncdc (1.23.1-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Backport upstream fix for FTBFS with GCC 15. (Closes: #1097437)
+
+ -- Adrian Bunk <[email protected]>  Sun, 30 Nov 2025 05:04:27 +0200
+
 ncdc (1.23.1-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru ncdc-1.23.1/debian/patches/0001-Fix-Clang-16-errors-for-invalid-C99-constructs-Winco.patch ncdc-1.23.1/debian/patches/0001-Fix-Clang-16-errors-for-invalid-C99-constructs-Winco.patch
--- ncdc-1.23.1/debian/patches/0001-Fix-Clang-16-errors-for-invalid-C99-constructs-Winco.patch	1970-01-01 02:00:00.000000000 +0200
+++ ncdc-1.23.1/debian/patches/0001-Fix-Clang-16-errors-for-invalid-C99-constructs-Winco.patch	2025-11-30 05:01:26.000000000 +0200
@@ -0,0 +1,73 @@
+From a9112b306ff774166fc24134d214fefee47e2a5e Mon Sep 17 00:00:00 2001
+From: Eric Joldasov <[email protected]>
+Date: Tue, 9 Apr 2024 00:09:53 +0500
+Subject: 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 <[email protected]>
+---
+ 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 28a0c81..50becd9 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() {
++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 7483328..0bace93 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() {
++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 c11f2fc..9439edd 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);
+ }
+ 
+-- 
+2.30.2
+
diff -Nru ncdc-1.23.1/debian/patches/series ncdc-1.23.1/debian/patches/series
--- ncdc-1.23.1/debian/patches/series	1970-01-01 02:00:00.000000000 +0200
+++ ncdc-1.23.1/debian/patches/series	2025-11-30 05:04:27.000000000 +0200
@@ -0,0 +1 @@
+0001-Fix-Clang-16-errors-for-invalid-C99-constructs-Winco.patch

Reply via email to