Hello community, here is the log from the commit of package ZynAddSubFX for openSUSE:Factory checked in at Thu Jul 14 10:17:28 CEST 2011.
-------- --- ZynAddSubFX/ZynAddSubFX.changes 2010-09-23 23:11:19.000000000 +0200 +++ /mounts/work_src_done/STABLE/ZynAddSubFX/ZynAddSubFX.changes 2011-07-12 12:22:46.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Jul 12 10:08:37 UTC 2011 - [email protected] + +- build against fltk 1.3 (taken from git repository) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- ZynAddSubFX-fltk13.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ZynAddSubFX.spec ++++++ --- /var/tmp/diff_new_pack.21hJAW/_old 2011-07-14 10:17:14.000000000 +0200 +++ /var/tmp/diff_new_pack.21hJAW/_new 2011-07-14 10:17:14.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package ZynAddSubFX (Version 2.4.1) +# spec file for package ZynAddSubFX # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,7 +26,7 @@ # BuildRequires: lash-devel BuildRequires: mxml-devel Version: 2.4.1 -Release: 1 +Release: 5 Summary: A Real-Time Software Synthesizer for Linux License: GPLv2+ Group: Productivity/Multimedia/Sound/Midi @@ -38,6 +38,7 @@ Patch: ZynAddSubFX.dif Patch1: ZynAddSubFX-array-overflow-fix.diff Patch2: ZynAddSubFX-strncat-fix.diff +Patch3: ZynAddSubFX-fltk13.diff %description ZynAddSubFX is a many-featured real-time software synthesizer for @@ -57,6 +58,7 @@ %patch -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build cd src ++++++ ZynAddSubFX-fltk13.diff ++++++ >From 0f236881d7b0ce41755959ca9316fa3abb9464e6 Mon Sep 17 00:00:00 2001 From: fundamental <[email protected]> Date: Fri, 3 Jun 2011 12:51:50 -0400 Subject: [PATCH 1/1] FLTK1.3: Applying patch to force code generation Applying patch from gentoo to fix compile error: https://sourceforge.net/tracker/?func=detail&aid=3175784&group_id=62934&atid=502312 --- src/UI/BankUI.fl | 2 +- src/UI/OscilGenUI.fl | 2 +- src/UI/PresetsUI.fl | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) Index: ZynAddSubFX-2.4.1/src/UI/BankUI.fl =================================================================== --- ZynAddSubFX-2.4.1.orig/src/UI/BankUI.fl +++ ZynAddSubFX-2.4.1/src/UI/BankUI.fl @@ -32,7 +32,7 @@ decl {\#include "../Misc/Config.h"} {pub class BankProcess_ {} { Function {process()} {open return_type {virtual void} - } {} + } {code{;}} decl {Bank *bank;} {public } } Index: ZynAddSubFX-2.4.1/src/UI/OscilGenUI.fl =================================================================== --- ZynAddSubFX-2.4.1.orig/src/UI/OscilGenUI.fl +++ ZynAddSubFX-2.4.1/src/UI/OscilGenUI.fl @@ -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(); Index: ZynAddSubFX-2.4.1/src/UI/PresetsUI.fl =================================================================== --- ZynAddSubFX-2.4.1.orig/src/UI/PresetsUI.fl +++ ZynAddSubFX-2.4.1/src/UI/PresetsUI.fl @@ -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 {} { Index: ZynAddSubFX-2.4.1/src/UI/PartUI.fl =================================================================== --- ZynAddSubFX-2.4.1.orig/src/UI/PartUI.fl +++ ZynAddSubFX-2.4.1/src/UI/PartUI.fl @@ -83,10 +83,7 @@ end();} {} decl {int npart;} {} } -class PartUI_ {} { - Function {showparameters(int kititem,int engine)} {return_type virtual - } {} -} +decl {class PartUI;} {public} class PartKitItem {: {public Fl_Group} } { @@ -254,7 +251,7 @@ partui->showparameters(n,-1);//use to de } else o->value(1);} } } - Function {init(Part *part_,int n_,Master *master_,PartUI_ *partui_)} {} { + Function {init(Part *part_,int n_,Master *master_,PartUI *partui_)} {} { code {part=part_; n=n_; partui=partui_; @@ -271,10 +268,10 @@ end();} {} decl {int n;} {} decl {Master *master;} {} decl {char label[10];} {} - decl {PartUI_ *partui;} {} + decl {PartUI *partui;} {} } -class PartUI {: {public Fl_Group,PartUI_} +class PartUI {: {public Fl_Group} } { Function {make_window()} {private } { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
