From: Hans de Graaff Date: Sun, 15 Feb 2015 15:57:39 +0000 (+0000) Subject: Backport patches for bug 536024 (glibc 2.42 compatibility) and bug 530000 (paramiko... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e9b3fd0068cafcf0275ea08748a71f75d212abda;p=gentoo.git Backport patches for bug 536024 (glibc 2.42 compatibility) and bug 530000 (paramiko compatability). Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0x8883FA56A308A8D7! --- diff --git a/dev-db/mysql-workbench/ChangeLog b/dev-db/mysql-workbench/ChangeLog index 847d84acc81e..54bc7d86a825 100644 --- a/dev-db/mysql-workbench/ChangeLog +++ b/dev-db/mysql-workbench/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for dev-db/mysql-workbench -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-workbench/ChangeLog,v 1.102 2014/12/28 20:37:20 graaff Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-workbench/ChangeLog,v 1.103 2015/02/15 15:57:33 graaff Exp $ + +*mysql-workbench-6.2.3-r1 (15 Feb 2015) + + 15 Feb 2015; Hans de Graaff + +mysql-workbench-6.2.3-r1.ebuild, +files/mysql-workbench-6.2.3-glib.patch, + +files/mysql-workbench-6.2.3-paramiko.patch: + Backport patches for bug 536024 (glibc 2.42 compatibility) and bug 530000 + (paramiko compatability). 28 Dec 2014; Hans de Graaff mysql-workbench-6.2.3.ebuild: Compilation fails when gdal is compiled with the mdb USE flag, bug 528868. diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest index fe42e414b9ab..53e33da58197 100644 --- a/dev-db/mysql-workbench/Manifest +++ b/dev-db/mysql-workbench/Manifest @@ -9,19 +9,22 @@ AUX mysql-workbench-6.1.7-mysql_options4.patch 1141 SHA256 443bda1345796c0545fbf AUX mysql-workbench-6.1.7-wbcopytables.patch 359 SHA256 a7434308630d9f1b37bc83e35dc362e04ecf6b18e15dc1f6a6a925cdcf98605f SHA512 dece825489a2a1ec6f36122ca0e624f3844d3ea9e715e9e6afba9c392631fcfaee6690c9a0e653ab87f6c52622de996f7670eaa52a0f64c9969aaa456bc438ac WHIRLPOOL de72248451b5f8bd46b33dadeabc32201cb27888a2210d37728e6c6d5452f968c3d9622832ead454476a7b71a35476df1140cdfd78013392ac0eed47257a0d7e AUX mysql-workbench-6.2.3-CMakeLists.patch 1455 SHA256 9587f436d73ab366e77109b19e2b21099e0b0003db88662c113a1686e847839b SHA512 8a38b0fa7be0ac982b1d501964727fcb6bd0c7ab5179e2a69a1926c1abe56e2f30c6d9a046b48cdcaaec948d5c9deadb62e14331d52cf39e91f26ee90104c812 WHIRLPOOL 89235917ab608876b916933259f1970ad2c01fd1e51c57781def880291280bd4a3095014b69ec97e07cf6d97a34b4a5cd5ae9c4e89587803f2a2f7d2159808a9 AUX mysql-workbench-6.2.3-ctemplate.patch 1253 SHA256 87e4dd4878b2cabee0534c25cececdc918e503fa0f66bf9f85eab3fc53b8c80f SHA512 edb165e46822b5c6a7b854c70f6a89831f3b4cc17c4d7b652a36ee9ed9ed8c92f6472ad9e4fa62148ff0cb87dd03bbfdd7aa84c526b8ef5d26f7600731c4c0e3 WHIRLPOOL 60280f1d9962c53df9d420a0506f12dc3658b3a48976ee2f821621d27d6879f1e4e72f1e8ac3633c0199667477504971c18ad90822d8c90335b1b9a6766ad557 +AUX mysql-workbench-6.2.3-glib.patch 1814 SHA256 48c265c32cb4647d5d1ac1bd278a2767c5d1300f7b5e4b71a4c29e6c0232cdbf SHA512 504c069bdf4a797b5a0c46cb901abba3f69d83049802e5ca5350bffa47ae4f032de4c60092df5d3d8db99f344418ed22491e0803f90bcc308b95991fd8a194d0 WHIRLPOOL 6bd2e776020837d7683f135c16a81c1664d81ce4edb47028517a0c7d711c84ab8066c99d79160127b4d9af3b58c39c5ae946fc690f1a2e2406fd75fdd05a167c +AUX mysql-workbench-6.2.3-paramiko.patch 2119 SHA256 bba8601d15bc2d7d462c156598d1d70b9f0c9374a77c7d3a1c98288aa71b3935 SHA512 66d9da29c936e575638db3b4f21118e4e11b0f6918226224ca69eef37cad3557ee631502e82b2c2fcd66b785e1d256846622470c44462669e7e96c1e14962112 WHIRLPOOL 5e82e35e6f54ead7c393ccc5cf5c4ca22a9d42fb16c4cbae8a3bf97e69111b63f0a3c23499c0c75b88120b5eed0573138a51d61d90e9b58236047bbb88383f04 DIST mysql-workbench-community-6.0.9-src.tar.gz 22899136 SHA256 dc88637c62336dd3e68fb2213090c66be0ca81986b7659af934e63599e778e1f SHA512 a99156feed82ce61ff127ca4a26f825bde332c68ac81558b9112933f1eda45ab1a3e5faadada336f22ba4cc4197dbb9d48a33cb6a827823660eb8350119d492c WHIRLPOOL 443350529989336c978feb9b6cbd5b3fed300ecf534941eb4e000a49936f23d3a569a6e26e605f71adac8e7b36b9e95bff8aa8e92b90f4ae202d213f2832792c DIST mysql-workbench-community-6.2.3-src.tar.gz 14576661 SHA256 4caba8cf1f8dc0fc57e98a6170ad4718ba44c8f6622ef2359c7a550d080b3846 SHA512 c7d4130e6aeea842347ebf137502159fa17e2baf28bf36e1cb2d39dacf07671b53cfcb54d4f6559ee01d3945d453bedf81b3e58d5f805df15e63bbf113acee27 WHIRLPOOL 15e7624e29cc1a2cf1a786a50c02c2124cbeeb7577be617dcdb3751613d7bdf1cd26a44a430cc08861d3f0416a46ef7bf82abd7d6b03052f651c6a963b858688 DIST mysql-workbench-gpl-5.2.47-src.tar.gz 21924533 SHA256 e6928beb157f1e0abbb8885d16544eefe4d25b05f54dc0fb75b8375d8775838c SHA512 0229c1c3e9b7082f1752cd3f95f4372d9af6bd83b89607f7e74b5460ad72b263b5c89c868ebe19e5182878122357113db0a782865042e096a1d4519733569e15 WHIRLPOOL 40455319a8001ae9365cd164702794be17aa134b254a6a79cfc15c2321a42dfbc463b59f6bb7a34d3d0252fca2b81310014928646d0d5d8e929c46b3de470cb5 EBUILD mysql-workbench-5.2.47-r1.ebuild 2566 SHA256 1b38c5c6c0e1668a10babd8eeb5907c90cd2ceed9f137376291cd41277929b8d SHA512 8a5a6d73e44e27c959c536ad78a32210720eb4c11630af1710d77b28e3cfffbd4aaed42155d8ab5fdf47dfc52dd993eeac81d9c2882fbfc6b2144f157d79cf48 WHIRLPOOL 68c6980a22b83dd056502657e3ca766cbd235744de63147c99c8ca09a9fab5d3f2718ff540e4aa976e7eb51ea537e171cae5035900fa142185d4b95034f636de EBUILD mysql-workbench-5.2.47.ebuild 2439 SHA256 e91ee188f56a775c8e21eb08b91cdd8eab524d389cc203816fd2dd7c237cebfa SHA512 4bbacf5419c9c64dd950f55ee1be777d6ed80574667d96e87a069bcb9873dfbb1e2c18c3e416c278c7ffe42a74c5a5f25884656596ae5d6584868df6e17ec044 WHIRLPOOL 8905c429eb645643f0fe84bca269c79f5dd54a160c4e3ed105f1c0c42e8571aea872a7077f729079f0626d96abb83f62149d3cb14209c2a56f49cd525ae7a281 EBUILD mysql-workbench-6.0.9.ebuild 2201 SHA256 58fb185ce2d2843baded2a74ed2935f201d861c28cfc376fa5350a6d7e8b2c9b SHA512 cfb01fd53c11cd1a796fbef6de1352660affd4677ca9e77a3164cf084b733c846f58df0f696c5ce6314575647ccb5bcc96fc9732a2d056ab5b02f7f490ba55d0 WHIRLPOOL d408cdd4370ab7fc20a944e7ccfd08a3df7ececb4013584092dad6ad3ec1037880cf753de9d498adf6f72f334955f539bd537fe961896d84d195d0044bdac304 +EBUILD mysql-workbench-6.2.3-r1.ebuild 2583 SHA256 c66dafab74b38c9c23a40cd27d6588522a9457246c3f75477ca7c43e2c97b2c6 SHA512 959ee577defa956548eac7ded7c0f76e9cfd7ea85b9491f570d98181e09f8d56d9bfb6c661de0a4c5ce29dbaca46fdcfc949f822a2b56a5d837a0d0433ae86ea WHIRLPOOL c2805526c6728c7650d94d9bdb44f7f35831b76c13e5190a771b0b12a208c73d2d60b1fa8ad512c3c6d3cb95b113a1301803dd98dcd2344d0ef8937cf8eedfa2 EBUILD mysql-workbench-6.2.3.ebuild 2494 SHA256 b677db484e1b595649e49d471fdd70f36c9295d3355c0b82a9414fb61f8f472a SHA512 83ecdab2971e10752b22a94594634b7876f12b4a9bcff4a266ffa8e865614183110d1f01a6e63decd2a9b5f407caa26feddef7e489bc5e62f47d2123c304ca09 WHIRLPOOL 5d2eeeb9378422008547ebce8cd781c579251086d83c3db74ab4006bc36616a45c9923b4a50023f8c8d1e0b4bfdbea0b929b5a74de041ce19a5edb809b2f5a15 -MISC ChangeLog 17813 SHA256 506ed45e5cce3d165205f58473e36b4d758ef26ea53edb6d26965bb444e31171 SHA512 73641a9905502b6205c2a778e510485f200c676eaccbc6ab991307da9df47fee36d25fec4b15ec9280030f6ad21485061432a2273326231d095b86a3971924be WHIRLPOOL 18cd658cf711e164bb61fa33ea0c34181b42c9bc6ee0f4cca58e8788984813f96ca6ed81ac9b2bf76a1915612464062e7890c560841c555ca1579df1f387e971 +MISC ChangeLog 18133 SHA256 a69c1d5cfe5bef5873e20d56f7737f375ef3e024f0f460d2656756fddb032b80 SHA512 9cd3203042c5ef80b59b9acf97d35f4f8b81239a407c99f6616a023f82cbfd28a4073f3377d4c01c71fbb0cb2eb90eee8bfc133e87c8cff5e68a0a56c8e83220 WHIRLPOOL e24c0d1d1a69bf13d1524a9486abb61ffca0270b25f78a240a25ea363311fc4ade4b11691be065e9a8136f50cfd59af5aa8cab7e498d456f086f88fc2a81bc78 MISC metadata.xml 201 SHA256 c90b12c6600840878686d4544dbc51d97b0715add76b40d9400415cdef6324ad SHA512 3131e5281b343002ef359d7199da425d3f9f5406ef4ddd9332eccad6b78e3ced62adedd4dfe14538db391d2590811df6f2a15cada5a1e924479a0189cd69b7d3 WHIRLPOOL 8631f9384237d55afedca6bba2e9e6b80f5d260ec195de52a736072d4c743579e435c363404e0561a05708c07fbb92e21d69aaff1273b9f724d25b3f59b26fe6 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iF4EAREIAAYFAlSgaggACgkQiIP6VqMIqNdsxgD/fRx7N8newRBDIlHglLKhbLir -inc9hl2hpIU1EElIwcoBAIPSlUd20s6fQxjdIeTlvdIRU2h4vnU/stYGUgNcbhww -=Uufw +iF4EAREIAAYFAlTgwfIACgkQiIP6VqMIqNfxEQD+LXlIFukVthEQ1JH+02FZKtUM +4dFGv8FdwjBPchVFvkcA/3gl/AMvUJqh8mpm3w2oq2OTrzzghLFJPwYkCGz3utb8 +=zoC1 -----END PGP SIGNATURE----- diff --git a/dev-db/mysql-workbench/files/mysql-workbench-6.2.3-glib.patch b/dev-db/mysql-workbench/files/mysql-workbench-6.2.3-glib.patch new file mode 100644 index 000000000000..96da8534944b --- /dev/null +++ b/dev-db/mysql-workbench/files/mysql-workbench-6.2.3-glib.patch @@ -0,0 +1,42 @@ +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: + + diff --git a/dev-db/mysql-workbench/files/mysql-workbench-6.2.3-paramiko.patch b/dev-db/mysql-workbench/files/mysql-workbench-6.2.3-paramiko.patch new file mode 100644 index 000000000000..ad131b781ace --- /dev/null +++ b/dev-db/mysql-workbench/files/mysql-workbench-6.2.3-paramiko.patch @@ -0,0 +1,51 @@ +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: diff --git a/dev-db/mysql-workbench/mysql-workbench-6.2.3-r1.ebuild b/dev-db/mysql-workbench/mysql-workbench-6.2.3-r1.ebuild new file mode 100644 index 000000000000..eda46111f26d --- /dev/null +++ b/dev-db/mysql-workbench/mysql-workbench-6.2.3-r1.ebuild @@ -0,0 +1,101 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-workbench/mysql-workbench-6.2.3-r1.ebuild,v 1.1 2015/02/15 15:57:33 graaff Exp $ + +EAPI=5 +GCONF_DEBUG="no" + +PYTHON_COMPAT=( python{2_6,2_7} ) +PYTHON_REQ_USE="sqlite" + +CMAKE_MIN_VERSION="2.8.11.1" + +inherit gnome2 eutils flag-o-matic python-single-r1 cmake-utils + +MY_P="${PN}-community-${PV}-src" + +DESCRIPTION="MySQL Workbench" +HOMEPAGE="http://dev.mysql.com/workbench/" +SRC_URI="mirror://mysql/Downloads/MySQLGUITools/${MY_P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="debug doc gnome-keyring" + +# glibc: deprecated mutex functions, removed in 2.36.0 +CDEPEND="${PYTHON_DEPS} + dev-libs/glib:2 + dev-cpp/atkmm + dev-cpp/pangomm + >=dev-cpp/glibmm-2.14:2 + >=dev-cpp/gtkmm-2.14:2.4 + dev-libs/atk + x11-libs/pango + >=x11-libs/gtk+-2.20:2 + gnome-base/libglade:2.0 + >=x11-libs/cairo-1.5.12[glib,svg] + dev-libs/libsigc++:2 + dev-libs/boost + >=dev-cpp/ctemplate-0.95 + >=dev-libs/libxml2-2.6.2:2 + dev-libs/libzip + >=virtual/mysql-5.1 + dev-libs/libpcre + >=sci-libs/gdal-1.11.1-r1[-mdb] + virtual/opengl + >=dev-lang/lua-5.1[deprecated] + || ( sys-libs/e2fsprogs-libs dev-libs/ossp-uuid ) + dev-libs/tinyxml[stl] + dev-db/mysql-connector-c++ + dev-db/vsqlite++ + || ( dev-db/libiodbc dev-db/unixODBC ) + gnome-keyring? ( gnome-base/libgnome-keyring ) + dev-python/pexpect + >=dev-python/paramiko-1.7.4 + " + +# lua perhaps no longer needed? Was used via libgrt only + +RDEPEND="${CDEPEND} + app-admin/sudo + >=sys-apps/net-tools-1.60_p20120127084908" + +DEPEND="${CDEPEND} + dev-lang/swig + virtual/pkgconfig" + +S="${WORKDIR}"/"${MY_P}" + +src_prepare() { + ## Patch CMakeLists.txt + epatch "${FILESDIR}/${PN}-6.2.3-CMakeLists.patch" \ + "${FILESDIR}/${PN}-6.1.7-wbcopytables.patch" \ + "${FILESDIR}/${PN}-6.1.7-mysql_options4.patch" \ + "${FILESDIR}/${PN}-6.2.3-ctemplate.patch" \ + "${FILESDIR}/${PN}-6.2.3-paramiko.patch" \ + "${FILESDIR}/${PN}-6.2.3-glib.patch" + + ## remove hardcoded CXXFLAGS + sed -i -e 's/-O0 -g3//' ext/scintilla/gtk/CMakeLists.txt || die + + ## package is very fragile... + strip-flags + + cmake-utils_src_prepare +} + +src_configure() { + local mycmakeargs=( + $(cmake-utils_use_use gnome-keyring GNOME_KEYRING) + -DLIB_INSTALL_DIR="/usr/$(get_libdir)" + -DPYTHON_INCLUDE_DIR="$(python_get_includedir)" + -DPYTHON_LIBRARY="$(python_get_library_path)" + ) + cmake-utils_src_configure +} + +src_compile() { + # Work around parallel build issues, bug 507838 + cmake-utils_src_compile -j1 +}