Control: tags 957585 + pending
Dear maintainer,
I've prepared an NMU for ncurses-hexedit (versioned as 0.9.7+orig-7.1)
and uploaded it to DELAYED/1. Please feel free to tell me if I should
cancel it.
cu
Adrian
diff -Nru ncurses-hexedit-0.9.7+orig/debian/changelog ncurses-hexedit-0.9.7+orig/debian/changelog
--- ncurses-hexedit-0.9.7+orig/debian/changelog 2019-02-01 00:55:35.000000000 +0200
+++ ncurses-hexedit-0.9.7+orig/debian/changelog 2021-02-06 23:35:33.000000000 +0200
@@ -1,3 +1,11 @@
+ncurses-hexedit (0.9.7+orig-7.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Add patch from Logan Rosen for FTBFS with gcc 10.
+ (Closes: #957585)
+
+ -- Adrian Bunk <b...@debian.org> Sat, 06 Feb 2021 23:35:33 +0200
+
ncurses-hexedit (0.9.7+orig-7) unstable; urgency=medium
* Build with Debhelper compat level 12.
diff -Nru ncurses-hexedit-0.9.7+orig/debian/patches/gcc_10.patch ncurses-hexedit-0.9.7+orig/debian/patches/gcc_10.patch
--- ncurses-hexedit-0.9.7+orig/debian/patches/gcc_10.patch 1970-01-01 02:00:00.000000000 +0200
+++ ncurses-hexedit-0.9.7+orig/debian/patches/gcc_10.patch 2021-02-06 23:35:31.000000000 +0200
@@ -0,0 +1,44 @@
+--- a/src/hexedit.h
++++ b/src/hexedit.h
+@@ -343,7 +343,7 @@
+
+
+ /* Global structure, keep most global variables here. */
+-struct
++struct Globals_t
+ {
+ WINDOW *wmain, *wstatus, *whelp; /* three windows used throughout. */
+ unsigned long filesize; /* size of the file buffer. */
+@@ -365,7 +365,9 @@
+ /* buf end. */
+ int beeping; /* Allow beeping or not. */
+ int help_msg_count; /* Number of messages in help menu. */
+-} Globals;
++};
++
++extern struct Globals_t Globals;
+
+
+ struct foundit
+@@ -400,7 +402,9 @@
+ int s;
+ struct Change *base;
+ struct Change *top;
+-} UndoStack;
++};
++
++extern struct ChangeLog UndoStack;
+
+
+ struct FileNames
+--- a/src/init.c
++++ b/src/init.c
+@@ -35,6 +35,8 @@
+
+ extern char **environ;
+
++struct ChangeLog UndoStack;
++struct Globals_t Globals;
+
+ /* This is called once at the start of the program. Handles HEXEDIT
+ * Environment variable, command line arguments, sets up signal
diff -Nru ncurses-hexedit-0.9.7+orig/debian/patches/series ncurses-hexedit-0.9.7+orig/debian/patches/series
--- ncurses-hexedit-0.9.7+orig/debian/patches/series 2019-01-31 05:29:46.000000000 +0200
+++ ncurses-hexedit-0.9.7+orig/debian/patches/series 2021-02-06 23:35:31.000000000 +0200
@@ -16,3 +16,4 @@
enforce_readonly_mode.patch
fix_buffer_overruns.patch
fix_spelling_errors.patch
+gcc_10.patch
