diff options
| author |   Sven Wegener <swegener@gentoo.org> | 2005-06-17 18:11:13 +0000 |
|---|---|---|
| committer | Sven Wegener <swegener@gentoo.org> | 2005-06-17 18:11:13 +0000 |
| commit | 4073772d2fbf45762f31b6e49ffc57264ab6e225 (patch) | |
| tree | 7827cad5b6b6f1d87f8bdd8b479598344e5c01bb | |
| parent | Fixed patch and added inherit eutils for epatch support. (diff) | |
| download | gentoo-2-4073772d2fbf45762f31b6e49ffc57264ab6e225.tar.gz gentoo-2-4073772d2fbf45762f31b6e49ffc57264ab6e225.tar.bz2 gentoo-2-4073772d2fbf45762f31b6e49ffc57264ab6e225.zip | |
Also apply the mysql-4.0 patch from mysql-administrator to mysql-query-browser, bug #96399.
(Portage version: 2.0.51.22-r1)
| -rw-r--r-- | dev-db/mysql-query-browser/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-db/mysql-query-browser/files/1.1.11-optional-4.1-support.patch | 16 | ||||
| -rw-r--r-- | dev-db/mysql-query-browser/mysql-query-browser-1.1.11.ebuild | 3 |
3 files changed, 25 insertions, 2 deletions
diff --git a/dev-db/mysql-query-browser/ChangeLog b/dev-db/mysql-query-browser/ChangeLog index e92ed31bd2ef..dcd93c9b9aea 100644 --- a/dev-db/mysql-query-browser/ChangeLog +++ b/dev-db/mysql-query-browser/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-db/mysql-query-browser # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-query-browser/ChangeLog,v 1.18 2005/06/16 16:34:14 swegener Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-query-browser/ChangeLog,v 1.19 2005/06/17 18:11:13 swegener Exp $ + + 17 Jun 2005; Sven Wegener <swegener@gentoo.org> + +files/1.1.11-optional-4.1-support.patch, + mysql-query-browser-1.1.11.ebuild: + Also apply the mysql-4.0 patch from mysql-administrator to + mysql-query-browser, bug #96399. 16 Jun 2005; Sven Wegener <swegener@gentoo.org> +files/1.1.11-no-unkown-widgets.patch, mysql-query-browser-1.1.11.ebuild: diff --git a/dev-db/mysql-query-browser/files/1.1.11-optional-4.1-support.patch b/dev-db/mysql-query-browser/files/1.1.11-optional-4.1-support.patch new file mode 100644 index 000000000000..4e0be6f73f70 --- /dev/null +++ b/dev-db/mysql-query-browser/files/1.1.11-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-query-browser/mysql-query-browser-1.1.11.ebuild b/dev-db/mysql-query-browser/mysql-query-browser-1.1.11.ebuild index 9a0fb5faaf3a..f225388d9552 100644 --- a/dev-db/mysql-query-browser/mysql-query-browser-1.1.11.ebuild +++ b/dev-db/mysql-query-browser/mysql-query-browser-1.1.11.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-query-browser/mysql-query-browser-1.1.11.ebuild,v 1.2 2005/06/16 16:34:14 swegener Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-query-browser/mysql-query-browser-1.1.11.ebuild,v 1.3 2005/06/17 18:11:13 swegener Exp $ inherit gnome2 eutils @@ -29,6 +29,7 @@ src_unpack() { cd "${S}" epatch "${FILESDIR}"/${PV}-no-unkown-widgets.patch + epatch "${FILESDIR}"/${PV}-optional-4.1-support.patch } src_compile() { |