[heroes] 01/02: Allow building with GCC 6.

[Stephen Kitt]

This is an automated email from the git hooks/post-receive script.

skitt pushed a commit to branch master
in repository heroes.

commit c10db0bcb1235f903b760111db018f12a58fae7c
Author: Stephen Kitt <steve at sk2.org>
Date:   Sat Mar 5 16:35:48 2016 +0100

    Allow building with GCC 6.
---
 debian/changelog                       |  3 ++-
 debian/patches/compilation-fixes.patch | 48 ++++++++++++++++++++++++++++++++++
 debian/patches/series                  |  1 +
 3 files changed, 51 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index e6aa128..678b343 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,11 @@
 heroes (0.21-14) UNRELEASED; urgency=medium
 
-  [ Stephen Kitt]
+  [ Stephen Kitt ]
   * Handle heroes' permissions in the dh_fixperms override, for
     architecture-dependent builds only.
   * Preserve the original manpages, help2man can't rebuild the new ones
     on buildds.
+  * Allow building with GCC 6.
 
   [ Alexandre Detiste ]
   * Remove leftover heroes alternative (closes: #813244).
diff --git a/debian/patches/compilation-fixes.patch b/debian/patches/compilation-fixes.patch
new file mode 100644
index 0000000..e972953
--- /dev/null
+++ b/debian/patches/compilation-fixes.patch
@@ -0,0 +1,48 @@
+Description: GCC 6 compilation fixes
+Author: Stephen Kitt <skitt at debian.org>
+
+Add a missing header.
+Propagate packed attributes as necessary.
+
+--- a/lib/xstrduplwr.c
++++ b/lib/xstrduplwr.c
+@@ -25,6 +25,7 @@
+ 
+ #include <sys/types.h>
+ #include <ctype.h>
++#include <string.h>
+ 
+ #include "xalloc.h"
+ #include "xstrduplwr.h"
+--- a/src/pcx.h
++++ b/src/pcx.h
+@@ -23,7 +23,7 @@
+ 
+ #include "video.h"
+ 
+-typedef struct pcx_header_type
++typedef struct ATTRIBUTE_PACKED pcx_header_type
+ {
+   a_u8 signature;
+   a_u8 version;
+@@ -39,9 +39,9 @@
+   a_u16 palette_kind;
+   a_u8 rien[58];
+ }
+-a_pcx_header ATTRIBUTE_PACKED;
++a_pcx_header;
+ 
+-typedef struct
++typedef struct ATTRIBUTE_PACKED
+ {
+   a_u8 r, g, b;
+ }
+@@ -54,7 +54,7 @@
+ }
+ a_palette;
+ 
+-typedef struct img_type
++typedef struct ATTRIBUTE_PACKED img_type
+ {
+   a_pcx_header header;
+   a_palette palette;
diff --git a/debian/patches/series b/debian/patches/series
index e24f73f..4b35f32 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,3 +13,4 @@ skip-interactive-tests.patch
 swab.patch
 spelling-fixes.patch
 heroesrc.patch
+compilation-fixes.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/heroes.git