[rocksndiamonds] 06/13: Build with gcc 5.

[Stephen Kitt]

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

skitt pushed a commit to branch master
in repository rocksndiamonds.

commit 69650e8890ef536ad05f7928b164968097bfdf84
Author: Stephen Kitt <steve at sk2.org>
Date:   Sun Sep 20 22:21:15 2015 +0200

    Build with gcc 5.
---
 debian/changelog                 |  1 +
 debian/patches/gcc-5-build.patch | 14 ++++++++++++++
 debian/patches/series            |  1 +
 3 files changed, 16 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 9165968..ec49f08 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ rocksndiamonds (3.3.0.1+dfsg1-3) UNRELEASED; urgency=medium
 
   * Team upload.
   * Merge the NMUs, thanks Christian and Igor!
+  * Build with gcc 5 (closes: #798775).
 
  -- Stephen Kitt <skitt at debian.org>  Sun, 20 Sep 2015 22:18:33 +0200
 
diff --git a/debian/patches/gcc-5-build.patch b/debian/patches/gcc-5-build.patch
new file mode 100644
index 0000000..68d1c5d
--- /dev/null
+++ b/debian/patches/gcc-5-build.patch
@@ -0,0 +1,14 @@
+Description: Build with gcc 5
+Author: Stephen Kitt <skitt at debian.org>
+
+--- a/src/init.c
++++ b/src/init.c
+@@ -257,7 +257,7 @@
+   gadgets_initialized = TRUE;
+ }
+ 
+-inline void InitElementSmallImagesScaledUp(int graphic)
++void InitElementSmallImagesScaledUp(int graphic)
+ {
+ #if 0
+   struct FileInfo *fi = getImageListEntryFromImageID(graphic);
diff --git a/debian/patches/series b/debian/patches/series
index 0613b9b..4230383 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 fix-manpage-errors
 fix-shlibdeps-warning
 651620-world-writable-dirs.patch
+gcc-5-build.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/rocksndiamonds.git