r15847 - in packages/trunk/jugglemaster/debian: . patches

[Helmut Grohne]

Author: helmutg
Date: 2016-07-16 16:00:09 +0000 (Sat, 16 Jul 2016)
New Revision: 15847

Added:
   packages/trunk/jugglemaster/debian/patches/gcc-6.patch
Modified:
   packages/trunk/jugglemaster/debian/changelog
   packages/trunk/jugglemaster/debian/patches/series
Log:
gcc-6.patch: fix building with gcc-6. (Closes: #831160)

Modified: packages/trunk/jugglemaster/debian/changelog
===================================================================
--- packages/trunk/jugglemaster/debian/changelog	2016-07-15 10:56:05 UTC (rev 15846)
+++ packages/trunk/jugglemaster/debian/changelog	2016-07-16 16:00:09 UTC (rev 15847)
@@ -1,3 +1,9 @@
+jugglemaster (0.4-9) unstable; urgency=medium
+
+  * gcc-6.patch: fix building with gcc-6. (Closes: #831160)
+
+ -- Helmut Grohne <helmut at subdivi.de>  Sat, 16 Jul 2016 17:46:34 +0200
+
 jugglemaster (0.4-8) unstable; urgency=medium
 
   [ Helmut Grohne ]

Added: packages/trunk/jugglemaster/debian/patches/gcc-6.patch
===================================================================
--- packages/trunk/jugglemaster/debian/patches/gcc-6.patch	                        (rev 0)
+++ packages/trunk/jugglemaster/debian/patches/gcc-6.patch	2016-07-16 16:00:09 UTC (rev 15847)
@@ -0,0 +1,115 @@
+From: Helmut Grohne <helmut at subdivi.de>
+Subject: fix building with gcc-6
+Last-Update: 2016-07-16
+Bug-Debian: https://bugs.debian.org/831160
+
+Index: jugglemaster-0.4/src/jmdlx/jmdlx.cpp
+===================================================================
+--- jugglemaster-0.4.orig/src/jmdlx/jmdlx.cpp
++++ jugglemaster-0.4/src/jmdlx/jmdlx.cpp
+@@ -23,8 +23,8 @@
+   // Create main window frame
+   int windowx,windowy;
+ 
+-  windowx = min(480,wxGetDisplaySize().x);
+-  windowy = min(400,wxGetDisplaySize().y);
++  windowx = jmlib_min(480,wxGetDisplaySize().x);
++  windowy = jmlib_min(400,wxGetDisplaySize().y);
+ 
+ 	frame = new JMFrame(NULL, -1, wxT("JuggleMaster Deluxe"), wxDefaultPosition, wxSize(windowx,windowy));
+ 
+Index: jugglemaster-0.4/src/jmlib/jmlib.cpp
+===================================================================
+--- jugglemaster-0.4.orig/src/jmlib/jmlib.cpp
++++ jugglemaster-0.4/src/jmlib/jmlib.cpp
+@@ -678,7 +678,7 @@
+ 		    for(i=0;i<pattw;i++){
+ 		      for(j=0;j<patts[i];j++){
+ 			balln+=xabs(patt[i][j]);
+-			pmax=max(pmax,xabs(patt[i][j]));
++			pmax=jmlib_max(pmax,xabs(patt[i][j]));
+ 		      }
+ 		    }
+ 		    
+@@ -880,24 +880,24 @@
+     for (time_count=0;(JML_INT32)time_count<tw*(pattw+pmax+style_len);time_count++){
+       for (i=0;i<balln;i++) {
+         juggle(&b[i]);
+-        gy_max=max(gy_max,b[i].gy);
+-        gy_min=min(gy_min,b[i].gy);
+-        gx_max = max(gx_max,b[i].gx+2*11*dpm/DW); // changed from X11 version
+-        gx_min = min(gx_min,b[i].gx);
++        gy_max=jmlib_max(gy_max,b[i].gy);
++        gy_min=jmlib_min(gy_min,b[i].gy);
++        gx_max = jmlib_max(gx_max,b[i].gx+2*11*dpm/DW); // changed from X11 version
++        gx_min = jmlib_min(gx_min,b[i].gx);
+       }
+       
+       juggle(&rhand);
+       juggle(&lhand);
+       
+-      gy_max=max(gy_max,rhand.gy);
+-      gy_min=min(gy_min,rhand.gy);
+-      gy_max=max(gy_max,lhand.gy);
+-      gy_min=min(gy_min,lhand.gy);
++      gy_max=jmlib_max(gy_max,rhand.gy);
++      gy_min=jmlib_min(gy_min,rhand.gy);
++      gy_max=jmlib_max(gy_max,lhand.gy);
++      gy_min=jmlib_min(gy_min,lhand.gy);
+       
+-      gx_max = max(gx_max,rhand.gx);
+-      gx_min = min(gx_min,rhand.gx);
+-      gx_max = max(gx_max,lhand.gx);
+-      gx_min = min(gx_min,lhand.gx);
++      gx_max = jmlib_max(gx_max,rhand.gx);
++      gx_min = jmlib_min(gx_min,rhand.gx);
++      gx_max = jmlib_max(gx_max,lhand.gx);
++      gx_min = jmlib_min(gx_min,lhand.gx);
+       
+       arm_x = (22-11)*dpm/DW;
+       arm_y = (16-11)*dpm/DW;
+@@ -912,10 +912,10 @@
+       arm_line();
+       
+       for ( i = 0 ; i < 5 ; ++i ) {
+-        gx_max = max(gx_max, ap.rx[i]);
+-        gx_max = max(gx_max, ap.lx[i]);
+-        gx_min = min(gx_min, ap.rx[i]);
+-        gx_min = min(gx_min, ap.lx[i]);
++        gx_max = jmlib_max(gx_max, ap.rx[i]);
++        gx_max = jmlib_max(gx_max, ap.lx[i]);
++        gx_min = jmlib_min(gx_min, ap.rx[i]);
++        gx_min = jmlib_min(gx_min, ap.lx[i]);
+       }
+     }
+   }
+@@ -1135,7 +1135,7 @@
+   //time_period = time_count % pattw;
+   
+   for (i=0; i < balln; i++)
+-    if(juggle(&b[i]) && beep) tone = max(tone, xabs(b[i].bh));
++    if(juggle(&b[i]) && beep) tone = jmlib_max(tone, xabs(b[i].bh));
+   
+   if(juggle(&rhand) + juggle(&lhand) > 0){
+     //if (back_on==1) patt_print(1);
+Index: jugglemaster-0.4/src/jmlib/jmlib.h
+===================================================================
+--- jugglemaster-0.4.orig/src/jmlib/jmlib.h
++++ jugglemaster-0.4/src/jmlib/jmlib.h
+@@ -45,12 +45,12 @@
+ #include "patterns.h"
+ 
+ // Misc. macros
+-#ifndef max
+-#define max(a,b) ((a)>(b)?(a):(b))
++#ifndef jmlib_max
++#define jmlib_max(a,b) ((a)>(b)?(a):(b))
+ #endif
+ 
+-#ifndef min
+-#define min(a,b) ((a)<(b)?(a):(b))
++#ifndef jmlib_min
++#define jmlib_min(a,b) ((a)<(b)?(a):(b))
+ #endif
+ 
+ #define jijo(x) ((x)*(x))

Modified: packages/trunk/jugglemaster/debian/patches/series
===================================================================
--- packages/trunk/jugglemaster/debian/patches/series	2016-07-15 10:56:05 UTC (rev 15846)
+++ packages/trunk/jugglemaster/debian/patches/series	2016-07-16 16:00:09 UTC (rev 15847)
@@ -15,3 +15,4 @@
 include-header-for-memset.patch
 wx3.0-compat.patch
 ffmpeg_2.9.patch
+gcc-6.patch