From 35027b3af8ebf8d155ce18f639588f13df15d397 Mon Sep 17 00:00:00 2001 From: =?utf8?q?David=20=E2=80=98Bombe=E2=80=99=20Roden?= Date: Mon, 14 Jun 2010 12:13:28 +0200 Subject: [PATCH] Add connection timeout patch for dev-db/mysql-workbench. --- dev-db/mysql-workbench/Manifest | 5 ++ .../mysql-workbench-5.2.17-as-needed-modules.patch | 20 +++++++ .../files/mysql-workbench-5.2.17-python-libs.patch | 21 ++++++++ ...kbench-5.2.22-increase-connection-timeout.patch | 12 +++++ .../mysql-workbench/mysql-workbench-5.2.22.ebuild | 62 ++++++++++++++++++++++ 5 files changed, 120 insertions(+) create mode 100644 dev-db/mysql-workbench/Manifest create mode 100644 dev-db/mysql-workbench/files/mysql-workbench-5.2.17-as-needed-modules.patch create mode 100644 dev-db/mysql-workbench/files/mysql-workbench-5.2.17-python-libs.patch create mode 100644 dev-db/mysql-workbench/files/mysql-workbench-5.2.22-increase-connection-timeout.patch create mode 100644 dev-db/mysql-workbench/mysql-workbench-5.2.22.ebuild diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest new file mode 100644 index 0000000..c1ead66 --- /dev/null +++ b/dev-db/mysql-workbench/Manifest @@ -0,0 +1,5 @@ +AUX mysql-workbench-5.2.17-as-needed-modules.patch 817 RMD160 07a91a62a364ead59597317738df334a8773338a SHA1 60c17b4337adef0257e3c9dc9facefcc5b6364fe SHA256 2b2503059228381ff16135bb6bf9987807661215b8b45f91acb7c6c156c5d7da +AUX mysql-workbench-5.2.17-python-libs.patch 853 RMD160 b2ca54f9342c082395c5b5cac92e6247362531b9 SHA1 405a46f1d15f8d428dc3e6f0eada4d36cc00bb93 SHA256 8625ec48e17d3871d37dce559118868edc840a235a0010b47ea4f1afb277872b +AUX mysql-workbench-5.2.22-increase-connection-timeout.patch 495 RMD160 8979e8edb9f6b2c1f70c9eb37ed3cf70e39f5ec0 SHA1 142f79543065bec8afdc72b674ec718af6c96eee SHA256 88253745607c653625ecc428dbe767d54596869dca072033060a972dc9e92282 +DIST mysql-workbench-oss-5.2.22.tar.gz 21524038 RMD160 2dab197335611a4553dc4384b9f82190060e744f SHA1 938557c341ce2d1dbb8591ae8cd17dfb05078a62 SHA256 0fc5cc8ad620b451ccffa8e9eeae1b937ad0c91f55940a8e371c538e59767104 +EBUILD mysql-workbench-5.2.22.ebuild 1521 RMD160 354be1434dae08259ef58a6538b757783aa1748e SHA1 2796ca52ec7cf1d5ac059a9d07738ed6a3df1c76 SHA256 13306758c60b06bd49e4b35e40251bfb313c23a67489189d2643baf6ec9b33ae diff --git a/dev-db/mysql-workbench/files/mysql-workbench-5.2.17-as-needed-modules.patch b/dev-db/mysql-workbench/files/mysql-workbench-5.2.17-as-needed-modules.patch new file mode 100644 index 0000000..a53b49d --- /dev/null +++ b/dev-db/mysql-workbench/files/mysql-workbench-5.2.17-as-needed-modules.patch @@ -0,0 +1,20 @@ +--- modules/wb.validation/Makefile.am.~1~ 2010-04-02 03:26:24.000000000 +0200 ++++ modules/wb.validation/Makefile.am 2010-04-09 16:18:16.703343478 +0200 +@@ -19,6 +19,7 @@ + + + wb_validation_grt_la_LDFLAGS=-module ++wb_validation_grt_la_LIBADD=@GRT_LIBS@ @GLIB_LIBS@ @SIGC_LIBS@ + #wb_mysql_import_grt_la_LIBADD=$(top_srcdir)/backend/grtdb/libgrtdbbe.la + + wb_validation_grt_la_SOURCES=src/register_plugin.cpp\ +--- modules/wb.mysql.validation/Makefile.am.~1~ 2010-04-02 03:26:24.000000000 +0200 ++++ modules/wb.mysql.validation/Makefile.am 2010-04-09 16:17:53.991717921 +0200 +@@ -21,6 +21,7 @@ + + + wb_mysql_validation_grt_la_LDFLAGS=-module ++wb_mysql_validation_grt_la_LIBADD=@GRT_LIBS@ @GLIB_LIBS@ @SIGC_LIBS@ + #wb_mysql_import_grt_la_LIBADD=$(top_srcdir) + + wb_mysql_validation_grt_la_SOURCES=src/register_plugin.cpp\ diff --git a/dev-db/mysql-workbench/files/mysql-workbench-5.2.17-python-libs.patch b/dev-db/mysql-workbench/files/mysql-workbench-5.2.17-python-libs.patch new file mode 100644 index 0000000..8fb6b71 --- /dev/null +++ b/dev-db/mysql-workbench/files/mysql-workbench-5.2.17-python-libs.patch @@ -0,0 +1,21 @@ +Use a simpler check for Python's libs that return an actual linker +invocation (e.g. -lpython2.6) instead of the .so file. This fixes the +case with forced as-needed where the .so gets re-ordered to the front +during link. + +--- configure.in.~1~ 2010-04-02 03:26:27.000000000 +0200 ++++ configure.in 2010-04-09 16:06:10.271092660 +0200 +@@ -303,12 +303,7 @@ + dnl enable_python=$enableval, enable_python=no) + + AC_MSG_CHECKING(for Python) +-PYTHON_LIBS=[$(python -c "from distutils import sysconfig +-import os +-cfg=sysconfig.get_config_vars() +-lib = os.path.join(cfg['LIBDIR'], cfg['LDLIBRARY']) +-if os.path.exists(lib): +- print lib")] ++PYTHON_LIBS=[$(python -c 'import sys; print("-lpython%s.%s" % sys.version_info[:2])')] + PYTHON_CFLAGS=[$(python -c "from distutils import sysconfig + print sysconfig.get_python_inc()")] + PYTHON_CFLAGS="-I$PYTHON_CFLAGS" diff --git a/dev-db/mysql-workbench/files/mysql-workbench-5.2.22-increase-connection-timeout.patch b/dev-db/mysql-workbench/files/mysql-workbench-5.2.22-increase-connection-timeout.patch new file mode 100644 index 0000000..e2f6aca --- /dev/null +++ b/dev-db/mysql-workbench/files/mysql-workbench-5.2.22-increase-connection-timeout.patch @@ -0,0 +1,12 @@ +diff -Nur mysql-workbench-oss-5.2.22-orig/library/dbc/src/driver_manager.cpp mysql-workbench-oss-5.2.22/library/dbc/src/driver_manager.cpp +--- mysql-workbench-oss-5.2.22-orig/library/dbc/src/driver_manager.cpp 2010-06-02 02:37:15.000000000 +0200 ++++ mysql-workbench-oss-5.2.22/library/dbc/src/driver_manager.cpp 2010-06-14 12:10:41.000000000 +0200 +@@ -193,7 +193,7 @@ + + { + ConnectPropertyVal tmp; +- tmp = (int)5; ++ tmp = (int)30; + properties["OPT_CONNECT_TIMEOUT"]= tmp; + } + diff --git a/dev-db/mysql-workbench/mysql-workbench-5.2.22.ebuild b/dev-db/mysql-workbench/mysql-workbench-5.2.22.ebuild new file mode 100644 index 0000000..31036a6 --- /dev/null +++ b/dev-db/mysql-workbench/mysql-workbench-5.2.22.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-workbench/mysql-workbench-5.2.22.ebuild,v 1.1 2010/06/03 06:26:51 graaff Exp $ + +EAPI="2" +GCONF_DEBUG="no" + +inherit gnome2 eutils flag-o-matic autotools + +MY_P="${PN}-oss-${PV}" + +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" +IUSE="debug nls readline static-libs" + +RDEPEND=">=x11-libs/gtk+-2.6 + dev-libs/glib:2 + gnome-base/libglade:2.0 + dev-libs/libsigc++:2 + dev-libs/boost + >=dev-libs/libxml2-2.6.2 + >=dev-cpp/glibmm-2.14 + >=dev-cpp/gtkmm-2.14 + dev-libs/libzip + >=virtual/mysql-5.1 + dev-libs/libpcre + virtual/opengl + >=dev-lang/lua-5.1[deprecated] + gnome-base/libgnome + x11-libs/pango + || ( sys-libs/e2fsprogs-libs + dev-libs/ossp-uuid ) + >=x11-libs/cairo-1.5.12[svg] + dev-python/pexpect + dev-python/paramiko + readline? ( sys-libs/readline )" +DEPEND="${RDEPEND} + >=dev-cpp/ctemplate-0.95 + dev-util/pkgconfig" + +S="${WORKDIR}"/"${MY_P}" + +src_prepare() { + epatch "${FILESDIR}/${PN}-5.2.17-python-libs.patch" + epatch "${FILESDIR}/${PN}-5.2.17-as-needed-modules.patch" + epatch "${FILESDIR}/${PN}-5.2.22-increase-connection-timeout.patch" + eautoreconf +} + +src_configure() { + econf \ + $(use_enable nls i18n) \ + $(use_enable readline readline) \ + $(use_enable debug) \ + $(use_enable static-libs static) \ + --with-system-ctemplate +} -- 2.7.4