Remove ports BROKEN for more than 6 months

devel/simian
databases/mysql-gui-tools

Approved by:	gahr (maintainer)

16 files changed, 0 insertions, 326 deletions

diff --git a/databases/mysql-gui-tools/files/patch-administrator-source-linux_MABackupPanel.cc b/databases/mysql-gui-tools/files/patch-administrator-source-linux_MABackupPanel.cc
deleted file mode 100644
index 880eb723f3c3..000000000000
--- a/databases/mysql-gui-tools/files/patch-administrator-source-linux_MABackupPanel.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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<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/databases/mysql-gui-tools/files/patch-administrator-source-linux_MACatalogsPanel.cc b/databases/mysql-gui-tools/files/patch-administrator-source-linux_MACatalogsPanel.cc
deleted file mode 100644
index e57e6f53c9d7..000000000000
--- a/databases/mysql-gui-tools/files/patch-administrator-source-linux_MACatalogsPanel.cc
+++ /dev/null
@@ -1,29 +0,0 @@
---- 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,

diff --git a/databases/mysql-gui-tools/files/patch-administrator-source-linux_MARestorePanel.cc b/databases/mysql-gui-tools/files/patch-administrator-source-linux_MARestorePanel.cc
deleted file mode 100644
index 542ba5f7314a..000000000000
--- a/databases/mysql-gui-tools/files/patch-administrator-source-linux_MARestorePanel.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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<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);
- 
diff --git a/databases/mysql-gui-tools/files/patch-administrator-source-linux_MAServerConnectionsPanel.h b/databases/mysql-gui-tools/files/patch-administrator-source-linux_MAServerConnectionsPanel.h
deleted file mode 100644
index 51aa715df62e..000000000000
--- a/databases/mysql-gui-tools/files/patch-administrator-source-linux_MAServerConnectionsPanel.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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<Gdk::Pixbuf> _thread_icon;

- 

--    SigC::Connection _timer;

-+    sigc::connection _timer;

-     

-     int _current_page;

- 

diff --git a/databases/mysql-gui-tools/files/patch-administrator-source-linux_MAdministrator.h b/databases/mysql-gui-tools/files/patch-administrator-source-linux_MAdministrator.h
deleted file mode 100644
index fde28952a655..000000000000
--- a/databases/mysql-gui-tools/files/patch-administrator-source-linux_MAdministrator.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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<void> _signal_prefs_changed;

-     

--    SigC::Connection _pulse_conn;

-+    sigc::connection _pulse_conn;

-     bool pulse_progress();

-     

-     void setup_sidebar();

diff --git a/databases/mysql-gui-tools/files/patch-administrator-source-linux_MInstanceInfo.cc b/databases/mysql-gui-tools/files/patch-administrator-source-linux_MInstanceInfo.cc
deleted file mode 100644
index b3c0575c5eaf..000000000000
--- a/databases/mysql-gui-tools/files/patch-administrator-source-linux_MInstanceInfo.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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);

diff --git a/databases/mysql-gui-tools/files/patch-automatic_column_width b/databases/mysql-gui-tools/files/patch-automatic_column_width
deleted file mode 100644
index 450f792460ef..000000000000
--- a/databases/mysql-gui-tools/files/patch-automatic_column_width
+++ /dev/null
@@ -1,45 +0,0 @@
---- query-browser/source/linux/MQResultSetView.cc~	2007-04-27 14:46:09.000000000 +0200
-+++ query-browser/source/linux/MQResultSetView.cc	2009-01-04 20:59:03.000000000 +0100
-@@ -474,7 +474,29 @@
-                                 PIXCACHE->load("field_overlay_view.png"),

-                                 PIXCACHE->load("field_overlay_null.png"));

-         rend->set_blob_icon(PIXCACHE->load("blob_icon.png"));

--        rend->set_max_text_width(prefs.max_blob_length);

-+        if (prefs.max_blob_length == 0)

-+        {

-+          unsigned int w = 1;

-+          

-+          if (result->columns[i].column_type == MYX_RSCT_TEXT)

-+            for (unsigned int j = 0; j < result->rows_num; j++)

-+            {

-+              gchar *gcp;

-+              gssize nbytes = result->rows[j].fields[i].value_length;

-+

-+              if ((gcp = g_utf8_strchr(result->rows[j].fields[i].value,

-+                                       nbytes, g_utf8_get_char("\n"))) != NULL)

-+                nbytes = gcp - result->rows[j].fields[i].value;

-+              glong this_len = g_utf8_strlen(result->rows[j].fields[i].value, nbytes);

-+              if (this_len > w)

-+                w = this_len;

-+            }

-+          rend->set_max_text_width(w);

-+        }

-+        else

-+        {

-+          rend->set_max_text_width(prefs.max_blob_length);

-+        }

-         rend->property_column()= i;

-         rend->set_delegate(this);

- 

---- query-browser/res/linux/qb_preferences.glade~	2006-05-16 03:04:19.000000000 +0200
-+++ query-browser/res/linux/qb_preferences.glade	2009-01-02 19:14:04.000000000 +0100
-@@ -116,7 +116,8 @@
- 	<widget class="GtkLabel" id="label35">
- 	  <property name="visible">True</property>
- 	  <property name="label" translatable="yes">&lt;small&gt;BLOB/text columns in resultsets will be truncated
--to this size for display.&lt;/small&gt;</property>
-+to this size for display.  Value 0 means automatic
-+column width (i.e., width of largest value).&lt;/small&gt;</property>
- 	  <property name="use_underline">False</property>
- 	  <property name="use_markup">True</property>
- 	  <property name="justify">GTK_JUSTIFY_LEFT</property>
diff --git a/databases/mysql-gui-tools/files/patch-common-source-linux_MDispatcher.cc b/databases/mysql-gui-tools/files/patch-common-source-linux_MDispatcher.cc
deleted file mode 100644
index 00fc479df048..000000000000
--- a/databases/mysql-gui-tools/files/patch-common-source-linux_MDispatcher.cc
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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 <unistd.h>

- #include <mysql.h>

- 

--#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)

diff --git a/databases/mysql-gui-tools/files/patch-common-source-linux_MGConnectDialog.cc b/databases/mysql-gui-tools/files/patch-common-source-linux_MGConnectDialog.cc
deleted file mode 100644
index 2487c9a1780f..000000000000
--- a/databases/mysql-gui-tools/files/patch-common-source-linux_MGConnectDialog.cc
+++ /dev/null
@@ -1,24 +0,0 @@
---- 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;

-
diff --git a/databases/mysql-gui-tools/files/patch-common-source-linux_MGExecSU.cc b/databases/mysql-gui-tools/files/patch-common-source-linux_MGExecSU.cc
deleted file mode 100644
index 5ca17635cfc2..000000000000
--- a/databases/mysql-gui-tools/files/patch-common-source-linux_MGExecSU.cc
+++ /dev/null
@@ -1,18 +0,0 @@
---- 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 <sys/signal.h>
-+#include <sys/types.h>
-+#include <sys/ioctl.h>
- #include <sys/wait.h>
-+#include <signal.h>
- #include <stdio.h>
- #include <stdlib.h>
--#include <pty.h>
-+#include <termios.h>
-+#include <libutil.h>
- #include <fcntl.h>
- 
- 
diff --git a/databases/mysql-gui-tools/files/patch-common-source-linux_MGTreeTooltip.h b/databases/mysql-gui-tools/files/patch-common-source-linux_MGTreeTooltip.h
deleted file mode 100644
index 049bc1ed5e6b..000000000000
--- a/databases/mysql-gui-tools/files/patch-common-source-linux_MGTreeTooltip.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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);

diff --git a/databases/mysql-gui-tools/files/patch-query-browser-configure.in b/databases/mysql-gui-tools/files/patch-query-browser-configure.in
deleted file mode 100644
index 0d86b9fd38c3..000000000000
--- a/databases/mysql-gui-tools/files/patch-query-browser-configure.in
+++ /dev/null
@@ -1,21 +0,0 @@
---- query-browser/configure.in.orig	2009-09-27 23:40:34.000000000 +0200
-+++ query-browser/configure.in	2009-09-27 23:41:02.000000000 +0200
-@@ -66,7 +66,7 @@
-      gtkhtml=$withval, gtkhtml=libgtkhtml-3.0)
- 
- 
--PKG_CHECK_MODULES(GLIB, [glib-2.0 libxml-2.0 >= 2.6.2])
-+PKG_CHECK_MODULES(GLIB, [glib-2.0 libxml-2.0 >= 2.6.2 libgnome-2.0])
- AC_SUBST(GLIB_CFLAGS)
- AC_SUBST(GLIB_LIBS)
- 
-@@ -74,7 +74,8 @@
- 			gthread-2.0
- 			libxml-2.0 >= 2.6.2
-                         $gtkhtml
--                        gtkmm-2.4])
-+                        gtkmm-2.4
-+			libgnome-2.0])
- AC_SUBST(GNOME_CFLAGS)
- AC_SUBST(GNOME_LIBS)
- 
diff --git a/databases/mysql-gui-tools/files/patch-query-browser-source-linux_MGCodeEditor.cc b/databases/mysql-gui-tools/files/patch-query-browser-source-linux_MGCodeEditor.cc
deleted file mode 100644
index 69e2a91fa215..000000000000
--- a/databases/mysql-gui-tools/files/patch-query-browser-source-linux_MGCodeEditor.cc
+++ /dev/null
@@ -1,38 +0,0 @@
---- 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();

diff --git a/databases/mysql-gui-tools/files/patch-query-browser-source-linux_MQQueryDispatcher.cc b/databases/mysql-gui-tools/files/patch-query-browser-source-linux_MQQueryDispatcher.cc
deleted file mode 100644
index aae9361a3ac8..000000000000
--- a/databases/mysql-gui-tools/files/patch-query-browser-source-linux_MQQueryDispatcher.cc
+++ /dev/null
@@ -1,12 +0,0 @@
---- query-browser/source/linux/MQQueryDispatcher.cc.orig	2009-07-16 16:30:10.000000000 +0200
-+++ query-browser/source/linux/MQQueryDispatcher.cc	2009-07-16 16:33:04.000000000 +0200
-@@ -558,9 +558,6 @@
- 

-   Gtk::Main::instance()->run();

- 

--  while(!req->is_complete())

--    ;

--

-   return sps;

- }

- 

diff --git a/databases/mysql-gui-tools/files/patch-query-browser-source-linux_MQResultTab.h b/databases/mysql-gui-tools/files/patch-query-browser-source-linux_MQResultTab.h
deleted file mode 100644
index 8bed353a0464..000000000000
--- a/databases/mysql-gui-tools/files/patch-query-browser-source-linux_MQResultTab.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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);

diff --git a/databases/mysql-gui-tools/files/patch-query-browser-source-linux_Makefile.am b/databases/mysql-gui-tools/files/patch-query-browser-source-linux_Makefile.am
deleted file mode 100644
index d2cc820650f1..000000000000
--- a/databases/mysql-gui-tools/files/patch-query-browser-source-linux_Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
---- 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