Control: tags 836938 + pending Dear maintainer,
I've prepared an NMU for exult (versioned as 1.2-16.2) and uploaded it to DELAYED/5. Please feel free to tell me if I should delay it longer. Regards, Stephen
diff -u exult-1.2/debian/changelog exult-1.2/debian/changelog
--- exult-1.2/debian/changelog
+++ exult-1.2/debian/changelog
@@ -1,3 +1,10 @@
+exult (1.2-16.2) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Allow building with GCC 6 (Closes: #836938).
+
+ -- Stephen Kitt <sk...@debian.org> Fri, 23 Sep 2016 22:27:00 +0200
+
exult (1.2-16.1) unstable; urgency=medium
* Non-maintainer upload.
diff -u exult-1.2/debian/patches/series exult-1.2/debian/patches/series
--- exult-1.2/debian/patches/series
+++ exult-1.2/debian/patches/series
@@ -7,0 +8 @@
+08_gcc6_build_fix.patch
only in patch2:
unchanged:
--- exult-1.2.orig/debian/patches/08_gcc6_build_fix.patch
+++ exult-1.2/debian/patches/08_gcc6_build_fix.patch
@@ -0,0 +1,84 @@
+Description: Fix errors and some warnings with GCC 6
+Author: Stephen Kitt <sk...@debian.org>
+
+This patch fixes the following issues:
+* in exulticon.h, the values don't fit in char (which is an error
+ now); use unsigned char instead;
+* in vec.h, a number of method calls aren't scoped; use this->;
+* declare const char * for pointers to constant strings.
+
+--- a/exulticon.h
++++ b/exulticon.h
+@@ -11,7 +11,7 @@
+ pixel[2] = header_data_cmap[(unsigned char)data[0]][2]; \
+ data ++; }
+
+-static char header_data_cmap[256][3] = {
++static unsigned char header_data_cmap[256][3] = {
+ { 0,128,128},
+ { 34, 34, 34},
+ { 0, 0, 0},
+--- a/vec.h
++++ b/vec.h
+@@ -33,7 +33,7 @@
+ Exult_vector<T>() : baseClass()
+ {}
+ Exult_vector<T>(size_type n) : baseClass()
+- { reserve(n); }
++ { this->reserve(n); }
+
+ #ifndef MACOS /* should be something like PROPER_STD_CPP_LIB or so */
+ T& at(int i) { return (*this)[i]; }
+@@ -42,8 +42,8 @@
+ {
+ if (i >= (int)this->size())
+ {
+- insert(this->begin() + this->size(), i - this->size(), 0);
+- push_back(v);
++ this->insert(this->begin() + this->size(), i - this->size(), 0);
++ this->push_back(v);
+ }
+ else
+ (*this)[i] = v;
+@@ -69,7 +69,7 @@
+
+ size_type append( const T& obj )
+ {
+- push_back( obj );
++ this->push_back( obj );
+ return this->size() - 1;
+ }
+
+--- a/tools/textpack.cc
++++ b/tools/textpack.cc
+@@ -85,7 +85,7 @@
+ static void Write_flex
+ (
+ const char *filename, // File to write.
+- char *title, // For the header.
++ const char *title, // For the header.
+ vector<char *>& strings // Okay if some are null.
+ )
+ {
+--- a/tools/ipack.cc
++++ b/tools/ipack.cc
+@@ -136,7 +136,7 @@
+ static long Get_number
+ (
+ int linenum, // For printing errors.
+- char *errmsg,
++ const char *errmsg,
+ char *ptr,
+ char *& endptr // ->past number and spaces returned.
+ )
+--- a/gumps/Newfile_gump.cc
++++ b/gumps/Newfile_gump.cc
+@@ -476,7 +476,7 @@
+
+ if (actual_game < -2 || actual_game >= num_games) return;
+
+- char *text;
++ const char *text;
+
+ if (actual_game == -1)
+ text = "Quick Save";
signature.asc
Description: PGP signature
