8d6b8c51a4
Copy from multimedia:apps/seq24 based on submit request 38317 from user plater OBS-URL: https://build.opensuse.org/request/show/38317 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/seq24?expand=0&rev=10
52 lines
1.3 KiB
Diff
52 lines
1.3 KiB
Diff
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 <gtkmm.h>
|
|
+
|
|
+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),
|