[SCM] giada/master: Build with gcc5 too.

[mira-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 5a415b4964f7d5082d6ec84dcdf41d24a47a4170
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Mon Jul 25 15:54:57 2016 +0200

    Build with gcc5 too.

diff --git a/debian/patches/03-build_with_gcc6.patch b/debian/patches/03-build_with_gcc6.patch
index c220a9a..e3ddbbb 100644
--- a/debian/patches/03-build_with_gcc6.patch
+++ b/debian/patches/03-build_with_gcc6.patch
@@ -23,21 +23,29 @@ Index: giada/src/glue/glue.cpp
 ===================================================================
 --- giada.orig/src/glue/glue.cpp
 +++ giada/src/glue/glue.cpp
-@@ -711,7 +711,7 @@ void glue_setPanning(class gdEditor *win
+@@ -56,6 +56,7 @@
+ #include "../core/patch_DEPR_.h"
+ #include "../core/conf.h"
+ #include "glue.h"
++#include <math.h>
+ 
+ 
+ extern gdMainWindow *mainWin;
+@@ -711,7 +712,7 @@ void glue_setPanning(class gdEditor *win
  		ch->panRight= 0.0f + val;
  
  		char buf[8];
 -		sprintf(buf, "%d L", abs((ch->panRight * 100.0f) - 100));
-+		sprintf(buf, "%f L", abs((ch->panRight * 100.0f) - 100));
++		sprintf(buf, "%f L", fabs((ch->panRight * 100.0f) - 100));
  		win->panNum->value(buf);
  	}
  	else if (val == 1.0f) {
-@@ -724,7 +724,7 @@ void glue_setPanning(class gdEditor *win
+@@ -724,7 +725,7 @@ void glue_setPanning(class gdEditor *win
  		ch->panRight= 1.0f;
  
  		char buf[8];
 -		sprintf(buf, "%d R", abs((ch->panLeft * 100.0f) - 100));
-+		sprintf(buf, "%f R", abs((ch->panLeft * 100.0f) - 100));
++		sprintf(buf, "%f R", fabs((ch->panLeft * 100.0f) - 100));
  		win->panNum->value(buf);
  	}
  	win->panNum->redraw();
@@ -45,21 +53,29 @@ Index: giada/src/gui/dialogs/gd_editor.cpp
 ===================================================================
 --- giada.orig/src/gui/dialogs/gd_editor.cpp
 +++ giada/src/gui/dialogs/gd_editor.cpp
-@@ -202,7 +202,7 @@ gdEditor::gdEditor(SampleChannel *ch)
+@@ -45,6 +45,7 @@
+ #include "gd_editor.h"
+ #include "gd_mainWindow.h"
+ #include "gd_warnings.h"
++#include <math.h>
+ 
+ 
+ extern Mixer         G_Mixer;
+@@ -202,7 +203,7 @@ gdEditor::gdEditor(SampleChannel *ch)
  
    if (ch->panRight < 1.0f) {
      char buf[8];
 -    sprintf(buf, "%d L", abs((ch->panRight * 100.0f) - 100));
-+    sprintf(buf, "%f L", abs((ch->panRight * 100.0f) - 100));
++    sprintf(buf, "%f L", fabs((ch->panRight * 100.0f) - 100));
      pan->value(ch->panRight);
      panNum->value(buf);
    }
-@@ -212,7 +212,7 @@ gdEditor::gdEditor(SampleChannel *ch)
+@@ -212,7 +213,7 @@ gdEditor::gdEditor(SampleChannel *ch)
    }
    else {
      char buf[8];
 -    sprintf(buf, "%d R", abs((ch->panLeft * 100.0f) - 100));
-+    sprintf(buf, "%f R", abs((ch->panLeft * 100.0f) - 100));
++    sprintf(buf, "%f R", fabs((ch->panLeft * 100.0f) - 100));
      pan->value(2.0f - ch->panLeft);
      panNum->value(buf);
    }

-- 
giada packaging