From 13f0e2591ee71db27635d8ed694bfc4ab460cefd Mon Sep 17 00:00:00 2001 From: Hans de Graaff Date: Sun, 26 Apr 2015 08:43:14 +0000 Subject: Version bump. (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0x8883FA56A308A8D7!) --- dev-db/mysql-workbench/ChangeLog | 9 +- .../mysql-workbench-6.3.3-mysql_options4.patch | 40 ++++++++ .../mysql-workbench/mysql-workbench-6.3.3.ebuild | 103 +++++++++++++++++++++ 3 files changed, 151 insertions(+), 1 deletion(-) create mode 100644 dev-db/mysql-workbench/files/mysql-workbench-6.3.3-mysql_options4.patch create mode 100644 dev-db/mysql-workbench/mysql-workbench-6.3.3.ebuild (limited to 'dev-db') diff --git a/dev-db/mysql-workbench/ChangeLog b/dev-db/mysql-workbench/ChangeLog index e6985736a037..c6677f4f932d 100644 --- a/dev-db/mysql-workbench/ChangeLog +++ b/dev-db/mysql-workbench/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-db/mysql-workbench # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-workbench/ChangeLog,v 1.111 2015/04/08 18:45:26 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-workbench/ChangeLog,v 1.112 2015/04/26 08:43:14 graaff Exp $ + +*mysql-workbench-6.3.3 (26 Apr 2015) + + 26 Apr 2015; Hans de Graaff + +mysql-workbench-6.3.3.ebuild, + +files/mysql-workbench-6.3.3-mysql_options4.patch: + Version bump. 08 Apr 2015; Michał Górny mysql-workbench-6.0.9.ebuild, mysql-workbench-6.2.3-r1.ebuild, mysql-workbench-6.2.3.ebuild, diff --git a/dev-db/mysql-workbench/files/mysql-workbench-6.3.3-mysql_options4.patch b/dev-db/mysql-workbench/files/mysql-workbench-6.3.3-mysql_options4.patch new file mode 100644 index 000000000000..7fb9c8d57fc5 --- /dev/null +++ b/dev-db/mysql-workbench/files/mysql-workbench-6.3.3-mysql_options4.patch @@ -0,0 +1,40 @@ +--- plugins/migration/copytable/copytable.cpp.~1~ 2015-04-15 15:54:19.000000000 +0200 ++++ plugins/migration/copytable/copytable.cpp 2015-04-26 08:53:08.871167725 +0200 +@@ -1920,12 +1920,17 @@ + _incoming_data_charset = "latin1"; + + mysql_init(&_mysql); ++/* This is optional has compiled in for MySQL >= 5.6.6 ++ * Looks like MariaDB does not support this as supposed, ++ * so disable completly. */ ++#ifndef MARIADB_BASE_VERSION + #if defined(MYSQL_VERSION_MAJOR) && defined(MYSQL_VERSION_MINOR) && defined(MYSQL_VERSION_PATCH) + #if MYSQL_CHECK_VERSION(5,6,6) + if (is_mysql_version_at_least(5,6,6)) + mysql_options4(&_mysql, MYSQL_OPT_CONNECT_ATTR_ADD, "program_name", app_name.c_str()); + #endif + #endif ++#endif + + // _bulk_insert_record is used to prepare a single record string, the connection + // is needed to escape binary data properly +--- plugins/migration/copytable/copytable.cpp.~1~ 2015-04-26 08:57:30.444285953 +0200 ++++ plugins/migration/copytable/copytable.cpp 2015-04-26 10:16:39.234711324 +0200 +@@ -2875,6 +2875,9 @@ + + // This function is used to create a legal SQL string that you can use in an SQL statement + // This is needed because the escaping depends on the character set in use by the server ++ #ifdef MARIADB_BASE_VERSION ++ length += mysql_real_escape_string(_mysql, buffer + length, data, (unsigned long)dlength); ++ #else + #if defined(MYSQL_VERSION_MAJOR) && defined(MYSQL_VERSION_MINOR) && defined(MYSQL_VERSION_PATCH) + #if MYSQL_CHECK_VERSION(5,7,6) + if (is_mysql_version_at_least(5,7,6)) +@@ -2885,6 +2888,7 @@ + length += mysql_real_escape_string(_mysql, buffer + length, data, (unsigned long)dlength); + #endif + #endif ++ #endif + + return true; + } diff --git a/dev-db/mysql-workbench/mysql-workbench-6.3.3.ebuild b/dev-db/mysql-workbench/mysql-workbench-6.3.3.ebuild new file mode 100644 index 000000000000..58da47d7f9a4 --- /dev/null +++ b/dev-db/mysql-workbench/mysql-workbench-6.3.3.ebuild @@ -0,0 +1,103 @@ +# 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.3.3.ebuild,v 1.1 2015/04/26 08:43:14 graaff Exp $ + +EAPI=5 +GCONF_DEBUG="no" + +PYTHON_COMPAT=( python2_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 https://github.com/antlr/website-antlr3/blob/gh-pages/download/antlr-3.4-complete.jar?raw=true -> antlr-3.4-complete.jar" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~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/jre + virtual/pkgconfig" + +S="${WORKDIR}"/"${MY_P}" + +src_unpack() { + unpack ${PN}-community-${PV}-src.tar.gz +} + +src_prepare() { + ## Patch CMakeLists.txt + epatch "${FILESDIR}/${PN}-6.2.3-CMakeLists.patch" \ + "${FILESDIR}/${PN}-6.2.5-wbcopytables.patch" \ + "${FILESDIR}/${PN}-6.3.3-mysql_options4.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)" + ) + ANTLR_JAR_PATH="${DISTDIR}/antlr-3.4-complete.jar" cmake-utils_src_configure +} + +src_compile() { + # Work around parallel build issues, bug 507838 + cmake-utils_src_compile -j1 +} -- cgit v1.2.3-65-gdbad