diff options
| author |   Hans de Graaff <graaff@gentoo.org> | 2011-04-10 18:14:18 +0000 |
|---|---|---|
| committer | Hans de Graaff <graaff@gentoo.org> | 2011-04-10 18:14:18 +0000 |
| commit | 0824ab9d698fc34c29cc3b6aac21de7add09865e (patch) | |
| tree | 879e2b797a140f2ce8f0c10b89729bada4350a37 /dev-db | |
| parent | Simply check if EINTLTOOLIZE and EAUTORECONF is set or not, to support other ... (diff) | |
| download | gentoo-2-0824ab9d698fc34c29cc3b6aac21de7add09865e.tar.gz gentoo-2-0824ab9d698fc34c29cc3b6aac21de7add09865e.tar.bz2 gentoo-2-0824ab9d698fc34c29cc3b6aac21de7add09865e.zip | |
Add patch to fix compilation with newer gtkmm versions, fixing bug 361645.
(Portage version: 2.1.9.42/cvs/Linux x86_64)
Diffstat (limited to 'dev-db')
| -rw-r--r-- | dev-db/mysql-workbench/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-db/mysql-workbench/files/mysql-workbench-5.2.33-gtkmm.patch | 15 | ||||
| -rw-r--r-- | dev-db/mysql-workbench/mysql-workbench-5.2.33.ebuild | 3 |
3 files changed, 22 insertions, 2 deletions
diff --git a/dev-db/mysql-workbench/ChangeLog b/dev-db/mysql-workbench/ChangeLog index efb9191251b4..891a14907477 100644 --- a/dev-db/mysql-workbench/ChangeLog +++ b/dev-db/mysql-workbench/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-db/mysql-workbench # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-workbench/ChangeLog,v 1.36 2011/03/29 06:07:20 nirbheek Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-workbench/ChangeLog,v 1.37 2011/04/10 18:14:18 graaff Exp $ + + 10 Apr 2011; Hans de Graaff <graaff@gentoo.org> + mysql-workbench-5.2.33.ebuild, +files/mysql-workbench-5.2.33-gtkmm.patch: + Add patch to fix compilation with newer gtkmm versions, fixing bug 361645. 29 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org> mysql-workbench-5.2.31.ebuild, mysql-workbench-5.2.33.ebuild: diff --git a/dev-db/mysql-workbench/files/mysql-workbench-5.2.33-gtkmm.patch b/dev-db/mysql-workbench/files/mysql-workbench-5.2.33-gtkmm.patch new file mode 100644 index 000000000000..c2220bd43025 --- /dev/null +++ b/dev-db/mysql-workbench/files/mysql-workbench-5.2.33-gtkmm.patch @@ -0,0 +1,15 @@ +Patch to fix compilation with gtkmm-2.24.0. Taken from +http://bugs.mysql.com/bug.php?id=60603 + +diff -up mysql-workbench-gpl-5.2.33-src/frontend/linux/linux_utilities/toolbar_manager.cpp.gcc46 mysql-workbench-gpl-5.2.33-src/frontend/linux/linux_utilities/toolbar_manager.cpp +--- mysql-workbench-gpl-5.2.33-src/frontend/linux/linux_utilities/toolbar_manager.cpp.gcc46 2011-03-23 16:56:16.000000000 +0100 ++++ mysql-workbench-gpl-5.2.33-src/frontend/linux/linux_utilities/toolbar_manager.cpp 2011-03-23 17:07:36.000000000 +0100 +@@ -31,7 +31,7 @@ static Gtk::ComboBox *create_color_combo + } + + Glib::RefPtr<Gtk::ListStore> model= Gtk::ListStore::create(*color_combo_columns); +- Gtk::ComboBox *combo= new Gtk::ComboBox(model); ++ Gtk::ComboBox *combo= new Gtk::ComboBox((Glib::RefPtr<Gtk::TreeModel> &)model); + + combo->pack_start(color_combo_columns->image); + diff --git a/dev-db/mysql-workbench/mysql-workbench-5.2.33.ebuild b/dev-db/mysql-workbench/mysql-workbench-5.2.33.ebuild index 1b87eea273cf..f5739b918114 100644 --- a/dev-db/mysql-workbench/mysql-workbench-5.2.33.ebuild +++ b/dev-db/mysql-workbench/mysql-workbench-5.2.33.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-workbench/mysql-workbench-5.2.33.ebuild,v 1.3 2011/03/29 06:07:20 nirbheek Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-workbench/mysql-workbench-5.2.33.ebuild,v 1.4 2011/04/10 18:14:18 graaff Exp $ EAPI="3" GCONF_DEBUG="no" @@ -57,6 +57,7 @@ src_prepare() { epatch "${FILESDIR}/${PN}-5.2.31-python-libs.patch" epatch "${FILESDIR}/${P}-cpp.patch" + epatch "${FILESDIR}/${P}-gtkmm.patch" eautoreconf # Remove bundled ctemplate version to make sure we use the system |