Also apply the mysql-4.0 patch from mysql-administrator to mysql-query-browser, bug #96399.

Package-Manager: portage-2.0.51.22-r1

4 files changed, 31 insertions, 7 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/Manifest b/dev-db/mysql-query-browser/Manifest
index ef1b92ce1f36..5b816b597f77 100644
--- a/dev-db/mysql-query-browser/Manifest
+++ b/dev-db/mysql-query-browser/Manifest
@@ -1,19 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 5f2d570f18567c4dc75954bbd2a2ef04 mysql-query-browser-1.1.11.ebuild 1387
+MD5 41785a63d32d2214aca638b9272bfe4b mysql-query-browser-1.1.11.ebuild 1442
 MD5 61adf7a5d56211a0217be4405ca3e7ad mysql-query-browser-1.1.7.ebuild 1292
 MD5 27e0f7b8a98a40c68d228208ebdb2043 mysql-query-browser-1.1.9.ebuild 1284
-MD5 f6c127e6746cb6adce891d05ed70a135 ChangeLog 3395
+MD5 4305a84cfe7e1bc5b0bf3edade057d18 ChangeLog 3623
 MD5 28ed354a0713d1b36793acecb2193738 metadata.xml 687
 MD5 85b5bb9ee651889caf15dd409f816ac5 files/1.1.11-no-unkown-widgets.patch 693
 MD5 c2deb0a90ff26719ce2ad70f3331077c files/digest-mysql-query-browser-1.1.11 79
+MD5 a86763ed63c1e913c62e1d3bf05758d7 files/1.1.11-optional-4.1-support.patch 913
 MD5 5752ca8d9c3c557c6c8b06ce2f269f45 files/digest-mysql-query-browser-1.1.7 78
 MD5 2e3a04a394a27297ccfa8dc009b2a224 files/digest-mysql-query-browser-1.1.9 78
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCsaogI1lqEGTUzyQRAoYMAJ0U6jvyl7CU1eE4QLWpMjSM30MEngCcDqBb
-fI8wbm2raQsMjmUSDmAry0s=
-=LZz4
+iD8DBQFCsxJfI1lqEGTUzyQRAjQUAJ9xq4cNHV6Qj4ibrmeqOesB6GldcACgu/kC
+b1UeKcdeW2PJXN7De+pbfJw=
+=K9q+
 -----END PGP SIGNATURE-----
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() {