Control: tags 997293 + patch Control: tags 997293 + pending
Dear maintainer, I've prepared an NMU for pinfo (versioned as 0.6.13-1.2) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Regards. -- .''`. https://info.comodo.priv.at -- Debian Developer https://www.debian.org : :' : OpenPGP fingerprint D1E1 316E 93A7 60A8 104D 85FA BB3A 6801 8649 AA06 `. `' Member VIBE!AT & SPI Inc. -- Supporter Free Software Foundation Europe `-
diff -Nru pinfo-0.6.13/debian/changelog pinfo-0.6.13/debian/changelog
--- pinfo-0.6.13/debian/changelog 2020-10-28 20:06:48.000000000 +0100
+++ pinfo-0.6.13/debian/changelog 2022-05-08 14:36:50.000000000 +0200
@@ -1,3 +1,13 @@
+pinfo (0.6.13-1.2) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix "FTBFS: video.c:112:26: error: format '%d' expects argument of type
+ 'int', but argument 2 has type 'long unsigned int' [- Werror=format=]":
+ Add patch from upstream Git repository to use %ld to print longs.
+ (Closes:#997293)
+
+ -- gregor herrmann <gre...@debian.org> Sun, 08 May 2022 14:36:50 +0200
+
pinfo (0.6.13-1.1) unstable; urgency=medium
* Non-maintainer upload.
diff -Nru pinfo-0.6.13/debian/patches/Werror-format.patch pinfo-0.6.13/debian/patches/Werror-format.patch
--- pinfo-0.6.13/debian/patches/Werror-format.patch 1970-01-01 01:00:00.000000000 +0100
+++ pinfo-0.6.13/debian/patches/Werror-format.patch 2022-05-08 14:36:46.000000000 +0200
@@ -0,0 +1,39 @@
+From ab604fdb67296dad27f3a25f3c9aabdd2fb8c3fa Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <sly...@gmail.com>
+Date: Thu, 11 Nov 2021 19:02:24 +0000
+Subject: [PATCH] src/video.c: use %ld to print longs
+
+ncurses-6.3 added printf()-stype attribute annotations for gcc-like
+compilers that can now detect argument mismatches:
+
+ video.c:114:26: error: format '%d' expects argument of type 'int',
+ but argument 3 has type 'long unsigned int' [-Werror=format=]
+ 114 | printw(_("Viewing line %d/%d, 100%%"), lines, lines);
+ | ^~~~~~~~~~~~~~~~~~~~~~~~~~~
+---
+ src/video.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+
+Origin: https://github.com/baszoetekouw/pinfo/commit/ab604fdb67296dad27f3a25f3c9aabdd2fb8c3fa
+Bug-Debian: https://bugs.debian.org/997293
+Reviewed-by: gregor herrmann <gre...@debian.org>
+Last-Update: 2022-05-08
+Applied-Upstream: https://github.com/baszoetekouw/pinfo/commit/3d76eecde211e41ccc28b04e229f159b3f924399
+
+diff --git a/src/video.c b/src/video.c
+index f6b444a..195d781 100644
+--- a/src/video.c
++++ b/src/video.c
+@@ -109,9 +109,9 @@ showscreen(char **message, unsigned long lines, unsigned long pos, long cursor,
+ mymvhline(maxy - 1, 0, ' ', maxx);
+ move(maxy - 1, 0);
+ if ((pos < lines - 1) &&(lines > pos + maxy - 2))
+- printw(_("Viewing line %d/%d, %d%%"), pos + maxy - 2, lines,((pos + maxy - 2) * 100) / lines);
++ printw(_("Viewing line %ld/%ld, %ld%%"), pos + maxy - 2, lines,((pos + maxy - 2) * 100) / lines);
+ else
+- printw(_("Viewing line %d/%d, 100%%"), lines, lines);
++ printw(_("Viewing line %ld/%ld, 100%%"), lines, lines);
+ info_add_highlights(pos, cursor, lines, column, message);
+ attrset(normal);
+ move(0, 0);
diff -Nru pinfo-0.6.13/debian/patches/series pinfo-0.6.13/debian/patches/series
--- pinfo-0.6.13/debian/patches/series 2020-10-28 19:56:45.000000000 +0100
+++ pinfo-0.6.13/debian/patches/series 2022-05-08 14:33:18.000000000 +0200
@@ -1 +1,2 @@
fix_gcc-10.patch
+Werror-format.patch
signature.asc
Description: Digital Signature
