graaff 15/02/15 15:57:33
Added: mysql-workbench-6.2.3-paramiko.patch
mysql-workbench-6.2.3-glib.patch
Log:
Backport patches for bug 536024 (glibc 2.42 compatibility) and bug 530000
(paramiko compatability).
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key
0x8883FA56A308A8D7!)
Revision Changes Path
1.1
dev-db/mysql-workbench/files/mysql-workbench-6.2.3-paramiko.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mysql-workbench/files/mysql-workbench-6.2.3-paramiko.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mysql-workbench/files/mysql-workbench-6.2.3-paramiko.patch?rev=1.1&content-type=text/plain
Index: mysql-workbench-6.2.3-paramiko.patch
===================================================================
Last-Update: 2014-10-07
Forwarded: not-needed
From: Alfredo Kojima
Bug-Upstream: http://bugs.mysql.com/bug.php?id=74223
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=763971
Description: fix connectivity through SSH tunnel.
=== modified file 'plugins/wb.admin/backend/wb_admin_ssh.py'
--- a/plugins/wb.admin/backend/wb_admin_ssh.py
+++ b/plugins/wb.admin/backend/wb_admin_ssh.py
@@ -84,10 +84,14 @@
m = Message()
m.add_byte(chr(MSG_CHANNEL_OPEN))
m.add_string(kind)
m.add_int(chanid)
- m.add_int(self.window_size)
- m.add_int(self.max_packet_size)
+ if server_version_str2tuple(paramiko.__version__) < (1, 15, 0):
+ m.add_int(self.window_size)
+ m.add_int(self.max_packet_size)
+ else:
+ m.add_int(self.default_window_size)
+ m.add_int(self.default_max_packet_size)
if (kind == 'forwarded-tcpip') or (kind == 'direct-tcpip'):
m.add_string(dest_addr[0])
m.add_int(dest_addr[1])
m.add_string(src_addr[0])
@@ -99,9 +103,12 @@
self._channels.put(chanid, chan)
self.channel_events[chanid] = event = threading.Event()
self.channels_seen[chanid] = True
chan._set_transport(self)
- chan._set_window(self.window_size, self.max_packet_size)
+ if server_version_str2tuple(paramiko.__version__) < (1, 15, 0):
+ chan._set_window(self.window_size, self.max_packet_size)
+ else:
+ chan._set_window(self.default_window_size,
self.default_max_packet_size)
finally:
self.lock.release()
self._send_user_message(m)
ts = time.time() + OPEN_CHANNEL_TIMEOUT if (timeout is None) else
timeout
@@ -669,8 +676,9 @@
read_timeout = 10
if self.client is not None:
+ chan = None
transport = self.client.get_transport()
try:
spawn_process = False
if 'nohup' in cmd:
1.1
dev-db/mysql-workbench/files/mysql-workbench-6.2.3-glib.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mysql-workbench/files/mysql-workbench-6.2.3-glib.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mysql-workbench/files/mysql-workbench-6.2.3-glib.patch?rev=1.1&content-type=text/plain
Index: mysql-workbench-6.2.3-glib.patch
===================================================================
Patch to make the query results window work with glib 2.42.
https://bugs.gentoo.org/show_bug.cgi?id=536024
http://bugs.mysql.com/bug.php?id=74147
=== modified file frontend/linux/linux_utilities/listmodel_wrapper.cpp
--- frontend/linux/linux_utilities/listmodel_wrapper.cpp 2014-03-17
16:42:25 +0000
+++ frontend/linux/linux_utilities/listmodel_wrapper.cpp 2014-10-16
10:33:12 +0000
@@ -528,7 +528,6 @@
ListModelWrapper::ListModelWrapper(bec::ListModel* tm, Gtk::TreeView
*treeview, const std::string& name)
: Glib::ObjectBase(typeid(ListModelWrapper))
, Glib::Object()
- , Gtk::TreeModel()
, _treeview(treeview)
, _iconview(0)
, _context_menu(0)
=== modified file frontend/linux/linux_utilities/listmodel_wrapper.h
--- frontend/linux/linux_utilities/listmodel_wrapper.h 2013-12-05 13:10:03
+0000
+++ frontend/linux/linux_utilities/listmodel_wrapper.h 2014-10-16 10:33:12
+0000
@@ -232,9 +232,16 @@
//==============================================================================
-class ListModelWrapper : public Glib::Object, public Gtk::TreeModel,
- public Gtk::TreeDragDest, public Gtk::TreeDragSource,
- public base::trackable
+#if GLIB_CHECK_VERSION(2, 42, 0)
+class ListModelWrapper : public Gtk::TreeModel, public Glib::Object,
+ public Gtk::TreeDragDest, public Gtk::TreeDragSource,
+ public base::trackable
+#else
+class ListModelWrapper : public Glib::Object, public Gtk::TreeModel,
+ public Gtk::TreeDragDest, public Gtk::TreeDragSource,
+ public base::trackable
+
+#endif
{
friend class ColumnsModel;
protected:
