diff --git a/seq24-0.9.0.tar.bz2 b/seq24-0.9.0.tar.bz2 index 02b2b82..1122778 100644 --- a/seq24-0.9.0.tar.bz2 +++ b/seq24-0.9.0.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b1fc3fefa45fc265eccf5f28761f7ddcc24929d56d9936b57235edee3d7addaa -size 170369 +oid sha256:525893bc67d5b55dcc0326903f91acdd5e96e092e01a1a3109ac62242d7d2fc5 +size 131712 diff --git a/seq24-buttonbox.patch b/seq24-buttonbox.patch new file mode 100644 index 0000000..e9c9957 --- /dev/null +++ b/seq24-buttonbox.patch @@ -0,0 +1,51 @@ +Index: configure.in +=================================================================== +--- configure.in.orig ++++ configure.in +@@ -69,6 +69,33 @@ AM_PATH_ALSA(0.9.0) + ####AM_PATH_GTKMM(1.2.0) OLD + + PKG_CHECK_MODULES(GTKMM, gtkmm-2.4 >= 2.4.0) ++ ++AC_MSG_CHECKING([for return type of Gtk::Dialog::get_action_area ...]) ++AC_LANG_PUSH(C++) ++AH_TEMPLATE([BBOX_TYPE], [The return type of Gtk::Dialog::get_action_area]) ++ ++O_CXXFLAGS="$CXXFLAGS" ++CXXFLAGS="$CXXFLAGS $pkg_cv_GTKMM_CFLAGS" ++AC_COMPILE_IFELSE( ++[#include ++ ++void bboxtest() ++{ ++ Gtk::FileChooserDialog dialog("Test", ++ Gtk::FILE_CHOOSER_ACTION_OPEN); ++ Gtk::ButtonBox *bb = dialog.get_action_area(); ++}], ++[ ++AC_DEFINE(BBOX_TYPE, ButtonBox) ++bbox_type="ButtonBox *" ++], ++[ ++AC_DEFINE(BBOX_TYPE, HButtonBox) ++bbox_type="HButtonBox *" ++]) ++AC_MSG_RESULT([$bbox_type]) ++CXXFLAGS="$O_CXXFLAGS" ++ + AC_SUBST(GTKMM_CFLAGS) + AC_SUBST(GTKMM_LIBS) + +Index: src/mainwnd.cpp +=================================================================== +--- src/mainwnd.cpp.orig ++++ src/mainwnd.cpp +@@ -595,7 +595,7 @@ mainwnd::file_import_dialog( void ) + + dialog.set_current_folder(last_used_dir); + +- HButtonBox *btnbox = dialog.get_action_area(); ++ BBOX_TYPE *btnbox = dialog.get_action_area(); + HBox hbox( false, 2 ); + + m_adjust_load_offset = manage( new Adjustment( 0, -(c_max_sets - 1), diff --git a/seq24-codeclenup.patch b/seq24-codeclenup.patch new file mode 100644 index 0000000..80d38f8 --- /dev/null +++ b/seq24-codeclenup.patch @@ -0,0 +1,31 @@ +--- src/optionsfile.cpp ++++ src/optionsfile.cpp +@@ -69,22 +69,22 @@ optionsfile::parse( perform *a_perf ) + + &sequence, + +- &a_perf->get_midi_control_toggle(i)->m_active, +- &a_perf->get_midi_control_toggle(i)->m_inverse_active, ++ (int *)&a_perf->get_midi_control_toggle(i)->m_active, ++ (int *)&a_perf->get_midi_control_toggle(i)->m_inverse_active, + &a_perf->get_midi_control_toggle(i)->m_status, + &a_perf->get_midi_control_toggle(i)->m_data, + &a_perf->get_midi_control_toggle(i)->m_min_value, + &a_perf->get_midi_control_toggle(i)->m_max_value, + +- &a_perf->get_midi_control_on(i)->m_active, +- &a_perf->get_midi_control_on(i)->m_inverse_active, ++ (int *)&a_perf->get_midi_control_on(i)->m_active, ++ (int *)&a_perf->get_midi_control_on(i)->m_inverse_active, + &a_perf->get_midi_control_on(i)->m_status, + &a_perf->get_midi_control_on(i)->m_data, + &a_perf->get_midi_control_on(i)->m_min_value, + &a_perf->get_midi_control_on(i)->m_max_value, + +- &a_perf->get_midi_control_off(i)->m_active, +- &a_perf->get_midi_control_off(i)->m_inverse_active, ++ (int *)&a_perf->get_midi_control_off(i)->m_active, ++ (int *)&a_perf->get_midi_control_off(i)->m_inverse_active, + &a_perf->get_midi_control_off(i)->m_status, + &a_perf->get_midi_control_off(i)->m_data, + &a_perf->get_midi_control_off(i)->m_min_value, diff --git a/seq24.changes b/seq24.changes index 5653e48..cf4b05d 100644 --- a/seq24.changes +++ b/seq24.changes @@ -1,3 +1,31 @@ +------------------------------------------------------------------- +Tue Apr 20 06:43:35 UTC 2010 - davejplater@gmail.com + +- Update to latest bzr checkout 2010-02-21 +- Summary of changes:- + * Merged constructor initializer lists. + * Merge removal of useless nullity tests + * Cleanup : removed some unused variables, reduced unecessary + big scope of some other variables + * Wrapped reading of single bytes, and removed the + push_front/reverse list browsing insanity. + * Use STL in midifile instead of news/deletes + * Plyphonic Step Edit + * Monophonic Step Edit on Sequence + * Fixed adding notes on the begining when midi record is on + and not playing sequence + * src/perform.cpp: Fixed jack_position_t->bar calculation which + always where 0 or negative while using Hydrogen 0.9.4 at the + same time. + * See /usr/share/doc/packages/seq24/ChangeLog for more changes. + +------------------------------------------------------------------- +Tue Apr 20 03:49:05 UTC 2010 - pth@novell.com + +- Determine return type of Gtk::Dialog::get_action_area in + configure and use result in mainwnd.cpp +- Fix Compiler warning. + ------------------------------------------------------------------- Mon May 11 13:50:42 CEST 2009 - tiwai@suse.de diff --git a/seq24.spec b/seq24.spec index 292c684..e75aa5a 100644 --- a/seq24.spec +++ b/seq24.spec @@ -1,7 +1,7 @@ # # spec file for package seq24 (Version 0.9.0) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 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 @@ -20,20 +20,18 @@ Name: seq24 BuildRequires: alsa-devel gcc-c++ jack-devel update-desktop-files -%if %suse_version > 1010 BuildRequires: gtkmm2-devel -%else -BuildRequires: gtkmm24-devel -%endif Summary: A Small, Real-Time MIDI Sequencer Version: 0.9.0 -Release: 1 -License: GPL v2 or later +Release: 2 +License: GPLv2+ Group: Productivity/Multimedia/Sound/Midi -Source: %{name}-%{version}.tar.bz2 +Source: http://launchpad.net/seq24/trunk/0.9.0/+download/%{name}-%{version}.tar.bz2 Source1: %name.desktop Source2: seq24.png -Url: http://www.filter24.org/seq24/ +Patch0: seq24-buttonbox.patch +Patch1: seq24-codeclenup.patch +Url: https://launchpad.net/seq24 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -48,6 +46,8 @@ Authors: %prep %setup -q +%patch0 +%patch1 %build autoreconf --force --install @@ -73,56 +73,3 @@ cp %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps %{_datadir}/pixmaps/*.png %changelog -* Mon May 11 2009 tiwai@suse.de -- updated to version 0.9.0: - * Several bug fixs, contains adaptations to library API changes, - string buffer overruns, 64Bit incompatibility and memory leaks - for MIDI file format errors. - * See ChangeLog for more details -* Wed Apr 16 2008 tiwai@suse.de -- fix build with recent sigc++-2. -* Wed Nov 28 2007 tiwai@suse.de -- fix build with old suse version -* Wed Oct 31 2007 ro@suse.de -- include assert.h for alsa source -* Mon Oct 22 2007 tiwai@suse.de -- fix build with gcc 4.3 -* Thu Oct 12 2006 tiwai@suse.de -- updated to version 0.8.7: - * Undo support (Ctrl-Z) - * Ctrl + Select Adds to Selection - * Window Raise on Edit - * Clipboard shared among editors - * Items remain selected after edit - * Can now 'paint' notes / events in editor - * Paste buffer doesn't clear - * Added new rc file for custom named ports and CC codes - * Keypress Start (space) and Stop (escape) - * Shift + Middle Mouse will now stretch events over range -* Thu May 18 2006 tiwai@suse.de -- updated to version 0.8.6: - * use gtkmm 2.4 or later - * new song editor - * loop sync with jack transport - * midi clock option, split loops, manual midi ports - * menug bug and cpu hog fixes -* Wed Jan 25 2006 mls@suse.de -- converted neededforbuild to BuildRequires -* Thu Aug 04 2005 tiwai@suse.de -- updated to version 0.6.3. -* Fri Feb 11 2005 ro@suse.de -- change to libsigc++12 in neededforbuild -* Fri Jan 21 2005 tiwai@suse.de -- updated to version 0.6.0. Linked with gtk2. -* Thu Aug 05 2004 tiwai@suse.de -- updated to version 0.5.2. -* Mon Feb 16 2004 tiwai@suse.de -- updated to version 0.4.4. -* Sun Jan 11 2004 adrian@suse.de -- add %%defattr -* Fri Aug 15 2003 adrian@suse.de -- add desktop file -* Mon Aug 11 2003 tiwai@suse.de -- updated to version 0.4.3. -* Fri Jul 18 2003 tiwai@suse.de -- initial version: 0.4.2.