Package: nvi
Followup-For: Bug #1066285
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu noble ubuntu-patch
X-Debbugs-Cc: michael.hud...@ubuntu.com
Control: tags -1 patch
Dear Maintainer,
In Ubuntu, the attached patch was applied to achieve the following:
* d/patches/add-prototypes.h: add includes and prototypes for some functions
(including prototypes for some standard functions that are only accessible
if _XOPEN_SOURCE is defined, but lots of other stuff breaks if that is
defined :/).
Thanks for considering the patch.
Cheers,
mwh
-- System Information:
Debian Release: trixie/sid
APT prefers mantic-updates
APT policy: (500, 'mantic-updates'), (500, 'mantic-security'), (500,
'mantic'), (100, 'mantic-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 6.5.0-27-generic (SMP w/16 CPU threads; PREEMPT)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8),
LANGUAGE=en_NZ.UTF-8:en
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru nvi-1.81.6/debian/control nvi-1.81.6/debian/control
--- nvi-1.81.6/debian/control 2024-03-03 09:35:03.000000000 +1300
+++ nvi-1.81.6/debian/control 2024-04-11 14:45:28.000000000 +1200
@@ -1,8 +1,7 @@
Source: nvi
Section: editors
Priority: optional
-Maintainer: Ubuntu Developers <ubuntu-devel-disc...@lists.ubuntu.com>
-XSBC-Original-Maintainer: Tobias Heider <m...@tobhe.de>
+Maintainer: Tobias Heider <m...@tobhe.de>
Standards-Version: 4.6.2
Build-Depends:
debhelper-compat (= 13),
diff -Nru nvi-1.81.6/debian/patches/add-prototypes.patch
nvi-1.81.6/debian/patches/add-prototypes.patch
--- nvi-1.81.6/debian/patches/add-prototypes.patch 1970-01-01
12:00:00.000000000 +1200
+++ nvi-1.81.6/debian/patches/add-prototypes.patch 2024-04-11
14:45:28.000000000 +1200
@@ -0,0 +1,53 @@
+--- a/common/conv.h
++++ b/common/conv.h
+@@ -21,3 +21,6 @@
+ char2wchar_t input2int;
+ wchar2char_t int2disp;
+ };
++
++extern int conv_enc (SCR *sp, int option, char *enc);
++extern void conv_init (SCR *orig, SCR *sp);
+--- a/cl/cl.h
++++ b/cl/cl.h
+@@ -26,6 +26,11 @@
+ #endif
+ #endif
+
++/*
++ * for setupterm()
++ */
++#include <term.h>
++
+ typedef struct _cl_private {
+ char ibuf[256]; /* Input keys. */
+
+--- a/common/multibyte.h
++++ b/common/multibyte.h
+@@ -5,6 +5,12 @@
+ #include <wchar.h>
+ #include <wctype.h>
+
++/*
++ * This is declared by wchar.h, but only if _XOPEN_SOURCE is set and lots of
++ * other things break if we define that.
++ */
++extern int wcwidth (wchar_t c);
++
+ typedef wchar_t RCHAR_T;
+ #define RCHAR_T_MAX ((1 << 24)-1)
+ typedef wchar_t CHAR_T;
+--- a/cl/cl_funcs.c
++++ b/cl/cl_funcs.c
+@@ -31,6 +31,12 @@
+ #include "../vi/vi.h"
+ #include "cl.h"
+
++/*
++ * This is declared by ncurses.h, but only if _XOPEN_SOURCE is set and lots of
++ * other things break if we define that.
++ */
++extern int waddnwstr (WINDOW *,const wchar_t *,int);
++
+ static void cl_rdiv __P((SCR *));
+
+ static int
diff -Nru nvi-1.81.6/debian/patches/series nvi-1.81.6/debian/patches/series
--- nvi-1.81.6/debian/patches/series 2024-02-14 02:52:27.000000000 +1300
+++ nvi-1.81.6/debian/patches/series 2024-04-11 14:44:02.000000000 +1200
@@ -36,3 +36,4 @@
upstream/0036-Fix-how-keywords-are-picked-up.patch
upstream/0037-New-macro-MEMPCPY.patch
upstream/0038-Fix-A-word-search-for-keywords-starting-with-a-non-w.patch
+add-prototypes.patch
