diff options
author | Christoph Brill <egore911@egore911.de> | 2011-06-07 21:17:23 +0200 |
---|---|---|
committer | Christoph Brill <egore911@egore911.de> | 2011-06-07 21:17:23 +0200 |
commit | 200ea3a8854f83cbd4a9199f4307fb7776152e3c (patch) | |
tree | 5ef1502d48b219257fb8f64d5e25bb20123558a7 | |
parent | d911002a3039f0ccb89678d578d0f0c11980500a (diff) |
Drop mysql-gui-tools, they are deprecated
11 files changed, 0 insertions, 619 deletions
diff --git a/dev-db/mysql-gui-tools/ChangeLog b/dev-db/mysql-gui-tools/ChangeLog deleted file mode 100644 index e0c19ba..0000000 --- a/dev-db/mysql-gui-tools/ChangeLog +++ /dev/null @@ -1,9 +0,0 @@ -# ChangeLog for dev-db/mysql-gui-tools -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: $ - -*mysql-gui-tools-5.0_p14 (31 Dec 2009) - - 31 Dec 2009; Christoph Brill <egore911@egore911.de> - mysql-gui-tools-5.0_p14.ebuild : - Initial import. Ebuild taken from portage and bumped to the latest version. diff --git a/dev-db/mysql-gui-tools/Manifest b/dev-db/mysql-gui-tools/Manifest deleted file mode 100644 index 787e279..0000000 --- a/dev-db/mysql-gui-tools/Manifest +++ /dev/null @@ -1,11 +0,0 @@ -AUX mysql-gui-tools-5.0_p14-deprecated-gtk+-api.patch 4988 RMD160 ff1424cfe99edf3536b5cc53da6c5bde662085e3 SHA1 3d7420c5687a559f746d56ae0a57e98a5d4784da SHA256 b763afd1a11ab57bff3bbdff130de4c7e5d8b055ae74a4fe987906299a126b8f -AUX mysql-gui-tools-5.0_p14-gcc-4.3.patch 2374 RMD160 ee2038ef5a6ab8534512f8b23fb64d5f08562d00 SHA1 9646afee510b9548897a4d4537dac8969daf435b SHA256 ebea22a1da29ebb580eb6933d8b4c07fbd924ee733a94db52c12ec1649ebfa23 -AUX mysql-gui-tools-5.0_p14-libsigc++-2.2.patch 10283 RMD160 209d398bfec2eeb5ddbf65bf5d4615ea48d9c30e SHA1 f3534e5cabbd02c7ff8d01927b4764757d2d151f SHA256 ef98d5c4631ad8d524d5b9d01f2256370b0862b3c137834415083a5fed8d5873 -AUX mysql-gui-tools-5.0_p14-lua-modules.patch 575 RMD160 731aaf92eaa3927e679b4fdca775761c4ce0cb72 SHA1 f43853f77db444312893a148efe76e9c6ad473ee SHA256 d4ccab013432613e11d4226db3c71d2f6c0ba396f3b43615e72e1fc2de86e797 -AUX mysql-gui-tools-5.0_p14-path-insanity.patch 1730 RMD160 e8987a04fdadc99e2b77e76a2c97a0e3d671f22e SHA1 8ccb1a34402a8f0cb1f33856d04f32aed0574052 SHA256 9fa7c7df8c379b768405720dd2ffed54861a113e3a45fbcc8a2c07058a3f363d -AUX mysql-gui-tools-5.0_p14-query-browser-sps.patch 345 RMD160 27451d1a36e4ba121beb888f66e49b396aaa0b00 SHA1 8191d5fdf847f1392b23fd86b6692725c8c06fe9 SHA256 29354502f6ab712e55d394c24b5d927893a5d2eb8c25bce7cc6d533d8c29fab8 -AUX mysql-gui-tools-5.0_p14-weird-chars.patch 526 RMD160 5f6a7331ad9bcdabe98a66697e44428883c44dfa SHA1 c172bbaaf5d894fd7a606a8db3a7c95bd4b4eb99 SHA256 38a06bc6dbda64d03d9e9c41f0d760394b75f41ecdabd6d66e7be6588870c2c4 -DIST mysql-gui-tools-5.0r14.tar.gz 24897382 RMD160 45649a3dadc10bf9ab49aaf5226f0dd3538a1f40 SHA1 080964818d24dd857c2e36041756f2647dc2d9ad SHA256 95e594754ffeb509f8fa1e3c392ee23308d0f4abe7ff6d311a72b0df16b300b9 -EBUILD mysql-gui-tools-5.0_p14.ebuild 3660 RMD160 1604983921b6967b50848213dd574d8b0df3fff4 SHA1 e4d0e57038dc539e5f4a852019dce3b9e85a4a92 SHA256 47750fb13725f051b90a3d8c7e5356bdc9232e8c32ae292a1eddde0944af62a3 -MISC ChangeLog 330 RMD160 a87434e69a42944ba75a20b52fe8b4fb98aaa38c SHA1 70f0252ba82c3f0dcf698f690ce6291a2a04d952 SHA256 9f83ae92a0359a4b9a0d54c48e5b11ba7932433d4db60bb04800b7780c49a803 -MISC metadata.xml 225 RMD160 4c506d7c9b24eec779d50ce5ede69834a7f6178a SHA1 a318096995ed1f48d6657e4b08a13371852b12de SHA256 4e2111c4227c34a36c3477bb355a39b8716e982e6ccdb67df1359a3a5f25d655 diff --git a/dev-db/mysql-gui-tools/files/mysql-gui-tools-5.0_p14-deprecated-gtk+-api.patch b/dev-db/mysql-gui-tools/files/mysql-gui-tools-5.0_p14-deprecated-gtk+-api.patch deleted file mode 100644 index 8aa0306..0000000 --- a/dev-db/mysql-gui-tools/files/mysql-gui-tools-5.0_p14-deprecated-gtk+-api.patch +++ /dev/null @@ -1,59 +0,0 @@ -diff --git a/query-browser/source/linux/gtksourceview/gtksourceview/gtksourcelanguage.h b/query-browser/source/linux/gtksourceview/gtksourceview/gtksourcelanguage.h -index e757a11..1fd36c1 100755 ---- a/query-browser/source/linux/gtksourceview/gtksourceview/gtksourcelanguage.h -+++ b/query-browser/source/linux/gtksourceview/gtksourceview/gtksourcelanguage.h -@@ -30,10 +30,10 @@ - G_BEGIN_DECLS
-
- #define GTK_TYPE_SOURCE_LANGUAGE (gtk_source_language_get_type ())
--#define GTK_SOURCE_LANGUAGE(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_SOURCE_LANGUAGE, GtkSourceLanguage))
--#define GTK_SOURCE_LANGUAGE_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_SOURCE_LANGUAGE, GtkSourceLanguageClass))
--#define GTK_IS_SOURCE_LANGUAGE(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_SOURCE_LANGUAGE))
--#define GTK_IS_SOURCE_LANGUAGE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SOURCE_LANGUAGE))
-+#define GTK_SOURCE_LANGUAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SOURCE_LANGUAGE, GtkSourceLanguage))
-+#define GTK_SOURCE_LANGUAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SOURCE_LANGUAGE, GtkSourceLanguageClass))
-+#define GTK_IS_SOURCE_LANGUAGE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SOURCE_LANGUAGE))
-+#define GTK_IS_SOURCE_LANGUAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SOURCE_LANGUAGE))
- #define GTK_SOURCE_LANGUAGE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_SOURCE_LANGUAGE, GtkSourceLanguageClass))
-
-
-diff --git a/query-browser/source/linux/gtksourceview/gtksourceview/gtksourcelanguagesmanager.h b/query-browser/source/linux/gtksourceview/gtksourceview/gtksourcelanguagesmanager.h -index 61e9033..b0e27ed 100755 ---- a/query-browser/source/linux/gtksourceview/gtksourceview/gtksourcelanguagesmanager.h -+++ b/query-browser/source/linux/gtksourceview/gtksourceview/gtksourcelanguagesmanager.h -@@ -27,10 +27,10 @@ - G_BEGIN_DECLS
-
- #define GTK_TYPE_SOURCE_LANGUAGES_MANAGER (gtk_source_languages_manager_get_type ())
--#define GTK_SOURCE_LANGUAGES_MANAGER(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_SOURCE_LANGUAGES_MANAGER, GtkSourceLanguagesManager))
--#define GTK_SOURCE_LANGUAGES_MANAGER_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_SOURCE_LANGUAGES_MANAGER, GtkSourceLanguagesManagerClass))
--#define GTK_IS_SOURCE_LANGUAGES_MANAGER(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_SOURCE_LANGUAGES_MANAGER))
--#define GTK_IS_SOURCE_LANGUAGES_MANAGER_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SOURCE_LANGUAGES_MANAGER))
-+#define GTK_SOURCE_LANGUAGES_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SOURCE_LANGUAGES_MANAGER, GtkSourceLanguagesManager))
-+#define GTK_SOURCE_LANGUAGES_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SOURCE_LANGUAGES_MANAGER, GtkSourceLanguagesManagerClass))
-+#define GTK_IS_SOURCE_LANGUAGES_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SOURCE_LANGUAGES_MANAGER))
-+#define GTK_IS_SOURCE_LANGUAGES_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SOURCE_LANGUAGES_MANAGER))
-
-
- typedef struct _GtkSourceLanguagesManager GtkSourceLanguagesManager;
-diff --git a/query-browser/source/linux/gtksourceview/gtksourceview/gtksourceundomanager.h b/query-browser/source/linux/gtksourceview/gtksourceview/gtksourceundomanager.h -index 4b968c7..01a9117 100755 ---- a/query-browser/source/linux/gtksourceview/gtksourceview/gtksourceundomanager.h -+++ b/query-browser/source/linux/gtksourceview/gtksourceview/gtksourceundomanager.h -@@ -29,11 +29,11 @@ - #include <gtk/gtktextbuffer.h>
-
- #define GTK_SOURCE_TYPE_UNDO_MANAGER (gtk_source_undo_manager_get_type ())
--#define GTK_SOURCE_UNDO_MANAGER(obj) (GTK_CHECK_CAST ((obj), GTK_SOURCE_TYPE_UNDO_MANAGER, GtkSourceUndoManager))
--#define GTK_SOURCE_UNDO_MANAGER_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_SOURCE_TYPE_UNDO_MANAGER, GtkSourceUndoManagerClass))
--#define GTK_SOURCE_IS_UNDO_MANAGER(obj) (GTK_CHECK_TYPE ((obj), GTK_SOURCE_TYPE_UNDO_MANAGER))
--#define GTK_SOURCE_IS_UNDO_MANAGER_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_SOURCE_TYPE_UNDO_MANAGER))
--#define GTK_SOURCE_UNDO_MANAGER_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_SOURCE_TYPE_UNDO_MANAGER, GtkSourceUndoManagerClass))
-+#define GTK_SOURCE_UNDO_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_SOURCE_TYPE_UNDO_MANAGER, GtkSourceUndoManager))
-+#define GTK_SOURCE_UNDO_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_SOURCE_TYPE_UNDO_MANAGER, GtkSourceUndoManagerClass))
-+#define GTK_SOURCE_IS_UNDO_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_SOURCE_TYPE_UNDO_MANAGER))
-+#define GTK_SOURCE_IS_UNDO_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_SOURCE_TYPE_UNDO_MANAGER))
-+#define GTK_SOURCE_UNDO_MANAGER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_SOURCE_TYPE_UNDO_MANAGER, GtkSourceUndoManagerClass))
-
-
- typedef struct _GtkSourceUndoManager GtkSourceUndoManager;
diff --git a/dev-db/mysql-gui-tools/files/mysql-gui-tools-5.0_p14-gcc-4.3.patch b/dev-db/mysql-gui-tools/files/mysql-gui-tools-5.0_p14-gcc-4.3.patch deleted file mode 100644 index 5def31c..0000000 --- a/dev-db/mysql-gui-tools/files/mysql-gui-tools-5.0_p14-gcc-4.3.patch +++ /dev/null @@ -1,64 +0,0 @@ -diff --git a/common/library/grt-wb-controller/source/GraphRenderer.cpp b/common/library/grt-wb-controller/source/GraphRenderer.cpp -index e63fb40..1d415de 100755 ---- a/common/library/grt-wb-controller/source/GraphRenderer.cpp -+++ b/common/library/grt-wb-controller/source/GraphRenderer.cpp -@@ -2,6 +2,7 @@ - //#include <windows.h>
- //#endif
- #include "GraphRenderer.h"
-+#include <climits>
-
- #ifdef __GNUC__
- const int GraphRenderer::K1F;
-diff --git a/common/source/linux/MGFileBrowserList.cc b/common/source/linux/MGFileBrowserList.cc -index 6824cbd..c25a412 100755 ---- a/common/source/linux/MGFileBrowserList.cc -+++ b/common/source/linux/MGFileBrowserList.cc -@@ -20,6 +20,7 @@ - #include <unistd.h>
- #include <sys/stat.h>
- #include <errno.h>
-+#include <string.h>
- #include <stdio.h> /* rename() in FreeBSD */
-
-
-diff --git a/common/source/linux/MGHMeterGraphPlotter.cc b/common/source/linux/MGHMeterGraphPlotter.cc -index be57691..cf0c2aa 100755 ---- a/common/source/linux/MGHMeterGraphPlotter.cc -+++ b/common/source/linux/MGHMeterGraphPlotter.cc -@@ -16,6 +16,7 @@ -
-
- #include "MGHMeterGraphPlotter.h"
-+#include <string.h>
-
-
-
-diff --git a/common/source/linux/MySQLGRT/MGRTValueTree.h b/common/source/linux/MySQLGRT/MGRTValueTree.h -index c71cf86..beb6537 100755 ---- a/common/source/linux/MySQLGRT/MGRTValueTree.h -+++ b/common/source/linux/MySQLGRT/MGRTValueTree.h -@@ -50,7 +50,7 @@ class MGRTValueTree : public Gtk::TreeView { - void set_icon(Gtk::TreeRow row, MGRTValue value); - void add_value_item(Gtk::TreeIter iter, MGRTValue value); - -- void add_list_to_store(MGRTValue list, Gtk::TreeRow *parent, std::list<MYX_GRT_VALUE*> *list); -+ void add_list_to_store(MGRTValue list, Gtk::TreeRow *parent, std::list<MYX_GRT_VALUE*> *expanded_list); - void add_dict_to_store(MGRTValue dict, Gtk::TreeRow &parent, std::list<MYX_GRT_VALUE*> *list); - - void remember_path(Gtk::TreeView *tree, const Gtk::TreeModel::Path &path, std::list<MYX_GRT_VALUE*> &list); -diff --git a/query-browser/source/linux/MGCodeEditor.cc b/query-browser/source/linux/MGCodeEditor.cc -index ac7f92d..3fe21ab 100755 ---- a/query-browser/source/linux/MGCodeEditor.cc -+++ b/query-browser/source/linux/MGCodeEditor.cc -@@ -16,6 +16,7 @@ -
- #include "MGCodeEditor.h"
-
-+#include <string.h>
- #include <gtksourceview/gtksourcelanguagesmanager.h>
-
-
--- -1.6.3.1 - diff --git a/dev-db/mysql-gui-tools/files/mysql-gui-tools-5.0_p14-libsigc++-2.2.patch b/dev-db/mysql-gui-tools/files/mysql-gui-tools-5.0_p14-libsigc++-2.2.patch deleted file mode 100644 index 9472bd1..0000000 --- a/dev-db/mysql-gui-tools/files/mysql-gui-tools-5.0_p14-libsigc++-2.2.patch +++ /dev/null @@ -1,212 +0,0 @@ -diff --git a/administrator/source/linux/MABackupPanel.cc b/administrator/source/linux/MABackupPanel.cc -index 2c1bf10..8913f63 100755 ---- a/administrator/source/linux/MABackupPanel.cc -+++ b/administrator/source/linux/MABackupPanel.cc -@@ -1282,7 +1282,7 @@ void MABackupPanel::perform_backup() - - 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(); -diff --git a/administrator/source/linux/MACatalogsPanel.cc b/administrator/source/linux/MACatalogsPanel.cc -index 91957a6..93915b5 100755 ---- a/administrator/source/linux/MACatalogsPanel.cc -+++ b/administrator/source/linux/MACatalogsPanel.cc -@@ -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,
-diff --git a/administrator/source/linux/MARestorePanel.cc b/administrator/source/linux/MARestorePanel.cc -index 708cadd..ef59e33 100755 ---- a/administrator/source/linux/MARestorePanel.cc -+++ b/administrator/source/linux/MARestorePanel.cc -@@ -728,7 +728,7 @@ MYX_BACKUP_CONTENT *MARestorePanel::perform_load(const std::string &file, - 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 @@ void MARestorePanel::perform_restore() - //{ - 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); - -diff --git a/administrator/source/linux/MAServerConnectionsPanel.h b/administrator/source/linux/MAServerConnectionsPanel.h -index 5e28c75..48a54b4 100755 ---- a/administrator/source/linux/MAServerConnectionsPanel.h -+++ b/administrator/source/linux/MAServerConnectionsPanel.h -@@ -87,7 +87,7 @@ class MAServerConnectionsPanel : public MAPanel { -
- Glib::RefPtr<Gdk::Pixbuf> _thread_icon;
-
-- SigC::Connection _timer;
-+ sigc::connection _timer;
-
- int _current_page;
-
-diff --git a/administrator/source/linux/MAdministrator.h b/administrator/source/linux/MAdministrator.h -index 33086b9..3f87ab8 100755 ---- a/administrator/source/linux/MAdministrator.h -+++ b/administrator/source/linux/MAdministrator.h -@@ -66,7 +66,7 @@ class MAdministrator : public Glib::ObjectBase { -
- sigc::signal0<void> _signal_prefs_changed;
-
-- SigC::Connection _pulse_conn;
-+ sigc::connection _pulse_conn;
- bool pulse_progress();
-
- void setup_sidebar();
-diff --git a/common/source/linux/MGConnectDialog.cc b/common/source/linux/MGConnectDialog.cc -index 3168fbe..30ebded 100755 ---- a/common/source/linux/MGConnectDialog.cc -+++ b/common/source/linux/MGConnectDialog.cc -@@ -659,9 +659,9 @@ void MGConnectDialog::open_connection_editor() - // 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_failed() - {
- Gtk::Button *btn;
- pid_t ping_pid= 0;
-- SigC::Connection input_handler;
-+ sigc::connection input_handler;
- int rc;
- bool pinging= false;
- int myerror= 0;
-diff --git a/common/source/linux/MGTreeTooltip.h b/common/source/linux/MGTreeTooltip.h -index 2f3158b..a8c5053 100755 ---- a/common/source/linux/MGTreeTooltip.h -+++ b/common/source/linux/MGTreeTooltip.h -@@ -39,7 +39,7 @@ class MGTreeTooltip : public Glib::Object { -
- WillShowSignal _show_signal;
-
-- SigC::Connection _timeout;
-+ sigc::connection _timeout;
-
- void expose_event(GdkEventExpose *event);
- void leave_event(GdkEventCrossing *event);
-diff --git a/migration-tool/source/linux/GRTEnvironment.cc b/migration-tool/source/linux/GRTEnvironment.cc -index 4a4b57d..7adac97 100755 ---- a/migration-tool/source/linux/GRTEnvironment.cc -+++ b/migration-tool/source/linux/GRTEnvironment.cc -@@ -76,7 +76,7 @@ int GRTEnvironment::update_objects() - }
-
-
--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;
-
-diff --git a/migration-tool/source/linux/GRTEnvironment.h b/migration-tool/source/linux/GRTEnvironment.h -index b22bef8..6daa8c8 100755 ---- a/migration-tool/source/linux/GRTEnvironment.h -+++ b/migration-tool/source/linux/GRTEnvironment.h -@@ -28,7 +28,7 @@ class GRTEnvironment { - 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 @@ class GRTEnvironment { - 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);
-diff --git a/migration-tool/source/linux/ObjectShell.cc b/migration-tool/source/linux/ObjectShell.cc -index 7b5e8c8..d43b906 100755 ---- a/migration-tool/source/linux/ObjectShell.cc -+++ b/migration-tool/source/linux/ObjectShell.cc -@@ -45,7 +45,7 @@ ObjectShell::ObjectShell(GRTEnvironment *env) -
- 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 @@ ObjectShell::ObjectShell(GRTEnvironment *env) -
- 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();
- }
-diff --git a/query-browser/source/linux/MQResultTab.h b/query-browser/source/linux/MQResultTab.h -index fdcc904..b615001 100755 ---- a/query-browser/source/linux/MQResultTab.h -+++ b/query-browser/source/linux/MQResultTab.h -@@ -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);
diff --git a/dev-db/mysql-gui-tools/files/mysql-gui-tools-5.0_p14-lua-modules.patch b/dev-db/mysql-gui-tools/files/mysql-gui-tools-5.0_p14-lua-modules.patch deleted file mode 100644 index 06a1a7c..0000000 --- a/dev-db/mysql-gui-tools/files/mysql-gui-tools-5.0_p14-lua-modules.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- common/source/linux/MySQLGRT/MGRT.cc.org 2006-09-06 00:04:50.000000000 +0200 -+++ common/source/linux/MySQLGRT/MGRT.cc 2009-06-02 11:02:06.000000000 +0200 -@@ -284,6 +284,7 @@ - flush_messages(); - #endif - -+#ifdef ENABLE_LUA_MODULES - // lua modules - out_text("Loading Lua modules..."); - loader= myx_lua_init_loader(_grt, &error, std::string(resourcePath+"/lua").c_str()); -@@ -303,6 +304,7 @@ - else - out_text(ufmt("Error initializing Lua module loader (%i)\n",error)); - flush_messages(); -+#endif - - // builtin c++ - out_text("Initializing C++ loader..."); diff --git a/dev-db/mysql-gui-tools/files/mysql-gui-tools-5.0_p14-path-insanity.patch b/dev-db/mysql-gui-tools/files/mysql-gui-tools-5.0_p14-path-insanity.patch deleted file mode 100644 index e2e91fa..0000000 --- a/dev-db/mysql-gui-tools/files/mysql-gui-tools-5.0_p14-path-insanity.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/administrator/configure.in b/administrator/configure.in -index 43aa98b..e2ccd54 100755 ---- a/administrator/configure.in -+++ b/administrator/configure.in -@@ -19,10 +19,10 @@ AC_CHECK_PROG(PKG_CONFIG, pkg-config) - # - # internal libraries - # --AC_CHECK_FILE(../mysql-gui-common/library/base-library, [], -+AC_CHECK_FILE(../common/library/base-library, [], - AC_MSG_ERROR([mysql-gui-common source tree must be present in the same directory as this program])) - --#AC_CHECK_FILE(../mysql-gui-common/source/linux/libmacommongui.a, [], -+#AC_CHECK_FILE(../common/source/linux/libmacommongui.a, [], - # AC_MSG_ERROR([mysql-gui-common source tree must be compiled and present in the same directory as this program])) - - -diff --git a/query-browser/configure.in b/query-browser/configure.in -index 00be966..74ebe4c 100755 ---- a/query-browser/configure.in -+++ b/query-browser/configure.in -@@ -17,11 +17,11 @@ AC_CHECK_TOOL(PKG_CONFIG, pkg-config) - # - # internal libraries - # --AC_CHECK_FILE(../mysql-gui-common/library/base-library/include, -- [MYSQLA_INCLUDE='-I$(top_srcdir)/../mysql-gui-common/library/base-library/include -I$(top_srcdir)/../mysql-gui-common/source/linux'], -+AC_CHECK_FILE(../common/library/base-library/include, -+ [MYSQLA_INCLUDE='-I$(top_srcdir)/../common/library/base-library/include -I$(top_srcdir)/../common/source/linux'], - AC_MSG_ERROR([mysql-gui-common source tree must be present in the same directory as this program])) - --#AC_CHECK_FILE(../mysql-gui-common/source/linux/libqbcommongui.a, [], -+#AC_CHECK_FILE(../common/source/linux/libqbcommongui.a, [], - # AC_MSG_ERROR([mysql-gui-common source tree must be compiled and present in the same directory as this program])) - - diff --git a/dev-db/mysql-gui-tools/files/mysql-gui-tools-5.0_p14-query-browser-sps.patch b/dev-db/mysql-gui-tools/files/mysql-gui-tools-5.0_p14-query-browser-sps.patch deleted file mode 100644 index c1ebb69..0000000 --- a/dev-db/mysql-gui-tools/files/mysql-gui-tools-5.0_p14-query-browser-sps.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- query-browser/source/linux/MQQueryDispatcher.cc.org 2007-04-27 15:11:32.000000000 +0200 -+++ query-browser/source/linux/MQQueryDispatcher.cc 2009-06-02 11:04:09.000000000 +0200 -@@ -558,8 +558,8 @@ -
- Gtk::Main::instance()->run();
-
-- while(!req->is_complete())
-- ;
-+// while(!req->is_complete())
-+// ;
-
- return sps;
- }
diff --git a/dev-db/mysql-gui-tools/files/mysql-gui-tools-5.0_p14-weird-chars.patch b/dev-db/mysql-gui-tools/files/mysql-gui-tools-5.0_p14-weird-chars.patch deleted file mode 100644 index 8df5870..0000000 --- a/dev-db/mysql-gui-tools/files/mysql-gui-tools-5.0_p14-weird-chars.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/common/library/base-library/source/myx_database_model.c b/common/library/base-library/source/myx_database_model.c -old mode 100755 -new mode 100644 -index e909ad8..bbb4b11 ---- a/common/library/base-library/source/myx_database_model.c -+++ b/common/library/base-library/source/myx_database_model.c -@@ -1,4 +1,4 @@ --// Copyright (C) 2003 - 2008 MySQL AB, 2008 Sun Microsystems, Inc.
-+// Copyright (C) 2003 - 2008 MySQL AB, 2008 Sun Microsystems, Inc.
-
- #include "myx_public_interface.h"
- #include "myx_util.h"
diff --git a/dev-db/mysql-gui-tools/metadata.xml b/dev-db/mysql-gui-tools/metadata.xml deleted file mode 100644 index 3154a6a..0000000 --- a/dev-db/mysql-gui-tools/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<herd>no-herd</herd> -<maintainer> - <email>egore911@egore911.de</email> -</maintainer> -</pkgmetadata> diff --git a/dev-db/mysql-gui-tools/mysql-gui-tools-5.0_p14.ebuild b/dev-db/mysql-gui-tools/mysql-gui-tools-5.0_p14.ebuild deleted file mode 100644 index ea3b693..0000000 --- a/dev-db/mysql-gui-tools/mysql-gui-tools-5.0_p14.ebuild +++ /dev/null @@ -1,177 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -GCONF_DEBUG="no" -EAPI="1" - -inherit autotools gnome2 java-pkg-2 eutils flag-o-matic - -MY_P="${P/_p/r}" - -DESCRIPTION="MySQL GUI Tools" -HOMEPAGE="http://www.mysql.com/products/tools/" -SRC_URI="mirror://mysql/Downloads/MySQLGUITools/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64" -IUSE="nls +administrator +query-browser gtk python fastcgi readline -canvas" -# TODO: java lua" - -RDEPEND=">=x11-libs/gtk+-2.6 - >=dev-libs/glib-2.6 - >=dev-libs/libsigc++-2.0 - >=dev-libs/libpcre-4.4 - >=dev-libs/libxml2-2.6.2 - >=dev-cpp/glibmm-2.14 - gtk? ( - >=gnome-base/libglade-2.5 - dev-cpp/gtkmm:2.4 - ) - php? ( - >=dev-lang/php-5.2 - ) - python? ( - >=dev-lang/python-2.6 - ) - fastcgi? ( - virtual/httpd-fastcgi - ) - readline? ( - sys-libs/readline - ) - canvas? ( - virtual/opengl - media-libs/freetype - ) - >=virtual/mysql-5.0 - query-browser? ( - gnome-extra/gtkhtml:3.14 - gnome-base/libgnomeprint:2.2 - )" -#java? ( -# virtual/jre -#) -#lua? ( -# >=dev-lang/lua-5.1 -#) -DEPEND="${RDEPEND} - >=dev-util/pkgconfig-0.15 - >=app-text/scrollkeeper-0.3.11" -#java? ( -# virtual/jdk -#) -RDEPEND="${RDEPEND} - !dev-db/mysql-administrator - !dev-db/mysql-query-browser" - -S="${WORKDIR}"/${MY_P} - -pkg_setup() { - if ! use administrator && ! use query-browser - then - elog "Please activate at least one of the following USE flags:" - elog "- administrator for MySQL Administrator" - elog "- query-browser for MySQL Query Browser" - die "Please activate at least one of the following USE flags: administrator, query-browser" - fi - - # Needed for gcc-4.3 - append-cppflags -D_GNU_SOURCE -} - -src_unpack() { - gnome2_src_unpack - cd "${S}" - - epatch \ - "${FILESDIR}"/${P}-path-insanity.patch \ - "${FILESDIR}"/${P}-weird-chars.patch \ - "${FILESDIR}"/${P}-lua-modules.patch \ - "${FILESDIR}"/${P}-query-browser-sps.patch \ - "${FILESDIR}"/${P}-libsigc++-2.2.patch \ - "${FILESDIR}"/${P}-gcc-4.3.patch \ - "${FILESDIR}"/${P}-deprecated-gtk+-api.patch - - sed -i \ - -e "s/\\(^\\|[[:space:]]\\)-ltermcap\\($\\|[[:space:]]\\)/ /g" \ - common/tools/grtsh/Makefile.am \ - || die "could not fix termcap inclusion" - - find "${S}" \ - \( -name "Makefile.am" -o -name "Makefile.in.in" \) \ - -exec \ - sed -i -e "s:../mysql-gui-common/:../common/:g" {} \; \ - || die "failed cleaning up path mess" - - cd "${S}"/common - use nls || sed -i -e "/^SUBDIRS = / s/\\bpo\\b//" Makefile.am - eautoreconf - - if use administrator - then - cd "${S}"/administrator - use nls || sed -i -e "/^SUBDIRS = / s/\\bpo\\b//" Makefile.am - eautoreconf - fi - - if use query-browser - then - cd "${S}"/query-browser - use nls || sed -i -e "/^SUBDIRS=/ s/\\bpo\\b//" Makefile.am - eautoreconf - # Fix missing file - cp "${S}"/common/mkinstalldirs . - fi -} - -src_compile() { - # mysql has -fno-exceptions, but we need exceptions - append-flags -fexceptions - - cd "${S}"/common - gnome2_src_compile \ - $(use_enable nls i18n) \ - $(use_enable gtk) \ - $(use_enable php php-modules) \ - $(use_enable python python-modules) \ - $(use_enable fastcgi) \ - $(use_enable readline) \ - $(use_enable canvas) \ - --disable-java-modules \ - --disable-grt - -# $(use_enable java java-modules) \ -# $(use_enable lua grt) \ - - if use administrator - then - cd "${S}"/administrator - gnome2_src_compile $(use_enable nls i18n) - fi - - if use query-browser - then - cd "${S}"/query-browser - gnome2_src_compile --with-gtkhtml=libgtkhtml-3.14 - fi -} - -src_install() { - cd "${S}"/common - gnome2_src_install - - if use administrator - then - cd "${S}"/administrator - gnome2_src_install - fi - - if use query-browser - then - cd "${S}"/query-browser - gnome2_src_install - fi -} |