Bug#582399: Sopwith doesn't compile properly on Ubuntu 9.10
Package: sopwith
Version: 1.7.1
The sopwith source code doesn't compile properly on Ubuntu with gcc
4.4.1. Specifically, there is a header call to string.h missing from the
vga code and a variable which is declared static in one source file and
extern in a header file. The attached patch fixes these bugs to allow
sopwith to compile on downstream Ubuntu.
diff -au sopwith-1.7.1/src/swmain.h sopwith-1.7.2/src/swmain.h
--- sopwith-1.7.1/src/swmain.h 2003-06-08 15:20:30.000000000 -0300
+++ sopwith-1.7.2/src/swmain.h 2010-05-19 19:47:07.000000000 -0300
@@ -46,7 +46,8 @@
extern int targrnge;
extern BOOL hires;
extern BOOL disppos;
-extern BOOL titleflg;
+// extern BOOL titleflg;
+static BOOL titleflg;
extern int dispdbg;
extern BOOL soundflg;
extern BOOL repflag;
diff -au sopwith-1.7.1/src/swsound.c sopwith-1.7.2/src/swsound.c
--- sopwith-1.7.1/src/swsound.c 2003-06-08 15:20:30.000000000 -0300
+++ sopwith-1.7.2/src/swsound.c 2010-05-19 19:46:58.000000000 -0300
@@ -79,7 +79,8 @@
};
#endif
-static BOOL titleflg; /* Playing title tune */
+// static BOOL titleflg; /* Playing title tune */
+extern BOOL titleflg;
static int titlplace; /* Place in title tune; */
static int titlline; /* Line in title tune */
static unsigned titltone; /* Current title tone */
diff -au sopwith-1.7.1/src/vid_vga.c sopwith-1.7.2/src/vid_vga.c
--- sopwith-1.7.1/src/vid_vga.c 2003-06-08 15:20:30.000000000 -0300
+++ sopwith-1.7.2/src/vid_vga.c 2010-05-19 19:37:36.000000000 -0300
@@ -22,6 +22,8 @@
//
//---------------------------------------------------------------------------
+#include <string.h>
+
#include "video.h"
#include "sw.h"
Reply to: