Add patch from bug 412157 since glib 2.32 compilation isn't actually fixed in the released version.

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

4 files changed, 118 insertions, 7 deletions

diff --git a/dev-db/mysql-workbench/ChangeLog b/dev-db/mysql-workbench/ChangeLog
index e89cc3fe5b85..59455d0e1500 100644
--- a/dev-db/mysql-workbench/ChangeLog
+++ b/dev-db/mysql-workbench/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-db/mysql-workbench
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-workbench/ChangeLog,v 1.56 2012/04/16 18:50:31 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-workbench/ChangeLog,v 1.57 2012/04/17 18:19:20 graaff Exp $
+
+  17 Apr 2012; Hans de Graaff <graaff@gentoo.org>
+  mysql-workbench-5.2.39.ebuild, +files/mysql-workbench-5.2.39-glib-2.32.patch:
+  Add patch from bug 412157 since glib 2.32 compilation isn't actually fixed in
+  the released version.
 
 *mysql-workbench-5.2.39 (16 Apr 2012)
 
diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest
index 3f9ca545b690..4b2bed36dac7 100644
--- a/dev-db/mysql-workbench/Manifest
+++ b/dev-db/mysql-workbench/Manifest
@@ -3,6 +3,7 @@ Hash: SHA256
 
 AUX mysql-workbench-5.2.31-python-libs.patch 873 RMD160 f1af6477590b37ec78894dca991f8ede3fcf0bac SHA1 2bf2317c32fb365fc82e3346d3b4773426e0275d SHA256 7ddeb3cfd33c0a1460b3271f2fb3eb7b8cfa40496994b9288009bedb2cc3740a
 AUX mysql-workbench-5.2.34-gcc46.patch 617 RMD160 8c71980999b7f5caa98c200411bfefc220fec245 SHA1 18948ed74b1e60614ed7aaa00850515919ec6637 SHA256 6d0d9302e0f3682a6b9cb91c42955eacf60389881f3b531f65526b2b099baebd
+AUX mysql-workbench-5.2.39-glib-2.32.patch 2882 RMD160 f8323e42a70f04f6960b2a298d1eb6503ce8d5f1 SHA1 5378679dfe40bf6aa3d610e8c069ae143d57043b SHA256 28d2d13813a1ac3c071ba58eec7658fca04cf2886091e2cec06ae70946d35c65
 DIST mysql-workbench-gpl-5.2.35-src.tar.gz 17874329 RMD160 6207d7350cf1ea7a426ece90dabb4b7caab072a2 SHA1 74c2dddba06e4b233f3b28acf8be45f0394310f2 SHA256 3681351af061637ce54dcc1b490325e9a4a0b42127e642e60220845fcfc2cbaa
 DIST mysql-workbench-gpl-5.2.37-src.tar.gz 18554877 RMD160 f08369149b5ba3c6890bfbbb29e9087b57ee709a SHA1 5031f0436b01b756bc272d154eb0f6c67b222098 SHA256 44a110ced2877ded14d57d6b217cf03a9a7e83f9f5376ead1872fd01c2685744
 DIST mysql-workbench-gpl-5.2.38-src.tar.gz 18640435 RMD160 ff1ef75099f1d0b2669ab9ff77121f652513e265 SHA1 6b92140e041642761f4ebee1c8a928ab34f6889a SHA256 223fb450110bcb720c6393a1b7ab0769425f02612f3e0613163970705043e448
@@ -10,13 +11,13 @@ DIST mysql-workbench-gpl-5.2.39-src.tar.gz 18904504 RMD160 af9782af37150fca03538
 EBUILD mysql-workbench-5.2.35.ebuild 2129 RMD160 bb2a1433233b69b64f38cbce35394f597a0d031e SHA1 7c0236c910ebac5d8f3c5ffbc81e3c289e3db8fb SHA256 0d70a99330fac65bd682e0d90f3ea5ae98cd0be00777034800178decd32d0086
 EBUILD mysql-workbench-5.2.37.ebuild 2346 RMD160 6288bb37e01d2a80fec3e29f0c688ee02bc2d750 SHA1 9890e801dd7a397ef93b0c74a2f0ce65c46d61c0 SHA256 ff20405973453ba6624a2ab0134e583c1feeeccb8a2c2f2e6b53eee1842da9c5
 EBUILD mysql-workbench-5.2.38.ebuild 2346 RMD160 2ba3f0b8319085fd9a54d45d2af1e6ff8968159c SHA1 9821b5a1c78d9c48885f75fc880a99e36c760d03 SHA256 3fee06c98ca7b2878a56ea3ebf2afb738461abfcdbcf44e3e138f3e54d841504
-EBUILD mysql-workbench-5.2.39.ebuild 2346 RMD160 de3d75e12e6ff1804f577a18ebe97ae92d001403 SHA1 1e365af4e05f70b32dfc46563b70123e515c35bd SHA256 9c7138560e2e7e7d863358f4c905843de6653798ff649fb295a4a67a445e13c4
-MISC ChangeLog 10253 RMD160 0818432fd147cbfe3577631b5bdcb8b66e68e300 SHA1 cb2f6305382f29f9cf88bfd2ecda18183e46b71c SHA256 21a77e033f54496a421a7e4d088302163b1fba1bdd8e37e3a4ed2acd044d8de8
+EBUILD mysql-workbench-5.2.39.ebuild 2390 RMD160 83cdb08c5c03adebca0f3b85a8a925fb533cfa86 SHA1 0037bb1e2649f59d34eb81aa5a4f439070bac0ab SHA256 0d44c831ba06d0c0bc78cd05d65726f8b530209cda88de6e6c367c494b8f98a5
+MISC ChangeLog 10488 RMD160 157fa417acc8421551577332082133ac47b5065f SHA1 9ad9770d72423dccb210e593322a764b0881cf4d SHA256 9071cb1af0917adb9ea1e717e45206e9c99aa3506840f893f737cf7cf1d650d8
 MISC metadata.xml 201 RMD160 bbf7920d9809941fb024d20016dbe2fb9f15ff97 SHA1 e629d21795e99a77bd0a6aded1a153fd12d5b2c5 SHA256 c90b12c6600840878686d4544dbc51d97b0715add76b40d9400415cdef6324ad
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk+Maf4ACgkQiIP6VqMIqNfHcQD+JKd2NnwTfpkYgsfNpJhI7Ch8
-qPqbAykJJgG2A2QcoGIA/iYtLsrCE/wftK0tkRRgc9M+LPAPoNUCawG1tPiCDYo5
-=gA0w
+iF4EAREIAAYFAk+NtC8ACgkQiIP6VqMIqNfpnwD/QqdFJEaK7acpFB+aU3xpJd2S
+wrZftGF6vGVoGIronrEA+QEta7ZWs2v7z9oKt9PKvq7AvCbCGXsiU+W4+FUYPiz1
+=encY
 -----END PGP SIGNATURE-----
diff --git a/dev-db/mysql-workbench/files/mysql-workbench-5.2.39-glib-2.32.patch b/dev-db/mysql-workbench/files/mysql-workbench-5.2.39-glib-2.32.patch
new file mode 100644
index 000000000000..a07f16f30684
--- /dev/null
+++ b/dev-db/mysql-workbench/files/mysql-workbench-5.2.39-glib-2.32.patch
@@ -0,0 +1,103 @@
+Allow compilation with glib 2.32.
+
+Patch by goeland86@gmail.com in bug 412157
+
+--- library/canvas/src/mdc_canvas_view.h	2012-02-21 17:53:45.000000000 +0100
++++ library/canvas/src/mdc_canvas_view_new.h	2012-04-15 21:34:19.000000000 +0200
+@@ -28,7 +28,7 @@
+ #include "mdc_selection.h"
+ 
+ #ifndef _WIN32
+-#include <glib/gthread.h>
++#include <glib.h>
+ #endif
+ 
+ BEGIN_MDC_DECLS
+--- library/canvas/src/stdafx.h	2012-02-21 17:53:46.000000000 +0100
++++ library/canvas/src/stdafx.new.h	2012-04-15 22:18:14.000000000 +0200
+@@ -52,7 +52,7 @@
+ #include <gl/gl.h>
+ #include <gl/glu.h>
+ 
+-#include <glib/gthread.h>
++#include <glib.h>
+ 
+ #endif // _WIN32
+ 
+--- library/canvas/src/mdc_canvas_view_printing.cpp	2012-04-15 22:17:38.000000000 +0200
++++ library/canvas/src/mdc_canvas_view_printing.new.cpp	2012-04-15 22:14:49.000000000 +0200
+@@ -21,7 +21,7 @@
+ 
+ #include "mdc_canvas_view.h"
+ #include "mdc_canvas_view_printing.h"
+-#include <glib/gmessages.h>
++#include <glib.h>
+ 
+ #ifdef _WIN32
+ #include <cairo/cairo-win32.h>
+
+--- library/grt/src/grtpp_util.new.cpp	2012-04-15 22:57:55.000000000 +0200
++++ library/grt/src/grtpp_util.cpp	2012-02-21 17:53:44.000000000 +0100
+@@ -25,7 +25,7 @@
+ #include "grtpp_util.h"
+ #include "base/string_utilities.h"
+ 
+-#include <glib/gbase64.h>
++#include <glib.h>
+ #include <functional>
+ 
+ using namespace grt;
+
+--- backend/wbprivate/sqlide/wb_live_schema_tree.h	2012-02-21 17:53:39.000000000 +0100
++++ backend/wbprivate/sqlide/wb_live_schema_tree.new.h	2012-04-15 23:41:01.000000000 +0200
+@@ -24,7 +24,7 @@
+ #include "grtpp.h"
+ #include "workbench/wb_backend_public_interface.h"
+ #include "base/string_utilities.h"
+-#include <glib/gpattern.h>
++#include <glib.h>
+ 
+ namespace wb
+ {
+
+--- modules/db.mysql.sqlparser/src/mysql_sql_parser_fe.cpp	2012-02-21 17:53:37.000000000 +0100
++++ modules/db.mysql.sqlparser/src/mysql_sql_parser_fe.new.cpp	2012-04-16 00:33:55.000000000 +0200
+@@ -20,7 +20,7 @@
+ 
+ #include "stdafx.h"
+ 
+-#include <glib/gunicode.h>
++#include <glib.h>
+ #include "grt/common.h"
+ #include "grt/grt_manager.h"
+ #include "grtdb/charset_utils.h"
+@@ -651,4 +651,4 @@
+     return versioning_comment_subst_token;
+   else
+     return token;
+-}
+\ No newline at end of file
++}
+
+--- modules/db.mysql.sqlparser/src/stdafx.h	2012-02-21 17:53:46.000000000 +0100
++++ modules/db.mysql.sqlparser/src/stdafx.new.h	2012-04-16 00:35:10.000000000 +0200
+@@ -32,7 +32,7 @@
+ #include <algorithm>
+ #include <sstream>
+ #include <fstream>
+-#include <glib/gunicode.h>
++#include <glib.h>
+ #include <map>
+ #include "direct.h"
+ 
+--- plugins/db.mysql/backend/db_plugin_be.cpp	2012-02-21 17:53:41.000000000 +0100
++++ plugins/db.mysql/backend/db_plugin_be.new.cpp	2012-04-16 01:39:48.000000000 +0200
+@@ -31,7 +31,7 @@
+ #include "grts/structs.db.h"
+ #include "base/string_utilities.h"
+ 
+-#include <glib/gunicode.h>
++#include <glib.h>
+ 
+ void Db_plugin::grtm(bec::GRTManager *grtm)
+ {
diff --git a/dev-db/mysql-workbench/mysql-workbench-5.2.39.ebuild b/dev-db/mysql-workbench/mysql-workbench-5.2.39.ebuild
index 43abdfb12c79..53ce5e17d5c7 100644
--- a/dev-db/mysql-workbench/mysql-workbench-5.2.39.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-5.2.39.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.39.ebuild,v 1.1 2012/04/16 18:50:31 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-workbench/mysql-workbench-5.2.39.ebuild,v 1.2 2012/04/17 18:19:20 graaff Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -73,6 +73,8 @@ src_prepare() {
 	# 357539.
 	rm -rf ext/ctemplate || die
 	mkdir -p ext/ctemplate/ctemplate-src || die
+
+	epatch "${FILESDIR}/${P}-glib-2.32.patch"
 }
 
 src_configure() {