commit seq24 for openSUSE:Factory

Hello community, here is the log from the commit of package seq24 for openSUSE:Factory checked in at Wed Apr 21 01:58:08 CEST 2010. -------- --- seq24/seq24.changes 2009-05-11 13:52:42.000000000 +0200 +++ /mounts/work_src_done/STABLE/seq24/seq24.changes 2010-04-20 09:05:24.000000000 +0200 @@ -1,0 +2,28 @@ +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. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- seq24-buttonbox.patch seq24-codeclenup.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ seq24.spec ++++++ --- /var/tmp/diff_new_pack.jwAHEf/_old 2010-04-21 01:58:02.000000000 +0200 +++ /var/tmp/diff_new_pack.jwAHEf/_new 2010-04-21 01:58:02.000000000 +0200 @@ -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 @@ %prep %setup -q +%patch0 +%patch1 %build autoreconf --force --install ++++++ seq24-0.9.0.tar.bz2 ++++++ ++++ 26904 lines of diff (skipped) ++++++ seq24-buttonbox.patch ++++++ 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), ++++++ seq24-codeclenup.patch ++++++ --- 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, ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org