summaryrefslogtreecommitdiff
path: root/dev-db
diff options
context:
space:
mode:
Diffstat (limited to 'dev-db')
-rw-r--r--dev-db/mysql-administrator/ChangeLog8
-rw-r--r--dev-db/mysql-administrator/files/1.0.22a-optional-4.1-support.patch16
-rw-r--r--dev-db/mysql-administrator/mysql-administrator-1.0.22a.ebuild11
3 files changed, 32 insertions, 3 deletions
diff --git a/dev-db/mysql-administrator/ChangeLog b/dev-db/mysql-administrator/ChangeLog
index 0c47c3c7592e..8b7fe51597a4 100644
--- a/dev-db/mysql-administrator/ChangeLog
+++ b/dev-db/mysql-administrator/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for dev-db/mysql-administrator
# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-administrator/ChangeLog,v 1.19 2005/06/16 16:04:13 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-administrator/ChangeLog,v 1.20 2005/06/17 14:39:41 swegener Exp $
+
+ 17 Jun 2005; Sven Wegener <swegener@gentoo.org>
+ +files/1.0.22a-optional-4.1-support.patch,
+ mysql-administrator-1.0.22a.ebuild:
+ Added a patch that makes mysql-administrator work with mysql-4.0. Closes bug
+ #96347.
*mysql-administrator-1.0.22a (16 Jun 2005)
diff --git a/dev-db/mysql-administrator/files/1.0.22a-optional-4.1-support.patch b/dev-db/mysql-administrator/files/1.0.22a-optional-4.1-support.patch
new file mode 100644
index 000000000000..4e0be6f73f70
--- /dev/null
+++ b/dev-db/mysql-administrator/files/1.0.22a-optional-4.1-support.patch
@@ -0,0 +1,16 @@
+diff -Nur mysql-administrator-1.0.22a.orig/mysql-gui-common/library/source/myx_library.c mysql-administrator-1.0.22a/mysql-gui-common/library/source/myx_library.c
+--- mysql-administrator-1.0.22a.orig/mysql-gui-common/library/source/myx_library.c 2005-06-06 16:12:15.000000000 +0200
++++ mysql-administrator-1.0.22a/mysql-gui-common/library/source/myx_library.c 2005-06-17 16:02:40.579309365 +0200
+@@ -581,10 +581,12 @@
+ //of mysql_real_connect are in utf8
+ //mysql_options(mysql, MYSQL_SET_CHARSET_NAME, "utf8");
+
++#if MYSQL_VERSION_ID >= 40100
+ if (myx_mysql_get_private(mysql)->embedded)
+ mysql_options(mysql, MYSQL_OPT_USE_EMBEDDED_CONNECTION, (char *)1);
+ else
+ mysql_options(mysql, MYSQL_OPT_USE_REMOTE_CONNECTION, (char *)1);
++#endif
+
+ if (!mysql_real_connect(mysql, user_conn->hostname, user_conn->username,
+ user_conn->password, user_conn->schema,
diff --git a/dev-db/mysql-administrator/mysql-administrator-1.0.22a.ebuild b/dev-db/mysql-administrator/mysql-administrator-1.0.22a.ebuild
index be02ddc3bdea..a10101fe7729 100644
--- a/dev-db/mysql-administrator/mysql-administrator-1.0.22a.ebuild
+++ b/dev-db/mysql-administrator/mysql-administrator-1.0.22a.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-administrator/mysql-administrator-1.0.22a.ebuild,v 1.1 2005/06/16 16:04:13 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-administrator/mysql-administrator-1.0.22a.ebuild,v 1.2 2005/06/17 14:39:41 swegener Exp $
-inherit gnome2
+inherit gnome2 eutils
DESCRIPTION="MySQL Administrator"
HOMEPAGE="http://www.mysql.com/products/administrator/"
@@ -23,6 +23,13 @@ DEPEND="${RDEPEND}
>=dev-util/pkgconfig-0.12.0
>=app-text/scrollkeeper-0.3.11"
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+
+ epatch "${FILESDIR}"/${PV}-optional-4.1-support.patch
+}
+
src_compile() {
cd "${S}"/mysql-gui-common
econf --with-commondirname=common-administrator || die "econf failed"