diff options
Diffstat (limited to 'dev-db')
| -rw-r--r-- | dev-db/mysql-gui-tools/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-db/mysql-gui-tools/Manifest | 11 | ||||
| -rw-r--r-- | dev-db/mysql-gui-tools/files/mysql-gui-tools-5.0_p12-libsigc++-2.2.patch | 191 | ||||
| -rw-r--r-- | dev-db/mysql-gui-tools/mysql-gui-tools-5.0_p12-r2.ebuild | 3 |
4 files changed, 205 insertions, 7 deletions
diff --git a/dev-db/mysql-gui-tools/ChangeLog b/dev-db/mysql-gui-tools/ChangeLog index 339f4e8c0cb9..30a4eb7269f1 100644 --- a/dev-db/mysql-gui-tools/ChangeLog +++ b/dev-db/mysql-gui-tools/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-db/mysql-gui-tools # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-gui-tools/ChangeLog,v 1.23 2008/02/24 16:16:59 swegener Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-gui-tools/ChangeLog,v 1.24 2008/04/11 18:38:28 swegener Exp $ + + 11 Apr 2008; Sven Wegener <swegener@gentoo.org> + +files/mysql-gui-tools-5.0_p12-libsigc++-2.2.patch, + mysql-gui-tools-5.0_p12-r2.ebuild: + Include a compability patch for libsigc++-2.2, bug #206318. 24 Feb 2008; Sven Wegener <swegener@gentoo.org> mysql-gui-tools-5.0_p12-r2.ebuild: diff --git a/dev-db/mysql-gui-tools/Manifest b/dev-db/mysql-gui-tools/Manifest index dd435f4eaa60..a57e735ded95 100644 --- a/dev-db/mysql-gui-tools/Manifest +++ b/dev-db/mysql-gui-tools/Manifest @@ -1,18 +1,19 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 +AUX mysql-gui-tools-5.0_p12-libsigc++-2.2.patch 8320 RMD160 b6f1a5f946fa371f9ce484af6ca839dedd46bec7 SHA1 7b2146726ec939ccda449a3ddbc127eab823b5ec SHA256 9844dcb8b7b9c1ea2d092c6afa4cb2a46b994b6ae8c3654932b4e24cf8d24048 AUX mysql-gui-tools-5.0_p12-query-browser-sps.patch 313 RMD160 c2b2727f8cab0946659b1cc39ae1d2983a50e4f0 SHA1 ce78c02e84e029199b7d8ea73a8b53f67d32b38b SHA256 a68fce4a3d4f51f9ad9d3c743fa9bb7be59356eaf2f21a7cc6f1735fd5528c8b AUX mysql-gui-tools-5.0_p12-workbench-lua.patch 1207 RMD160 188d2f4963f1578b32e0a7182ba3ea0eca90112c SHA1 ba97c5ee51d1425abda04fed5db3e50a5b6d7ec8 SHA256 23c81f83f22f23841412a0d4abf0d90ded4a26a12cff366d3bb95bb7bda27738 AUX mysql-gui-tools-5.0_p8-i18n-fix.patch 354 RMD160 660c2f3715e655c5473738c8c69be69c5e3d2a81 SHA1 eb700f0d691fa7d6a69db3f51059844b9855215f SHA256 9abc2cb8370b4f550718c6500be717951c527e6dca9f9530be534a5f8db09447 AUX mysql-gui-tools-5.0_p8-lua-modules.patch 672 RMD160 6a5aed0f34bb2d4bada62851dfb18ba329693e47 SHA1 d6b13610e25bbe3e22af040fc3c46d25564f0693 SHA256 2e3e271de504562db3f3d3ef33297ce454a6e1a223f98e4c4480cb2361dcbf28 DIST mysql-gui-tools-5.0r12.tar.gz 25357550 RMD160 ea94545c0e351e86112b13a43479aba361bc2cef SHA1 3fdd3a80c634f0aa9fa8f3bc505add18f360dc6c SHA256 4ede2e8073ab3ffa9371c3ad258eec433e8bdea876aa3db6b85e26072eb2cf7e -EBUILD mysql-gui-tools-5.0_p12-r2.ebuild 3043 RMD160 8b04f15b7adc55cd6f3422553212d3ecbb1b90c5 SHA1 bcf192ed41cff69f79139c7d60cf3ed192edec52 SHA256 1870304f89086cdeedc936d7044323623443b6ca65dc41217a9d212db345c92b -MISC ChangeLog 4435 RMD160 841d717c58d182df56ed79a581be8560430376e1 SHA1 403842b13f015471f8b99e699f50ffea3e1eb620 SHA256 e2d3abde8d623b7e9835e7bf3011c480b1b739fb3ebc79081dec689f1d4fec09 +EBUILD mysql-gui-tools-5.0_p12-r2.ebuild 3090 RMD160 bd25c479395313e56047fbfecf557a1d57984fe0 SHA1 0e9e8d8ab0baa584577694e616699bf7c2575cf2 SHA256 b1f5fe18556929eea0d34b1853f9e4e43304abb22d36c62605580340c0704f70 +MISC ChangeLog 4639 RMD160 e2945e8651db7c1ea109dff1df6d4062003d2538 SHA1 17a4dcc6512ce7da37f25a07052016037f77554f SHA256 9db017ccdc4c023f499e11af163476f551e5e0879bba63878224e491242e8343 MISC metadata.xml 272 RMD160 a64205312656df8afaa21bdbf37e15aaec949ced SHA1 7701e9d8d21b6250ae0664d90bebabaa231e908e SHA256 6968e5eb7b4a6b2de487f8942f82c8941a8714f6220f36c72082374ae66baeb4 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.7 (GNU/Linux) -iD8DBQFHwZiDI1lqEGTUzyQRAmP3AJ9SC3VINKXCITFIaKfovaPoHc7F5QCgjUEA -Bz59ToZQ3edFhsgOaBWQGDY= -=DbRD +iD8DBQFH/7AtI1lqEGTUzyQRAgjcAKCqxAMr0rIYGvzdU10Dz6vmwwOlrACeN8DY +Zvogq8p9Ql62nRW+U6kD+aI= +=eUuU -----END PGP SIGNATURE----- diff --git a/dev-db/mysql-gui-tools/files/mysql-gui-tools-5.0_p12-libsigc++-2.2.patch b/dev-db/mysql-gui-tools/files/mysql-gui-tools-5.0_p12-libsigc++-2.2.patch new file mode 100644 index 000000000000..87f2c3e68478 --- /dev/null +++ b/dev-db/mysql-gui-tools/files/mysql-gui-tools-5.0_p12-libsigc++-2.2.patch @@ -0,0 +1,191 @@ +--- old/mysql-administrator/source/linux/MABackupPanel.cc ++++ new/mysql-administrator/source/linux/MABackupPanel.cc +@@ -1282,7 +1282,7 @@ + + if (_inst->check_connection()) + { +- SigC::Connection con= Glib::signal_timeout().connect(sigc::bind<void*> ++ sigc::connection con= Glib::signal_timeout().connect(sigc::bind<void*> + (sigc::mem_fun(*this, &MABackupPanel::update_backup_progress),&arg.pdata), + 50); + dlg->show(); +--- old/mysql-administrator/source/linux/MACatalogsPanel.cc ++++ new/mysql-administrator/source/linux/MACatalogsPanel.cc +@@ -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,
+--- old/mysql-administrator/source/linux/MAdministrator.h ++++ new/mysql-administrator/source/linux/MAdministrator.h +@@ -66,7 +66,7 @@ +
+ sigc::signal0<void> _signal_prefs_changed;
+
+- SigC::Connection _pulse_conn;
++ sigc::connection _pulse_conn;
+ bool pulse_progress();
+
+ void setup_sidebar();
+--- old/mysql-administrator/source/linux/MARestorePanel.cc ++++ new/mysql-administrator/source/linux/MARestorePanel.cc +@@ -728,7 +728,7 @@ + op_aborted= false; + + { +- SigC::Connection con= Glib::signal_timeout().connect(sigc::bind<void*> ++ sigc::connection con= Glib::signal_timeout().connect(sigc::bind<void*> + (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<void*> ++ sigc::connection con= Glib::signal_timeout().connect(sigc::bind<void*> + (sigc::mem_fun(*this, &MARestorePanel::update_status),&arg.pdata), + 50); + +--- old/mysql-administrator/source/linux/MAServerConnectionsPanel.h ++++ new/mysql-administrator/source/linux/MAServerConnectionsPanel.h +@@ -87,7 +87,7 @@ +
+ Glib::RefPtr<Gdk::Pixbuf> _thread_icon;
+
+- SigC::Connection _timer;
++ sigc::connection _timer;
+
+ int _current_page;
+
+Only in new/mysql-gui-common/library/sql-parser/source: sed885efK +--- old/mysql-gui-common/source/linux/MGConnectDialog.cc ++++ new/mysql-gui-common/source/linux/MGConnectDialog.cc +@@ -659,9 +659,9 @@ + // 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 @@ + {
+ Gtk::Button *btn;
+ pid_t ping_pid= 0;
+- SigC::Connection input_handler;
++ sigc::connection input_handler;
+ int rc;
+ bool pinging= false;
+ int myerror= 0;
+--- old/mysql-gui-common/source/linux/MGTreeTooltip.h ++++ new/mysql-gui-common/source/linux/MGTreeTooltip.h +@@ -39,7 +39,7 @@ +
+ WillShowSignal _show_signal;
+
+- SigC::Connection _timeout;
++ sigc::connection _timeout;
+
+ void expose_event(GdkEventExpose *event);
+ void leave_event(GdkEventCrossing *event);
+--- old/mysql-migration-tool/source/linux/GRTEnvironment.cc ++++ new/mysql-migration-tool/source/linux/GRTEnvironment.cc +@@ -76,7 +76,7 @@ + }
+
+
+-void GRTEnvironment::set_shell_output_handler(const SigC::Slot1<void,const Glib::ustring&> &slot)
++void GRTEnvironment::set_shell_output_handler(const sigc::slot1<void,const Glib::ustring&> &slot)
+ {
+ _shellOutputHandler= slot;
+
+--- old/mysql-migration-tool/source/linux/GRTEnvironment.h ++++ new/mysql-migration-tool/source/linux/GRTEnvironment.h +@@ -28,7 +28,7 @@ + int _msgOffset;
+ std::vector<Glib::ustring> _sourceObjectNames;
+
+- SigC::Slot1<void,const Glib::ustring&> _shellOutputHandler;
++ sigc::slot1<void,const Glib::ustring&> _shellOutputHandler;
+
+ static void process_shell_output(const char *text, void *udata);
+
+@@ -42,7 +42,7 @@ + int init_jni(const std::string &classpath);
+ int execute_shell_command(const Glib::ustring &command);
+
+- void set_shell_output_handler(const SigC::Slot1<void,const Glib::ustring&> &slot);
++ void set_shell_output_handler(const sigc::slot1<void,const Glib::ustring&> &slot);
+
+ MYX_GRT_OBJ *get_object(const Glib::ustring &name);
+ bool object_implements_interface(MYX_GRT_OBJ *obj, const Glib::ustring &name);
+--- old/mysql-migration-tool/source/linux/ObjectShell.cc ++++ new/mysql-migration-tool/source/linux/ObjectShell.cc +@@ -45,7 +45,7 @@ +
+ tree->set_model(_otree);
+
+- tree->get_selection()->signal_changed().connect(SigC::slot(*this,&ObjectShell::object_selected));
++ tree->get_selection()->signal_changed().connect(sigc::slot(*this,&ObjectShell::object_selected));
+
+
+ tree= _xml->get_tree("inspector_tree");
+@@ -57,9 +57,9 @@ +
+ tree->set_model(_ilist);
+
+- _xml->get_text("shell_text")->signal_key_press_event().connect(SigC::slot(*this,&ObjectShell::shell_key_press), false);
++ _xml->get_text("shell_text")->signal_key_press_event().connect(sigc::slot(*this,&ObjectShell::shell_key_press), false);
+
+- env->set_shell_output_handler(SigC::slot(*this,&ObjectShell::print_shell));
++ env->set_shell_output_handler(sigc::slot(*this,&ObjectShell::print_shell));
+
+ put_prompt();
+ }
+--- old/mysql-query-browser/source/linux/MQResultTab.h ++++ new/mysql-query-browser/source/linux/MQResultTab.h +@@ -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);
diff --git a/dev-db/mysql-gui-tools/mysql-gui-tools-5.0_p12-r2.ebuild b/dev-db/mysql-gui-tools/mysql-gui-tools-5.0_p12-r2.ebuild index cf131a3d0b17..c73d908b2be1 100644 --- a/dev-db/mysql-gui-tools/mysql-gui-tools-5.0_p12-r2.ebuild +++ b/dev-db/mysql-gui-tools/mysql-gui-tools-5.0_p12-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-gui-tools/mysql-gui-tools-5.0_p12-r2.ebuild,v 1.2 2008/02/24 16:16:59 swegener Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-gui-tools/mysql-gui-tools-5.0_p12-r2.ebuild,v 1.3 2008/04/11 18:38:28 swegener Exp $ GCONF_DEBUG="no" @@ -63,6 +63,7 @@ src_unpack() { epatch "${FILESDIR}"/${PN}-5.0_p8-lua-modules.patch epatch "${FILESDIR}"/${P}-workbench-lua.patch epatch "${FILESDIR}"/${P}-query-browser-sps.patch + epatch "${FILESDIR}"/${P}-libsigc++-2.2.patch sed -i \ -e "s/\\(^\\|[[:space:]]\\)-ltermcap\\($\\|[[:space:]]\\)/ /g" \ |