Package: vilistextum
Version: 2.6.9-1.2
Followup-For: Bug #966861
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu hirsute ubuntu-patch
X-Debbugs-Cc: lo...@ubuntu.com
Control: tags -1 patch
Hi,
In Ubuntu, the attached patch was applied to achieve the following:
* d/p/gcc-10.patch: Fix compilation with GCC 10.
Thanks for considering the patch.
Logan
diff -u vilistextum-2.6.9/debian/patches/series
vilistextum-2.6.9/debian/patches/series
--- vilistextum-2.6.9/debian/patches/series
+++ vilistextum-2.6.9/debian/patches/series
@@ -1 +1,2 @@
01-add-format-arguments.patch
+gcc-10.patch
only in patch2:
unchanged:
--- vilistextum-2.6.9.orig/debian/patches/gcc-10.patch
+++ vilistextum-2.6.9/debian/patches/gcc-10.patch
@@ -0,0 +1,120 @@
+--- a/src/main.h
++++ b/src/main.h
+@@ -3,22 +3,22 @@
+
+ #include "multibyte.h"
+
+-int palm;
+-int convert_tags;
+-int errorlevel;
+-int convert_characters;
+-int shrink_lines;
+-int remove_empty_alt;
+-int option_links;
+-int option_links_inline;
+-int option_title;
+-int sevenbit;
+-int transliteration;
++extern int palm;
++extern int convert_tags;
++extern int errorlevel;
++extern int convert_characters;
++extern int shrink_lines;
++extern int remove_empty_alt;
++extern int option_links;
++extern int option_links_inline;
++extern int option_title;
++extern int sevenbit;
++extern int transliteration;
+
+-int option_no_image;
+-int option_no_alt;
+-int option_output_utf8;
++extern int option_no_image;
++extern int option_no_alt;
++extern int option_output_utf8;
+
+-CHAR *default_image;
++extern CHAR *default_image;
+
+ #endif
+--- a/src/text.h
++++ b/src/text.h
+@@ -9,23 +9,23 @@
+
+ #include "multibyte.h"
+
+-int LEFT;
+-int CENTER;
+-int RIGHT;
+-
+-CHAR ch;
+-
+-int paragraph;
+-int div_test;
+-int nooutput;
++extern int LEFT;
++extern int CENTER;
++extern int RIGHT;
++
++extern CHAR ch;
++
++extern int paragraph;
++extern int div_test;
++extern int nooutput;
+
+-int breite;
+-int hr_breite;
++extern int breite;
++extern int hr_breite;
+
+ void status();
+
+-int tab;
+-int spaces;
++extern int tab;
++extern int spaces;
+
+ void print_zeile();
+ int is_zeile_empty();
+--- a/src/html.h
++++ b/src/html.h
+@@ -4,13 +4,13 @@
+ #include "text.h"
+ #include "multibyte.h"
+
+-int pre;
++extern int pre;
+
+ int get_attr();
+ int get_new_attr(CHAR *name, CHAR *content);
+
+-CHAR attr_name[DEF_STR_LEN];
+-CHAR attr_ctnt[DEF_STR_LEN];
++extern CHAR attr_name[DEF_STR_LEN];
++extern CHAR attr_ctnt[DEF_STR_LEN];
+
+ void html();
+ void check_for_center();
+--- a/src/text.c
++++ b/src/text.c
+@@ -47,6 +47,8 @@
+ anz_leere_zeilen=0, /* how many line were blank */
+ noleadingblanks=0; /* remove blanks lines at the start of the output */
+
++CHAR ch;
++
+ /* ------------------------------------------------ */
+
+ void center_zeile()
+--- a/src/main.c
++++ b/src/main.c
+@@ -134,6 +134,8 @@
+ CHAR *default_image=STRING("Image"); /* Default string for IMG without
ALT-tag */
+ CHAR user_image[DEF_STR_LEN]; /* string supplied by user */
+
++int transliteration;
++
+ char help_text[] =
+ "Usage: vilistextum [OPTIONS] [inputfile|-] [outputfile|-]\n"
+ "\n"
