From 99b2e27f64051eb51625b12ce588cc2c91f0a5f1c8a55b7333c8bf3418e939bd Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Mon, 19 Dec 2011 13:20:08 +0000 Subject: [PATCH] fix build OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/seq24?expand=0&rev=13 --- seq24-buttonbox.patch | 51 ------------------------------------------ seq24-codeclenup.patch | 31 ------------------------- seq24.spec | 11 --------- 3 files changed, 93 deletions(-) delete mode 100644 seq24-buttonbox.patch delete mode 100644 seq24-codeclenup.patch diff --git a/seq24-buttonbox.patch b/seq24-buttonbox.patch deleted file mode 100644 index e9c9957..0000000 --- a/seq24-buttonbox.patch +++ /dev/null @@ -1,51 +0,0 @@ -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 deleted file mode 100644 index 80d38f8..0000000 --- a/seq24-codeclenup.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- 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.spec b/seq24.spec index 58517df..3661bad 100644 --- a/seq24.spec +++ b/seq24.spec @@ -30,8 +30,6 @@ Release: 0 Source: http://launchpad.net/seq24/trunk/%{version}/+download/%{name}-%{version}.tar.bz2 Source1: %name.desktop Source2: seq24.png -Patch0: seq24-buttonbox.patch -Patch1: seq24-codeclenup.patch Url: https://launchpad.net/seq24 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -39,19 +37,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Seq24 is a real-time midi sequencer. It was created to provide a very simple interface for editing and playing MIDI 'loops.' - - -Authors: --------- - Rob C. Buse - %prep %setup -q -%patch0 -%patch1 %build -autoreconf --force --install %configure make %{?jobs:-j %jobs}