Bug#966877: termtris: FTBFS: ld: src/game.o:/<>/src/game.h:21: multiple definition of `quit'; src/ansi.o:/<>/src/game.h:21: first defined here

[Logan Rosen]

Package: termtris
Version: 1.3-1
Followup-For: Bug #966877
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 -Nru termtris-1.3/debian/patches/gcc-10.patch 
termtris-1.3/debian/patches/gcc-10.patch
--- termtris-1.3/debian/patches/gcc-10.patch    1969-12-31 19:00:00.000000000 
-0500
+++ termtris-1.3/debian/patches/gcc-10.patch    2021-01-08 17:44:33.000000000 
-0500
@@ -0,0 +1,46 @@
+--- a/src/game.h
++++ b/src/game.h
+@@ -18,12 +18,12 @@
+ #ifndef GAME_H_
+ #define GAME_H_
+ 
+-int quit;
+-long tick_interval;
+-int use_bell;
+-int monochrome;
++extern int quit;
++extern long tick_interval;
++extern int use_bell;
++extern int monochrome;
+ 
+-int term_width, term_height;
++extern int term_width, term_height;
+ 
+ int init_game(void);
+ void cleanup_game(void);
+--- a/src/game.c
++++ b/src/game.c
+@@ -26,6 +26,9 @@
+ #include "ansi.h"
+ #include "scoredb.h"
+ 
++int quit;
++long tick_interval;
++
+ enum {
+       G_DIAMOND       = 0x04,
+       G_CHECKER       = 0xb1,
+--- a/src/main.c
++++ b/src/main.c
+@@ -35,6 +35,11 @@
+ #define USE_JOYSTICK
+ #endif
+ 
++int use_bell;
++int monochrome;
++
++int term_width, term_height;
++
+ int init(void);
+ void cleanup(void);
+ int parse_args(int argc, char **argv);
diff -Nru termtris-1.3/debian/patches/series termtris-1.3/debian/patches/series
--- termtris-1.3/debian/patches/series  2019-06-06 03:01:11.000000000 -0400
+++ termtris-1.3/debian/patches/series  2021-01-08 17:44:04.000000000 -0500
@@ -1 +1,2 @@
 0001_install_to_usr_game.patch
+gcc-10.patch