[debian-edu-commits] debian-edu/pkg-team/ 01/01: Fix build with GCC 7

[Javier Serrano Polo]

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

jasp00-guest pushed a commit to branch master
in repository lmms.

commit 359ee461429f53a9947c6b4b463d3a58e7007d4e
Author: Javier Serrano Polo <javier at jasp.net>
Date:   Thu Feb 2 22:44:45 2017 +0100

    Fix build with GCC 7
---
 debian/changelog          |  1 +
 debian/patches/gcc7.patch | 21 +++++++++++++++++++++
 debian/patches/series     |  1 +
 3 files changed, 23 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 8be70ec..1581c27 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ lmms (1.1.3-8) unstable; urgency=low
 
   [ Javier Serrano Polo ]
   * Fix build with Clang.
+  * Fix build with GCC 7 (Closes: #853527).
 
  -- Javier Serrano Polo <javier at jasp.net>  Wed, 04 Jan 2017 13:11:22 +0100
 
diff --git a/debian/patches/gcc7.patch b/debian/patches/gcc7.patch
new file mode 100644
index 0000000..d5d6af1
--- /dev/null
+++ b/debian/patches/gcc7.patch
@@ -0,0 +1,21 @@
+Description: Fix build with GCC 7
+ Fix a possible overflow.
+ .
+ Upstream has dropped UnRTF.
+ This patch will not be necessary since version 1.2.0-rc2.
+Author: Javier Serrano Polo <javier at jasp.net>
+Bug-Debian: https://bugs.debian.org/853527
+
+Index: lmms-1.1.3/plugins/flp_import/unrtf/convert.c
+===================================================================
+--- lmms-1.1.3.orig/plugins/flp_import/unrtf/convert.c	2017-02-02 21:58:48.000000000 +0100
++++ lmms-1.1.3/plugins/flp_import/unrtf/convert.c	2017-02-02 22:11:20.000000000 +0100
+@@ -1548,7 +1548,7 @@
+ 
+ static int 
+ cmd_expand (Word *w, int align, char has_param, int param) {
+-	char str[10];
++	char str[11];
+ 	if (has_param) {
+ 		sprintf(str, "%d", param/4);
+ 		if (!param) 
diff --git a/debian/patches/series b/debian/patches/series
index 40b8308..99dafc4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -21,3 +21,4 @@ sort-resources.patch
 install-runpath.patch
 wine-flags-space.patch
 clang.patch
+gcc7.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/lmms.git