summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven Wegener <swegener@gentoo.org>2007-11-28 20:11:01 +0000
committerSven Wegener <swegener@gentoo.org>2007-11-28 20:11:01 +0000
commit92dba6940ea2a7f7623efb96d7a90eb7fa407d59 (patch)
tree005ce2b05ca256319b59b20140edf141d3c0a298 /dev-db/mysql-gui-tools
parentamd64 stable wrt #195288 (diff)
downloadgentoo-2-92dba6940ea2a7f7623efb96d7a90eb7fa407d59.tar.gz
gentoo-2-92dba6940ea2a7f7623efb96d7a90eb7fa407d59.tar.bz2
gentoo-2-92dba6940ea2a7f7623efb96d7a90eb7fa407d59.zip
Revision bump to fix a hang in mysql-query-browser, bug #170943.
(Portage version: 2.1.3.19)
Diffstat (limited to 'dev-db/mysql-gui-tools')
-rw-r--r--dev-db/mysql-gui-tools/ChangeLog9
-rw-r--r--dev-db/mysql-gui-tools/files/digest-mysql-gui-tools-5.0_p12-r2 (renamed from dev-db/mysql-gui-tools/files/digest-mysql-gui-tools-5.0_p12-r1)0
-rw-r--r--dev-db/mysql-gui-tools/files/mysql-gui-tools-5.0_p12-query-browser-sps.patch13
-rw-r--r--dev-db/mysql-gui-tools/mysql-gui-tools-5.0_p12-r2.ebuild (renamed from dev-db/mysql-gui-tools/mysql-gui-tools-5.0_p12-r1.ebuild)3
4 files changed, 23 insertions, 2 deletions
diff --git a/dev-db/mysql-gui-tools/ChangeLog b/dev-db/mysql-gui-tools/ChangeLog
index d1b16effc750..f4ddaee97265 100644
--- a/dev-db/mysql-gui-tools/ChangeLog
+++ b/dev-db/mysql-gui-tools/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for dev-db/mysql-gui-tools
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-gui-tools/ChangeLog,v 1.21 2007/11/10 21:26:12 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-gui-tools/ChangeLog,v 1.22 2007/11/28 20:11:00 swegener Exp $
+
+*mysql-gui-tools-5.0_p12-r2 (28 Nov 2007)
+
+ 28 Nov 2007; Sven Wegener <swegener@gentoo.org>
+ +files/mysql-gui-tools-5.0_p12-query-browser-sps.patch,
+ -mysql-gui-tools-5.0_p12-r1.ebuild, +mysql-gui-tools-5.0_p12-r2.ebuild:
+ Revision bump to fix a hang in mysql-query-browser, bug #170943.
10 Nov 2007; Sven Wegener <swegener@gentoo.org>
mysql-gui-tools-5.0_p12-r1.ebuild:
diff --git a/dev-db/mysql-gui-tools/files/digest-mysql-gui-tools-5.0_p12-r1 b/dev-db/mysql-gui-tools/files/digest-mysql-gui-tools-5.0_p12-r2
index 36209eaa1205..36209eaa1205 100644
--- a/dev-db/mysql-gui-tools/files/digest-mysql-gui-tools-5.0_p12-r1
+++ b/dev-db/mysql-gui-tools/files/digest-mysql-gui-tools-5.0_p12-r2
diff --git a/dev-db/mysql-gui-tools/files/mysql-gui-tools-5.0_p12-query-browser-sps.patch b/dev-db/mysql-gui-tools/files/mysql-gui-tools-5.0_p12-query-browser-sps.patch
new file mode 100644
index 000000000000..eb06bea2d983
--- /dev/null
+++ b/dev-db/mysql-gui-tools/files/mysql-gui-tools-5.0_p12-query-browser-sps.patch
@@ -0,0 +1,13 @@
+--- mysql-gui-tools/mysql-query-browser/source/linux/MQQueryDispatcher.cc
++++ mysql-gui-tools/mysql-query-browser/source/linux/MQQueryDispatcher.cc
+@@ -558,8 +558,8 @@
+
+ Gtk::Main::instance()->run();
+
+- while(!req->is_complete())
+- ;
++// while(!req->is_complete())
++// ;
+
+ return sps;
+ }
diff --git a/dev-db/mysql-gui-tools/mysql-gui-tools-5.0_p12-r1.ebuild b/dev-db/mysql-gui-tools/mysql-gui-tools-5.0_p12-r2.ebuild
index ab3d4dcb3fbc..8f9bacdd3f76 100644
--- a/dev-db/mysql-gui-tools/mysql-gui-tools-5.0_p12-r1.ebuild
+++ b/dev-db/mysql-gui-tools/mysql-gui-tools-5.0_p12-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-gui-tools/mysql-gui-tools-5.0_p12-r1.ebuild,v 1.2 2007/11/10 21:26:12 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-gui-tools/mysql-gui-tools-5.0_p12-r2.ebuild,v 1.1 2007/11/28 20:11:00 swegener Exp $
GCONF_DEBUG="no"
@@ -59,6 +59,7 @@ src_unpack() {
epatch "${FILESDIR}"/${PN}-5.0_p8-i18n-fix.patch
epatch "${FILESDIR}"/${PN}-5.0_p8-lua-modules.patch
epatch "${FILESDIR}"/${P}-workbench-lua.patch
+ epatch "${FILESDIR}"/${P}-query-browser-sps.patch
sed -i \
-e "s/\\(^\\|[[:space:]]\\)-ltermcap\\($\\|[[:space:]]\\)/ /g" \