Index: Makefile =================================================================== RCS file: /home/pcvs/ports/databases/mysql-gui-tools/Makefile,v retrieving revision 1.4 diff -u -r1.4 Makefile --- Makefile 23 Jan 2009 16:27:18 -0000 1.4 +++ Makefile 8 Jul 2009 10:58:03 -0000 @@ -7,8 +7,7 @@ # PORTNAME= mysql-gui-tools -PORTVERSION= 5.0r12 -PORTREVISION= 1 +PORTVERSION= 5.0r14 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_MYSQL} MASTER_SITE_SUBDIR= MySQLGUITools @@ -24,33 +23,34 @@ OPTIONS= QUERY_BROWSER "Build the MySQL Query Browser" on \ ADMINISTRATOR "Build the MySQL Administrator" on +USE_GNOME= gnomelibs libglade2 gtkhtml3 libgnomeprint intlhack gtksourceview USE_GL= gl glut USE_GMAKE= yes -USE_GNOME= libglade2 gtkhtml3 libgnomeprint intlhack DATADIR= ${PREFIX}/share/mysql-gui CFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +CXXFLAGS+= ${CFLAGS} LDFLAGS+= -L${LOCALBASE}/lib HAS_CONFIGURE= yes -CONFIGURE_ENV= CFLAGS="${CFLAGS}" CXXFLAGS="${CFLAGS}" CPPFLAGS="${CFLAGS}" \ +CONFIGURE_ARGS= --with-gtkhtml=libgtkhtml-3.14 --prefix=${PREFIX} +CONFIGURE_ENV= CFLAGS="${CFLAGS}" CPPFLAGS="${CFLAGS}" \ LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}" ACLOCAL="${TRUE}" \ AUTOMAKE="${TRUE}" AUTOCONF="${TRUE}" AUTOHEADER="${TRUE}" -CONFIGURE_ARGS= --with-gtkhtml=libgtkhtml-3.14 --prefix=${PREFIX} - -SUBDIRS= mysql-gui-common .include +SUBDIRS= common + .if !defined(WITHOUT_QUERY_BROWSER) -SUBDIRS+= mysql-query-browser +SUBDIRS+= query-browser PLIST_SUB+= QUERY_BROWSER="" .else PLIST_SUB+= QUERY_BROWSER="@comment " .endif .if !defined(WITHOUT_ADMINISTRATOR) -SUBDIRS+= mysql-administrator +SUBDIRS+= administrator PLIST_SUB+= ADMINISTRATOR="" .else PLIST_SUB+= ADMINISTRATOR="@comment " @@ -64,36 +64,26 @@ PLIST_SUB+= NLS="@comment " .endif -.if defined(WITHOUT_ADMINISTRATOR) && defined(WITHOUT_QUERY_BROWSER) +.if defined(WITHOUT_ADMINISTRATOR) && defined(WITHOUT_QUERY_BROWSER) && defined(WITHOUT_MIGRATION_TOOL) IGNORE= please run 'make config' again and select at least one component .endif post-patch: - ${REINPLACE_CMD} -e 's|lseek64|lseek|g' \ - ${WRKSRC}/mysql-administrator/source/linux/MInstanceInfo.cc - ${REINPLACE_CMD} -e '578s|make|${GMAKE}|g' \ - ${WRKSRC}/mysql-query-browser/source/linux/Makefile.in - ${REINPLACE_CMD} -e 's|-ldl|-luuid|g' \ - ${WRKSRC}/mysql-gui-common/tools/grtsh/Makefile.in \ - ${WRKSRC}/mysql-gui-common/tools/grtsh/Makefile.am - ${REINPLACE_CMD} -e 's|-llualib||g' ${WRKSRC}/mysql-gui-common/configure \ - ${WRKSRC}/mysql-gui-common/source/php/Makefile \ - ${WRKSRC}/mysql-gui-common/source/php/modules/Makefile - ${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -E -e \ - 's|-DG.*_DISABLE_DEPRECATED||g' -.if defined(WITHOUT_NLS) - ${REINPLACE_CMD} -e '/^SUBDIRS/s|po||' \ - ${WRKSRC}/mysql-gui-common/Makefile.am \ - ${WRKSRC}/mysql-gui-common/Makefile.in \ - ${WRKSRC}/mysql-administrator/Makefile.am \ - ${WRKSRC}/mysql-administrator/Makefile.in \ - ${WRKSRC}/mysql-query-browser/Makefile.am \ - ${WRKSRC}/mysql-query-browser/Makefile.in -.endif +# switch to new directory name not complete + (cd ${WRKSRC} && ${LN} -sf common mysql-gui-common) +# UTF-8 input file + (${TR} -d "\357\273\277" < \ + ${WRKSRC}/common/library/base-library/source/myx_database_model.c > \ + ${WRKSRC}/common/library/base-library/source/myx_database_model.c.new && \ + ${MV} ${WRKSRC}/common/library/base-library/source/myx_database_model.c.new \ + ${WRKSRC}/common/library/base-library/source/myx_database_model.c) + + ${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ + ${WRKSRC}/query-browser/source/linux/Makefile.am do-configure: .for dir in ${SUBDIRS} - (cd ${WRKSRC}/${dir} && \ + (cd ${WRKSRC}/${dir} && ${SH} autogen.sh ${CONFIGURE_ARGS} && \ ${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS} \ ) .endfor Index: distinfo =================================================================== RCS file: /home/pcvs/ports/databases/mysql-gui-tools/distinfo,v retrieving revision 1.1 diff -u -r1.1 distinfo --- distinfo 24 Sep 2008 17:10:56 -0000 1.1 +++ distinfo 7 Jul 2009 12:47:46 -0000 @@ -1,3 +1,3 @@ -MD5 (mysql-gui-tools-5.0r12.tar.gz) = 755a62e8cd0ea0e138be6eedc430d7a9 -SHA256 (mysql-gui-tools-5.0r12.tar.gz) = 4ede2e8073ab3ffa9371c3ad258eec433e8bdea876aa3db6b85e26072eb2cf7e -SIZE (mysql-gui-tools-5.0r12.tar.gz) = 25357550 +MD5 (mysql-gui-tools-5.0r14.tar.gz) = b8efefbf20b7264c8f3afd34424467d7 +SHA256 (mysql-gui-tools-5.0r14.tar.gz) = 95e594754ffeb509f8fa1e3c392ee23308d0f4abe7ff6d311a72b0df16b300b9 +SIZE (mysql-gui-tools-5.0r14.tar.gz) = 24897382 Index: files/patch-administrator-source-linux_MABackupPanel.cc =================================================================== RCS file: files/patch-administrator-source-linux_MABackupPanel.cc diff -N files/patch-administrator-source-linux_MABackupPanel.cc --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-administrator-source-linux_MABackupPanel.cc 8 Jul 2009 10:06:51 -0000 @@ -0,0 +1,11 @@ +--- administrator/source/linux/MABackupPanel.cc.orig 2009-07-08 12:06:17.000000000 +0200 ++++ administrator/source/linux/MABackupPanel.cc 2009-07-08 12:06:37.000000000 +0200 +@@ -1282,7 +1282,7 @@ + + if (_inst->check_connection()) + { +- SigC::Connection con= Glib::signal_timeout().connect(sigc::bind ++ sigc::connection con= Glib::signal_timeout().connect(sigc::bind + (sigc::mem_fun(*this, &MABackupPanel::update_backup_progress),&arg.pdata), + 50); + dlg->show(); Index: files/patch-administrator-source-linux_MACatalogsPanel.cc =================================================================== RCS file: files/patch-administrator-source-linux_MACatalogsPanel.cc diff -N files/patch-administrator-source-linux_MACatalogsPanel.cc --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-administrator-source-linux_MACatalogsPanel.cc 8 Jul 2009 10:51:58 -0000 @@ -0,0 +1,29 @@ +--- administrator/source/linux/MACatalogsPanel.cc.orig 2009-07-08 12:51:09.000000000 +0200 ++++ administrator/source/linux/MACatalogsPanel.cc 2009-07-08 12:51:33.000000000 +0200 +@@ -1488,7 +1488,7 @@ + + _maint_dlg_xml->get_button("next_button")->set_sensitive(false); + _maint_dlg_xml->get_note("note")->set_current_page(4); +- SigC::Connection conn = Glib::signal_timeout().connect(sigc::mem_fun(*this, &MACatalogsPanel::maint_pulse_progressbar), 200); ++ sigc::connection conn = Glib::signal_timeout().connect(sigc::mem_fun(*this, &MACatalogsPanel::maint_pulse_progressbar), 200); + + status= (MYX_TABLE_COMMAND_STATUSES*) + _data->get_instance()->perform_data_fetch3((MInstanceInfo::DataFetcher3)myx_optimize_table, +@@ -1528,7 +1528,7 @@ + + _maint_dlg_xml->get_button("next_button")->set_sensitive(false); + _maint_dlg_xml->get_note("note")->set_current_page(4); +- SigC::Connection conn = Glib::signal_timeout().connect(sigc::mem_fun(*this, &MACatalogsPanel::maint_pulse_progressbar), 200); ++ sigc::connection conn = Glib::signal_timeout().connect(sigc::mem_fun(*this, &MACatalogsPanel::maint_pulse_progressbar), 200); + + status= (MYX_TABLE_COMMAND_STATUSES*) + _data->get_instance()->perform_data_fetch3((MInstanceInfo::DataFetcher3)myx_check_table, +@@ -1568,7 +1568,7 @@ + + _maint_dlg_xml->get_button("next_button")->set_sensitive(false); + _maint_dlg_xml->get_note("note")->set_current_page(4); +- SigC::Connection conn = Glib::signal_timeout().connect(sigc::mem_fun(*this, &MACatalogsPanel::maint_pulse_progressbar), 200); ++ sigc::connection conn = Glib::signal_timeout().connect(sigc::mem_fun(*this, &MACatalogsPanel::maint_pulse_progressbar), 200); + + status= (MYX_TABLE_COMMAND_STATUSES*) + _data->get_instance()->perform_data_fetch3((MInstanceInfo::DataFetcher3)myx_repair_table, Index: files/patch-administrator-source-linux_MARestorePanel.cc =================================================================== RCS file: files/patch-administrator-source-linux_MARestorePanel.cc diff -N files/patch-administrator-source-linux_MARestorePanel.cc --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-administrator-source-linux_MARestorePanel.cc 8 Jul 2009 10:49:25 -0000 @@ -0,0 +1,20 @@ +--- administrator/source/linux/MARestorePanel.cc.orig 2009-07-08 12:49:02.000000000 +0200 ++++ administrator/source/linux/MARestorePanel.cc 2009-07-08 12:49:13.000000000 +0200 +@@ -728,7 +728,7 @@ + op_aborted= false; + + { +- SigC::Connection con= Glib::signal_timeout().connect(sigc::bind ++ sigc::connection con= Glib::signal_timeout().connect(sigc::bind + (sigc::mem_fun(*this, &MARestorePanel::update_status),&arg.pdata), + 50); + +@@ -854,7 +854,7 @@ + //{ + MYX_BACKUP_ERROR err; + +- SigC::Connection con= Glib::signal_timeout().connect(sigc::bind ++ sigc::connection con= Glib::signal_timeout().connect(sigc::bind + (sigc::mem_fun(*this, &MARestorePanel::update_status),&arg.pdata), + 50); + Index: files/patch-administrator-source-linux_MAServerConnectionsPanel.h =================================================================== RCS file: files/patch-administrator-source-linux_MAServerConnectionsPanel.h diff -N files/patch-administrator-source-linux_MAServerConnectionsPanel.h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-administrator-source-linux_MAServerConnectionsPanel.h 8 Jul 2009 10:01:32 -0000 @@ -0,0 +1,11 @@ +--- administrator/source/linux/MAServerConnectionsPanel.h.orig 2009-07-08 12:01:06.000000000 +0200 ++++ administrator/source/linux/MAServerConnectionsPanel.h 2009-07-08 12:01:13.000000000 +0200 +@@ -87,7 +87,7 @@ + + Glib::RefPtr _thread_icon; + +- SigC::Connection _timer; ++ sigc::connection _timer; + + int _current_page; + Index: files/patch-administrator-source-linux_MAdministrator.h =================================================================== RCS file: files/patch-administrator-source-linux_MAdministrator.h diff -N files/patch-administrator-source-linux_MAdministrator.h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-administrator-source-linux_MAdministrator.h 8 Jul 2009 09:55:26 -0000 @@ -0,0 +1,11 @@ +--- administrator/source/linux/MAdministrator.h.orig 2009-07-08 11:51:36.000000000 +0200 ++++ administrator/source/linux/MAdministrator.h 2009-07-08 11:55:04.000000000 +0200 +@@ -66,7 +66,7 @@ + + sigc::signal0 _signal_prefs_changed; + +- SigC::Connection _pulse_conn; ++ sigc::connection _pulse_conn; + bool pulse_progress(); + + void setup_sidebar(); Index: files/patch-administrator-source-linux_MInstanceInfo.cc =================================================================== RCS file: files/patch-administrator-source-linux_MInstanceInfo.cc diff -N files/patch-administrator-source-linux_MInstanceInfo.cc --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-administrator-source-linux_MInstanceInfo.cc 8 Jul 2009 09:58:32 -0000 @@ -0,0 +1,11 @@ +--- administrator/source/linux/MInstanceInfo.cc.orig 2009-07-08 11:56:19.000000000 +0200 ++++ administrator/source/linux/MInstanceInfo.cc 2009-07-08 11:58:17.000000000 +0200 +@@ -1124,7 +1124,7 @@ + char *buffer= (char*)g_malloc(diff+1); + int fd= open(path.c_str(), O_RDONLY); + +- lseek64(fd, _log_file_pos, SEEK_SET); ++ lseek(fd, _log_file_pos, SEEK_SET); + if ((len= read(fd, buffer, diff)) < 0) + { + close(fd); Index: files/patch-common-source-linux_MDispatcher.cc =================================================================== RCS file: files/patch-common-source-linux_MDispatcher.cc diff -N files/patch-common-source-linux_MDispatcher.cc --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-common-source-linux_MDispatcher.cc 7 Jul 2009 22:00:27 -0000 @@ -0,0 +1,13 @@ +--- common/source/linux/MDispatcher.cc.orig 2008-09-25 08:24:31.000000000 +0000 ++++ common/source/linux/MDispatcher.cc 2008-09-25 08:25:09.000000000 +0000 +@@ -21,8 +21,8 @@ + #include + #include + +-#define MX_LOCK(mx) { if (0) g_message("[%i]:%s: LOCK %s", (int)pthread_self(), __FUNCTION__, #mx); pthread_mutex_lock(mx); } +-#define MX_UNLOCK(mx) { if (0) g_message("[%i]:%s: UNLOCK %s", (int)pthread_self(), __FUNCTION__, #mx); pthread_mutex_unlock(mx); } ++#define MX_LOCK(mx) { if (0) g_message("[%lu]:%s: LOCK %s", (unsigned long)pthread_self(), __FUNCTION__, #mx); pthread_mutex_lock(mx); } ++#define MX_UNLOCK(mx) { if (0) g_message("[%lu]:%s: UNLOCK %s", (unsigned long)pthread_self(), __FUNCTION__, #mx); pthread_mutex_unlock(mx); } + + + void *MDispatcher::thread_func(Fetcher *self) Index: files/patch-common-source-linux_MGConnectDialog.cc =================================================================== RCS file: files/patch-common-source-linux_MGConnectDialog.cc diff -N files/patch-common-source-linux_MGConnectDialog.cc --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-common-source-linux_MGConnectDialog.cc 7 Jul 2009 22:23:57 -0000 @@ -0,0 +1,24 @@ +--- common/source/linux/MGConnectDialog.cc.orig 2006-12-05 23:44:08.000000000 +0100 ++++ common/source/linux/MGConnectDialog.cc 2007-11-08 16:21:54.000000000 +0100 +@@ -659,9 +659,9 @@ void MGConnectDialog::open_connection_ed + // select back the original item + ((Gtk::OptionMenu*)_xml->get_widget("connection_list"))->set_history(_current_selected_item); + +- SigC::Connection c1= MGPreferencesEditor::instance()->signal_closed().connect(sigc::mem_fun(*this, ++ sigc::connection c1= MGPreferencesEditor::instance()->signal_closed().connect(sigc::mem_fun(*this, + &MGConnectDialog::preferences_closed)); +- SigC::Connection c2= MGPreferencesEditor::instance()->signal_changed().connect(sigc::mem_fun(*this, ++ sigc::connection c2= MGPreferencesEditor::instance()->signal_changed().connect(sigc::mem_fun(*this, + &MGConnectDialog::preferences_changed)); + MGPreferencesEditor::instance()->show(true); + MGPreferencesEditor::instance()->set_modal(true); +@@ -676,7 +676,7 @@ void MGConnectDialog::show_connection_fa + { + Gtk::Button *btn; + pid_t ping_pid= 0; +- SigC::Connection input_handler; ++ sigc::connection input_handler; + int rc; + bool pinging= false; + int myerror= 0; + Index: files/patch-common-source-linux_MGExecSU.cc =================================================================== RCS file: files/patch-common-source-linux_MGExecSU.cc diff -N files/patch-common-source-linux_MGExecSU.cc --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-common-source-linux_MGExecSU.cc 7 Jul 2009 22:01:46 -0000 @@ -0,0 +1,18 @@ +--- common/source/linux/MGExecSU.cc.orig 2008-03-07 01:50:54.000000000 +0100 ++++ common/source/linux/MGExecSU.cc 2008-03-07 01:52:50.000000000 +0100 +@@ -5,10 +5,14 @@ + #include "myg_gtkutils.h" + #include "mygpriv.h" + #include ++#include ++#include + #include ++#include + #include + #include +-#include ++#include ++#include + #include + + Index: files/patch-common-source-linux_MGTreeTooltip.h =================================================================== RCS file: files/patch-common-source-linux_MGTreeTooltip.h diff -N files/patch-common-source-linux_MGTreeTooltip.h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-common-source-linux_MGTreeTooltip.h 7 Jul 2009 15:09:29 -0000 @@ -0,0 +1,11 @@ +--- common/source/linux/MGTreeTooltip.h.orig 2009-07-07 17:08:50.000000000 +0200 ++++ common/source/linux/MGTreeTooltip.h 2009-07-07 17:09:06.000000000 +0200 +@@ -39,7 +39,7 @@ + + WillShowSignal _show_signal; + +- SigC::Connection _timeout; ++ sigc::connection _timeout; + + void expose_event(GdkEventExpose *event); + void leave_event(GdkEventCrossing *event); Index: files/patch-query-browser-source-linux_MGCodeEditor.cc =================================================================== RCS file: files/patch-query-browser-source-linux_MGCodeEditor.cc diff -N files/patch-query-browser-source-linux_MGCodeEditor.cc --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-query-browser-source-linux_MGCodeEditor.cc 8 Jul 2009 09:23:06 -0000 @@ -0,0 +1,38 @@ +--- query-browser/source/linux/MGCodeEditor.cc.orig 2009-07-08 11:17:31.000000000 +0200 ++++ query-browser/source/linux/MGCodeEditor.cc 2009-07-08 11:22:58.000000000 +0200 +@@ -39,6 +39,7 @@ + _wrapper->show(); + + gtk_source_view_set_show_line_markers(GTK_SOURCE_VIEW(_srcv), TRUE); ++#if 0 + gtk_source_view_set_compose_line_markers(GTK_SOURCE_VIEW(_srcv), FALSE); + + bg_color= Gdk::Color("#ffa6a6"); +@@ -54,6 +55,7 @@ + _wrapper->get_colormap()->alloc_color(fg_color); + gtk_source_view_set_marker_highlight_colors(GTK_SOURCE_VIEW(_srcv), "pc", + fg_color.gobj(), bg_color.gobj()); ++#endif + } + + +@@ -157,7 +159,9 @@ + { + _pc_marker= gtk_source_buffer_create_marker(_buffer, "pc", "pc", + iter.gobj()); ++#if 0 + gtk_source_marker_set_priority(_pc_marker, 100); ++#endif + } + else + gtk_source_buffer_move_marker(_buffer, _pc_marker, iter.gobj()); +@@ -264,7 +268,9 @@ + { + marker= gtk_source_buffer_create_marker(_buffer, NULL, "breakpoint", + iter.gobj()); ++#if 0 + gtk_source_marker_set_priority(marker, 10); ++#endif + } + } + _wrapper->queue_draw(); Index: files/patch-query-browser-source-linux_MQResultTab.h =================================================================== RCS file: files/patch-query-browser-source-linux_MQResultTab.h diff -N files/patch-query-browser-source-linux_MQResultTab.h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-query-browser-source-linux_MQResultTab.h 7 Jul 2009 15:13:50 -0000 @@ -0,0 +1,20 @@ +--- query-browser/source/linux/MQResultTab.h.orig 2009-07-07 17:12:56.000000000 +0200 ++++ query-browser/source/linux/MQResultTab.h 2009-07-07 17:13:17.000000000 +0200 +@@ -45,7 +45,7 @@ + + Gtk::Paned *paned; + +- SigC::Connection scroll_con; ++ sigc::connection scroll_con; + }; + + enum CompareAction { +@@ -71,7 +71,7 @@ + + bool _vertical; + +- SigC::Connection _sync_con1, _sync_con2; ++ sigc::connection _sync_con1, _sync_con2; + + void scrolled(MQResultSetView *sender); + void activated(MQResultSetView *sender); Index: files/patch-query-browser-source-linux_Makefile.am =================================================================== RCS file: files/patch-query-browser-source-linux_Makefile.am diff -N files/patch-query-browser-source-linux_Makefile.am --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-query-browser-source-linux_Makefile.am 8 Jul 2009 09:27:31 -0000 @@ -0,0 +1,31 @@ +--- query-browser/source/linux/Makefile.am.orig 2006-12-13 06:18:53.000000000 +0100 ++++ query-browser/source/linux/Makefile.am 2009-07-08 11:26:35.000000000 +0200 +@@ -40,7 +40,7 @@ + -I$(top_srcdir)/../mysql-gui-common/library/utilities/shared_include\ + -I$(top_srcdir)/../mysql-gui-common/library/utilities/include\ + -I$(top_srcdir)/library/include\ +- -I$(top_srcdir)/source/linux/gtksourceview\ ++ -I%%LOCALBASE%%/include/gtksourceview-1.0\ + -DPREFIX=\""$(PREFIX)"\"\ + -DDATADIRNAME=\""$(DATADIRNAME)"\"\ + -DCOMMONDIRNAME=\""$(MG_COMMONDIR)"\"\ +@@ -52,18 +52,4 @@ + $(top_builddir)/../mysql-gui-common/library/base-library/source/.libs/libmysqlx.a\ + $(top_builddir)/../mysql-gui-common/library/utilities/source/.libs/libguiutil.a\ + $(top_builddir)/../mysql-gui-common/library/sql-parser/source/.libs/libsqlparser.a\ +- $(top_builddir)/source/linux/gtksourceview/gtksourceview/.libs/libgtksourceview-1.0.a\ +- @MYSQL_LIBS@ @GNOME_LIBS@ @PCRE_LIBS@ +- +-# +-# Can't add this as a AC_CONFIG_SUBDIRS in configure.in because +-# toplevel autogen.sh is breaking the configure scripts in gtksourceview +-# If a solution is found, this could be removed. +-# +-$(top_builddir)/source/linux/gtksourceview/gtksourceview/.libs/libgtksourceview-1.0.a: +- (cd gtksourceview; ./configure --enable-static --disable-shared --disable-build-tests; make CFLAGS="$(CFLAGS) -fno-strict-aliasing") +- +-clean-generic: +- -make -C gtksourceview distclean +- (cd gtksourceview; rm -fr autom4te.cache config.log) +- ++ @MYSQL_LIBS@ @GNOME_LIBS@ @PCRE_LIBS@ -L%%LOCALBASE%%/lib -lgtksourceview-1.0 Index: files/patch-sigc =================================================================== RCS file: files/patch-sigc diff -N files/patch-sigc --- files/patch-sigc 24 Sep 2008 17:10:56 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,136 +0,0 @@ ---- mysql-administrator/source/linux/MABackupPanel.cc.orig 2007-02-28 14:51:50.000000000 +0100 -+++ mysql-administrator/source/linux/MABackupPanel.cc 2007-11-08 16:21:44.000000000 +0100 -@@ -1282,7 +1282,7 @@ void MABackupPanel::perform_backup() - - if (_inst->check_connection()) - { -- SigC::Connection con= Glib::signal_timeout().connect(sigc::bind -+ sigc::connection con= Glib::signal_timeout().connect(sigc::bind - (sigc::mem_fun(*this, &MABackupPanel::update_backup_progress),&arg.pdata), - 50); - dlg->show(); ---- mysql-administrator/source/linux/MACatalogsPanel.cc.orig 2007-02-21 01:48:34.000000000 +0100 -+++ mysql-administrator/source/linux/MACatalogsPanel.cc 2007-11-08 16:21:23.000000000 +0100 -@@ -1488,7 +1488,7 @@ void MACatalogsPanel::maint_next_page() - - _maint_dlg_xml->get_button("next_button")->set_sensitive(false); - _maint_dlg_xml->get_note("note")->set_current_page(4); -- SigC::Connection conn = Glib::signal_timeout().connect(sigc::mem_fun(*this, &MACatalogsPanel::maint_pulse_progressbar), 200); -+ sigc::connection conn = Glib::signal_timeout().connect(sigc::mem_fun(*this, &MACatalogsPanel::maint_pulse_progressbar), 200); - - status= (MYX_TABLE_COMMAND_STATUSES*) - _data->get_instance()->perform_data_fetch3((MInstanceInfo::DataFetcher3)myx_optimize_table, -@@ -1528,7 +1528,7 @@ void MACatalogsPanel::maint_next_page() - - _maint_dlg_xml->get_button("next_button")->set_sensitive(false); - _maint_dlg_xml->get_note("note")->set_current_page(4); -- SigC::Connection conn = Glib::signal_timeout().connect(sigc::mem_fun(*this, &MACatalogsPanel::maint_pulse_progressbar), 200); -+ sigc::connection conn = Glib::signal_timeout().connect(sigc::mem_fun(*this, &MACatalogsPanel::maint_pulse_progressbar), 200); - - status= (MYX_TABLE_COMMAND_STATUSES*) - _data->get_instance()->perform_data_fetch3((MInstanceInfo::DataFetcher3)myx_check_table, -@@ -1568,7 +1568,7 @@ void MACatalogsPanel::maint_next_page() - - _maint_dlg_xml->get_button("next_button")->set_sensitive(false); - _maint_dlg_xml->get_note("note")->set_current_page(4); -- SigC::Connection conn = Glib::signal_timeout().connect(sigc::mem_fun(*this, &MACatalogsPanel::maint_pulse_progressbar), 200); -+ sigc::connection conn = Glib::signal_timeout().connect(sigc::mem_fun(*this, &MACatalogsPanel::maint_pulse_progressbar), 200); - - status= (MYX_TABLE_COMMAND_STATUSES*) - _data->get_instance()->perform_data_fetch3((MInstanceInfo::DataFetcher3)myx_repair_table, ---- mysql-administrator/source/linux/MAdministrator.h.orig 2007-03-27 15:09:56.000000000 +0200 -+++ mysql-administrator/source/linux/MAdministrator.h 2007-11-08 16:21:37.000000000 +0100 -@@ -66,7 +66,7 @@ class MAdministrator : public Glib::Obje - - sigc::signal0 _signal_prefs_changed; - -- SigC::Connection _pulse_conn; -+ sigc::connection _pulse_conn; - bool pulse_progress(); - - void setup_sidebar(); ---- mysql-administrator/source/linux/MARestorePanel.cc.orig 2006-09-26 20:12:56.000000000 +0200 -+++ mysql-administrator/source/linux/MARestorePanel.cc 2007-11-08 16:21:16.000000000 +0100 -@@ -728,7 +728,7 @@ MYX_BACKUP_CONTENT *MARestorePanel::perf - op_aborted= false; - - { -- SigC::Connection con= Glib::signal_timeout().connect(sigc::bind -+ sigc::connection con= Glib::signal_timeout().connect(sigc::bind - (sigc::mem_fun(*this, &MARestorePanel::update_status),&arg.pdata), - 50); - -@@ -854,7 +854,7 @@ void MARestorePanel::perform_restore() - //{ - MYX_BACKUP_ERROR err; - -- SigC::Connection con= Glib::signal_timeout().connect(sigc::bind -+ sigc::connection con= Glib::signal_timeout().connect(sigc::bind - (sigc::mem_fun(*this, &MARestorePanel::update_status),&arg.pdata), - 50); - ---- mysql-administrator/source/linux/MAServerConnectionsPanel.h.orig 2005-04-22 05:21:41.000000000 +0200 -+++ mysql-administrator/source/linux/MAServerConnectionsPanel.h 2007-11-08 16:21:32.000000000 +0100 -@@ -87,7 +87,7 @@ class MAServerConnectionsPanel : public - - Glib::RefPtr _thread_icon; - -- SigC::Connection _timer; -+ sigc::connection _timer; - - int _current_page; - ---- mysql-gui-common/source/linux/MGConnectDialog.cc.orig 2006-12-05 23:44:08.000000000 +0100 -+++ mysql-gui-common/source/linux/MGConnectDialog.cc 2007-11-08 16:21:54.000000000 +0100 -@@ -659,9 +659,9 @@ void MGConnectDialog::open_connection_ed - // select back the original item - ((Gtk::OptionMenu*)_xml->get_widget("connection_list"))->set_history(_current_selected_item); - -- SigC::Connection c1= MGPreferencesEditor::instance()->signal_closed().connect(sigc::mem_fun(*this, -+ sigc::connection c1= MGPreferencesEditor::instance()->signal_closed().connect(sigc::mem_fun(*this, - &MGConnectDialog::preferences_closed)); -- SigC::Connection c2= MGPreferencesEditor::instance()->signal_changed().connect(sigc::mem_fun(*this, -+ sigc::connection c2= MGPreferencesEditor::instance()->signal_changed().connect(sigc::mem_fun(*this, - &MGConnectDialog::preferences_changed)); - MGPreferencesEditor::instance()->show(true); - MGPreferencesEditor::instance()->set_modal(true); -@@ -676,7 +676,7 @@ void MGConnectDialog::show_connection_fa - { - Gtk::Button *btn; - pid_t ping_pid= 0; -- SigC::Connection input_handler; -+ sigc::connection input_handler; - int rc; - bool pinging= false; - int myerror= 0; ---- mysql-gui-common/source/linux/MGTreeTooltip.h.orig 2005-10-07 13:31:36.000000000 +0200 -+++ mysql-gui-common/source/linux/MGTreeTooltip.h 2007-11-08 16:21:49.000000000 +0100 -@@ -39,7 +39,7 @@ class MGTreeTooltip : public Glib::Objec - - WillShowSignal _show_signal; - -- SigC::Connection _timeout; -+ sigc::connection _timeout; - - void expose_event(GdkEventExpose *event); - void leave_event(GdkEventCrossing *event); ---- mysql-query-browser/source/linux/MQResultTab.h.orig 2006-12-06 16:50:09.000000000 +0100 -+++ mysql-query-browser/source/linux/MQResultTab.h 2007-11-08 16:21:09.000000000 +0100 -@@ -45,7 +45,7 @@ class MQResultTab : public MQBaseTab { - - Gtk::Paned *paned; - -- SigC::Connection scroll_con; -+ sigc::connection scroll_con; - }; - - enum CompareAction { -@@ -71,7 +71,7 @@ class MQResultTab : public MQBaseTab { - - bool _vertical; - -- SigC::Connection _sync_con1, _sync_con2; -+ sigc::connection _sync_con1, _sync_con2; - - void scrolled(MQResultSetView *sender); - void activated(MQResultSetView *sender);