Add patch to fix compilation with newer gtkmm versions, fixing bug 361645.

Package-Manager: portage-2.1.9.42/cvs/Linux x86_64

4 files changed, 29 insertions, 18 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/Manifest b/dev-db/mysql-workbench/Manifest
index aa8ff5955010..bf8438aba209 100644
--- a/dev-db/mysql-workbench/Manifest
+++ b/dev-db/mysql-workbench/Manifest
@@ -1,30 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX mysql-workbench-5.2.17-as-needed-modules.patch 817 RMD160 07a91a62a364ead59597317738df334a8773338a SHA1 60c17b4337adef0257e3c9dc9facefcc5b6364fe SHA256 2b2503059228381ff16135bb6bf9987807661215b8b45f91acb7c6c156c5d7da
 AUX mysql-workbench-5.2.17-python-libs.patch 853 RMD160 b2ca54f9342c082395c5b5cac92e6247362531b9 SHA1 405a46f1d15f8d428dc3e6f0eada4d36cc00bb93 SHA256 8625ec48e17d3871d37dce559118868edc840a235a0010b47ea4f1afb277872b
 AUX mysql-workbench-5.2.31-python-libs.patch 873 RMD160 f1af6477590b37ec78894dca991f8ede3fcf0bac SHA1 2bf2317c32fb365fc82e3346d3b4773426e0275d SHA256 7ddeb3cfd33c0a1460b3271f2fb3eb7b8cfa40496994b9288009bedb2cc3740a
 AUX mysql-workbench-5.2.33-cpp.patch 544 RMD160 f8c824dae64e1dd205e4c34b7ece25f9132ff7e0 SHA1 3d1f47e2a11407ebc9e8d1a95418f78bc794417a SHA256 ee2a9106b7b18d64478f9bfa1143705d5d8f1b839ce88f71a3c570d54aeec853
+AUX mysql-workbench-5.2.33-gtkmm.patch 863 RMD160 d0acabbde930656f03576027153bcda7cc84ba60 SHA1 69c1bc26b5887cea4714a462c9f5c270ac9b5712 SHA256 00102fbd57977f7d064c336ee43314aa102c2586d650c3d14f709067a2594c1c
 DIST mysql-workbench-gpl-5.2.31-src.tar.gz 17971254 RMD160 14d9377eb34a26b2f0331be810ff9cb90d43e6cb SHA1 34682612b6f67391774e9ba20b09f3af899a002b SHA256 520cc9301dda288a574284d25c2bda007aff91d86a0f5c828bab179bc488ad85
 DIST mysql-workbench-gpl-5.2.33-src.tar.gz 17875492 RMD160 37d00323e72c1bd552470a03d39689daeb2b1746 SHA1 5448be93a39a062777385ecd09c8ce3f2f000214 SHA256 acd1b79e6fc90642c7d58a2d80f525c311b470749d45f7d5f6a33a0efe8c71a4
 EBUILD mysql-workbench-5.2.31.ebuild 1878 RMD160 b46ce253a28761fefd3efdb76e39904b05291107 SHA1 ccbdd7585d0177ad3a4c5c41237f103d9f97716c SHA256 eda49be69a45393e8511fd6da08436cee194164b474812592741952d98ff076b
-EBUILD mysql-workbench-5.2.33.ebuild 2030 RMD160 792a1d33ea1cbf5b464f67460db06f4d02354484 SHA1 390aed2458e0d2fd7523bb43089c809d475dbccb SHA256 59fe377e970ed09b46855de57e8f8d7dbe85f329f6f30c3fa6d44e005b6f5b6c
-MISC ChangeLog 6982 RMD160 923c0b0404eaba9881abc7582084054ef0da874e SHA1 100e003b3d94e711821542eb75a2390ae46c6dd4 SHA256 e45a19557f131ab52db1bb799445d4c74922a68684826954fe6e2440a25e0326
+EBUILD mysql-workbench-5.2.33.ebuild 2067 RMD160 f7ec85413bd86c160e62f4076bf64388ff174500 SHA1 d5d2b6dea430defc58d2357982c9bef7d6dadc1e SHA256 640628e4b04ec2fb9268690600067cccabaa36d85c9a37c95c304e0a494590e9
+MISC ChangeLog 7184 RMD160 5654545974295bab32f2da794c6ce4851cebb600 SHA1 70692cb6d780dabc7066904db425c20ad54c62e9 SHA256 0037414db5a0bd25c8850163d76e810da20436061ecb7d359610ee126d7bcd51
 MISC metadata.xml 222 RMD160 c395116c51764efaa671a0f89a7d8992ecbe7304 SHA1 2095e0ced2657346964271e45cc69027b0ccd49d SHA256 0adb6b2a2a8cc78f3d28b8b629db9d9e5731f21da86168ae88eeadc8b82d3225
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJNkXcfAAoJEO/kOhxWD91kbiYP/jZ5AeCW6frghm9KTPHBUm3/
-Pb0NuhUfQeYITWZcNMMwt4ZmZJPeHds0c2UZ2B7N9O0TobPH0+Qn9onIACsm7eBa
-PCG3D6dUOjAgAb+6tw3euWNAEmMWZ97/8Z6rKEo5Ndd/9BEHc9F9L1Q08XcHR0TD
-VVcDPzZaK+q990rF2N14yUTXFBElNVoF7wFo5uASfmqJwD9Ob9sJHd0NVnUDCb6s
-b08icqwWiXchA68yhnKF6vZuL8wy/rduR3FSuK2VBeZY9wM4NB9Dogcl8/L7Z25y
-VB8ajWJP4I78SWu1S2Wca1W/X874te2UljzYQpVerJEk9bGjal1MP2C+q6mOR5Pu
-qJWoacAsoYld5Rk6XGIzbiph0XgmncLbnexgL9o77zfmsPs5fXVyt2Qb/0CukMND
-q0gn/ba3HgN3BNmdbCdX8xCxLnLRm5/kZJl5TJJbJaYhrl6Xlh78KdKVrT5PUILV
-BjfzRzHYnoz8FXjT56rZ2gQxBdniXufiZ596admKFngl7YUIHhKacJc+Tp9mVGUo
-oXs3Jt3ZxXoat4MMS7M3HTPMGVAmnFoCx/43A7UoMgTDm/Pgthn+MYLxvyMmWJlh
-7PabClF4XsddsjCeIWOyk325F+2+4zp/GAEfndRiFVdkhGjiZIL+dPByhxv6PXk2
-JNLkuA+wib2UXclPw8xa
-=OQPK
+iF4EAREIAAYFAk2h84cACgkQrnu0mw69JkrJHQD+JMy9HUszjUfCg+QfzBbJ0DK7
+6u9tPz9tuIjfG3YqgRwA/1xInjWcMm6oityPlQPHrw20Y0PMRrDbfC0TZdU/fyK3
+=nLgq
 -----END PGP SIGNATURE-----
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