Source: nn
Version: 6.7.3-12
Followup-For: Bug #957610
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu hirsute ubuntu-patch
Control: tags -1 patch
Hi,
In Ubuntu, the attached patch was applied to achieve the following:
* d/p/07-gcc-10.diff: Fix FTBFS with GCC 10.
Thanks for considering the patch.
Logan
diff -Nru nn-6.7.3/debian/patches/07-gcc-10.diff
nn-6.7.3/debian/patches/07-gcc-10.diff
--- nn-6.7.3/debian/patches/07-gcc-10.diff 1969-12-31 19:00:00.000000000
-0500
+++ nn-6.7.3/debian/patches/07-gcc-10.diff 2021-01-12 23:33:20.000000000
-0500
@@ -0,0 +1,114 @@
+--- a/global.h
++++ b/global.h
+@@ -172,7 +172,7 @@
+ extern group_header *current_group, *group_sequence, *rc_sequence;
+
+
+-int l_g_index, s_g_first;
++extern int l_g_index, s_g_first;
+
+ #define Loop_Groups_Number(num) \
+ for (num = 0; num < master.number_of_groups; num++)
+--- a/db.c
++++ b/db.c
+@@ -130,6 +130,8 @@
+ static char *group_position = NULL;
+ static article_number current_digest_article = 0;
+
++int l_g_index, s_g_first;
++
+ int
+ init_group(register group_header * gh)
+ {
+--- a/nn_term.h
++++ b/nn_term.h
+@@ -48,7 +48,7 @@
+ */
+
+
+-int prompt_line; /* prompt line */
++extern int prompt_line; /* prompt line */
+
+ #define P_MOVE (char *)1
+ #define P_REDRAW (char *)5
+--- a/term.c
++++ b/term.c
+@@ -140,6 +140,7 @@
+ int show_current_time = 1;
+ int conf_dont_sleep = 0;
+ int prompt_length;
++int prompt_line;
+ int terminal_speed = 0;
+ int slow_speed = 1200;
+ int any_message = 0;
+--- a/articles.c
++++ b/articles.c
+@@ -33,6 +33,9 @@
+ int body_search_header = 0;
+ int cross_post_limit = 0;
+
++article_number n_articles;
++article_header **articles;
++
+ extern int ignore_fancy_select;
+ extern int killed_articles;
+
+--- a/articles.h
++++ b/articles.h
+@@ -10,8 +10,8 @@
+
+ /* article headers */
+
+-article_number n_articles;
+-article_header **articles;
++extern article_number n_articles;
++extern article_header **articles;
+
+
+ typedef struct thunk {
+--- a/news.h
++++ b/news.h
+@@ -44,7 +44,9 @@
+ char *ng_xlines; /* lines (from header) */
+ int ng_lines; /* lines (decoded) */
+ char *ng_comment; /* comment-to (rfmail) */
+-} news;
++};
++
++extern struct news_header news;
+
+
+ /*
+@@ -62,7 +64,9 @@
+ char *dg_to; /* to */
+
+ int dg_lines; /* lines (pseudo field) */
+-} digest;
++};
++
++extern struct digest_header digest;
+
+
+ #define NEWS_HEADER_BUFFER 4096
+--- a/digest.c
++++ b/digest.c
+@@ -23,6 +23,8 @@
+
+ /* digest.c */
+
++struct digest_header digest;
++
+ static char **dg_hdr_field(register char *lp, int all);
+
+ int strict_from_parse = 2;
+--- a/news.c
++++ b/news.c
+@@ -22,6 +22,8 @@
+
+ /* news.c */
+
++struct news_header news;
++
+ static char **art_hdr_field(register char *lp, int all);
+
+
diff -Nru nn-6.7.3/debian/patches/series nn-6.7.3/debian/patches/series
--- nn-6.7.3/debian/patches/series 2020-04-04 05:57:39.000000000 -0400
+++ nn-6.7.3/debian/patches/series 2021-01-12 23:25:33.000000000 -0500
@@ -5,3 +5,4 @@
04-spelling.diff
05-fix-compile.diff
06-maintainers-additions.diff
+07-gcc-10.diff
