Control: patch fixed-upstream

Dear maintainer,

Here is a debdiff that cherrypicks and upstream commit to resolve ftbfs
with gcc-4.9.

diff -Nru mumble-1.2.5-245-g221a5d7/debian/changelog mumble-1.2.5-245-g221a5d7/debian/changelog
--- mumble-1.2.5-245-g221a5d7/debian/changelog	2014-03-31 22:29:39.000000000 +0100
+++ mumble-1.2.5-245-g221a5d7/debian/changelog	2014-05-14 22:30:04.000000000 +0100
@@ -1,3 +1,9 @@
+mumble (1.2.5-245-g221a5d7-1.1) UNRELEASED; urgency=medium
+
+  * Cherry-pick fix FTBFS with gcc-4.9. (Closes: #746882)
+
+ -- Dimitri John Ledkov <x...@ubuntu.com>  Wed, 14 May 2014 22:29:36 +0100
+
 mumble (1.2.5-245-g221a5d7-1) unstable; urgency=medium
 
   * New upstream snapshot from 2014-02-18
diff -Nru mumble-1.2.5-245-g221a5d7/debian/patches/349436284b5f1baa61836c98ff0d518392140c5d.patch mumble-1.2.5-245-g221a5d7/debian/patches/349436284b5f1baa61836c98ff0d518392140c5d.patch
--- mumble-1.2.5-245-g221a5d7/debian/patches/349436284b5f1baa61836c98ff0d518392140c5d.patch	1970-01-01 01:00:00.000000000 +0100
+++ mumble-1.2.5-245-g221a5d7/debian/patches/349436284b5f1baa61836c98ff0d518392140c5d.patch	2014-05-14 22:29:22.000000000 +0100
@@ -0,0 +1,34 @@
+From 349436284b5f1baa61836c98ff0d518392140c5d Mon Sep 17 00:00:00 2001
+From: Christian Krause <c...@plauener.de>
+Date: Mon, 28 Apr 2014 03:08:08 +0200
+Subject: [PATCH] Avoid "jump to label crosses initialization" error.
+
+Move variable "buffer" into the while loop to avoid a compile error
+with g++ 4.9.0.
+
+Although earlier compiler versions did accept the code, jumping into the
+scope of an variable length array is not allowed:
+http://gcc.gnu.org/onlinedocs/gcc-4.3.0/gcc/Variable-Length.html
+---
+ src/mumble/OSS.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/mumble/OSS.cpp b/src/mumble/OSS.cpp
+index eb87d5b..4af1326 100644
+--- a/src/mumble/OSS.cpp
++++ b/src/mumble/OSS.cpp
+@@ -243,9 +243,9 @@ void OSSInput::run() {
+ 	eMicFormat = SampleShort;
+ 	initializeMixer();
+ 
+-	short buffer[iMicLength];
+-
+ 	while (bRunning) {
++		short buffer[iMicLength];
++
+ 		int len = static_cast<int>(iMicLength * iMicChannels * sizeof(short));
+ 		ssize_t l = read(fd, buffer, len);
+ 		if (l != len) {
+-- 
+1.9.3
+
diff -Nru mumble-1.2.5-245-g221a5d7/debian/patches/series mumble-1.2.5-245-g221a5d7/debian/patches/series
--- mumble-1.2.5-245-g221a5d7/debian/patches/series	2014-03-31 22:33:28.000000000 +0100
+++ mumble-1.2.5-245-g221a5d7/debian/patches/series	2014-05-14 22:29:22.000000000 +0100
@@ -4,3 +4,4 @@
 07-use-embedded-celt-baseline.diff
 12-mumble-server-disable-dbus-and-ice.diff
 15-add-mumble.desktop-keywords.diff
+349436284b5f1baa61836c98ff0d518392140c5d.patch
Regards,

Dimitri.

Reply via email to