[zynaddsubfx] Fix FTBFS RHBZ#715835

[Orcan Ogetbil]

commit 96a831799bf69a6977d2a0d0e27588df87a87ee5
Author: Orcan Ogetbil <oget.fedora at gmail.com>
Date:   Sun Jun 26 13:13:03 2011 -0400

    Fix FTBFS RHBZ#715835

 zynaddsubfx-0f236881.patch |   51 ++++++++++++++++++++++++++++++++++++++++++++
 zynaddsubfx.spec           |   10 +++++++-
 2 files changed, 60 insertions(+), 1 deletions(-)
---
diff --git a/zynaddsubfx-0f236881.patch b/zynaddsubfx-0f236881.patch
new file mode 100644
index 0000000..c9799bf
--- /dev/null
+++ b/zynaddsubfx-0f236881.patch
@@ -0,0 +1,51 @@
+diff -rupN ZynAddSubFX-2.4.1.old/src/UI/BankUI.fl ZynAddSubFX-2.4.1/src/UI/BankUI.fl
+--- ZynAddSubFX-2.4.1.old/src/UI/BankUI.fl	2010-06-27 14:26:52.000000000 -0400
++++ ZynAddSubFX-2.4.1/src/UI/BankUI.fl	2011-06-22 23:50:22.000000000 -0400
+@@ -32,7 +32,7 @@ decl {\#include "../Misc/Config.h"} {pub
+ 
+ class BankProcess_ {} {
+   Function {process()} {open return_type {virtual void}
+-  } {}
++  } {code{;}}
+   decl {Bank *bank;} {public
+   }
+ } 
+diff -rupN ZynAddSubFX-2.4.1.old/src/UI/OscilGenUI.fl ZynAddSubFX-2.4.1/src/UI/OscilGenUI.fl
+--- ZynAddSubFX-2.4.1.old/src/UI/OscilGenUI.fl	2010-06-27 14:26:52.000000000 -0400
++++ ZynAddSubFX-2.4.1/src/UI/OscilGenUI.fl	2011-06-22 23:50:22.000000000 -0400
+@@ -129,7 +129,7 @@ delete [] spc;} {selected
+ 
+ class PSlider {: {public Fl_Slider}
+ } {
+-  Function {PSlider(int x,int y, int w, int h, const char *label=0):Fl_Slider(x,y,w,h,label)} {} {}
++  Function {PSlider(int x,int y, int w, int h, const char *label=0):Fl_Slider(x,y,w,h,label)} {} {code{;}}
+   Function {handle(int event)} {return_type int
+   } {
+     code {int X=x(),Y=y(),W=w(),H=h();
+diff -rupN ZynAddSubFX-2.4.1.old/src/UI/PartUI.fl ZynAddSubFX-2.4.1/src/UI/PartUI.fl
+--- ZynAddSubFX-2.4.1.old/src/UI/PartUI.fl	2010-06-27 14:26:52.000000000 -0400
++++ ZynAddSubFX-2.4.1/src/UI/PartUI.fl	2011-06-22 23:50:50.000000000 -0400
+@@ -85,7 +85,7 @@ end();} {}
+ 
+ class PartUI_ {} {
+   Function {showparameters(int kititem,int engine)} {return_type virtual
+-  } {}
++  } {code{;}}
+ } 
+ 
+ class PartKitItem {: {public Fl_Group}
+diff -rupN ZynAddSubFX-2.4.1.old/src/UI/PresetsUI.fl ZynAddSubFX-2.4.1/src/UI/PresetsUI.fl
+--- ZynAddSubFX-2.4.1.old/src/UI/PresetsUI.fl	2010-06-27 14:26:52.000000000 -0400
++++ ZynAddSubFX-2.4.1/src/UI/PresetsUI.fl	2011-06-22 23:50:22.000000000 -0400
+@@ -18,9 +18,9 @@ decl {\#include "../Params/Presets.h"} {
+ 
+ class PresetsUI_ {} {
+   Function {refresh()} {open return_type {virtual void}
+-  } {}
++  } {code{;}}
+   Function {~PresetsUI_()} {open return_type virtual
+-  } {}
++  } {code{;}}
+ } 
+ 
+ class PresetsUI {} {
diff --git a/zynaddsubfx.spec b/zynaddsubfx.spec
index f003299..7237f0e 100644
--- a/zynaddsubfx.spec
+++ b/zynaddsubfx.spec
@@ -1,7 +1,7 @@
 Summary:        Real-time software synthesizer
 Name:           zynaddsubfx
 Version:        2.4.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 # Source is a collective work, distributed by
 License:        GPLv2 and GPLv2+
 Group:          Applications/Multimedia
@@ -11,6 +11,9 @@ Source1:        zynaddsubfx.desktop
 Patch0:         zynaddsubfx-jack-support.patch
 Patch1:         zynaddsubfx-fltk-config-broken.patch
 Patch2:         zynaddsubfx-fltk-config-broken-2.patch
+# Build fix against fltk >= 1.3.0. From upstream trunk
+# http://sourceforge.net/tracker/?func=detail&aid=3175784&group_id=62934&atid=502312
+Patch3:         zynaddsubfx-0f236881.patch
 Patch6:         zynaddsubfx-linking.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -74,8 +77,10 @@ This package includes the DSSI implementation of the synthesizer.
 %patch0 -p1 -b .jack
 %patch1 -p0 -b .fltk1
 %patch2 -p1 -b .fltk2
+%patch3 -p1 -b .fltk3
 %patch6 -p1 -b .linking
 
+
 # Fix encoding
 for i in AUTHORS.txt ChangeLog; do
    iconv -f iso8859-1 -t utf8 $i -o tmpfile
@@ -191,6 +196,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_libdir}/dssi/*.so
 
 %changelog
+* Sun Jun 26 2011 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.4.1-3
+- Fix FTBFS RHBZ#715835
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild