Add patch to fix use of deprecated gtk+ API, fixes bug #240548.

Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.27 x86_64

4 files changed, 81 insertions, 5 deletions

diff --git a/dev-db/mysql-gui-tools/ChangeLog b/dev-db/mysql-gui-tools/ChangeLog
index 28828d3cb298..d7181c4b6064 100644
--- a/dev-db/mysql-gui-tools/ChangeLog
+++ b/dev-db/mysql-gui-tools/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-db/mysql-gui-tools
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-gui-tools/ChangeLog,v 1.27 2008/08/17 04:13:08 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-gui-tools/ChangeLog,v 1.28 2008/10/26 12:18:10 swegener Exp $
+
+  26 Oct 2008; Sven Wegener <swegener@gentoo.org>
+  +files/mysql-gui-tools-5.0_p12-deprecated-gtk+-api.patch,
+  mysql-gui-tools-5.0_p12-r2.ebuild:
+  Add patch to fix use of deprecated gtk+ API, fixes bug #240548.
 
   17 Aug 2008; Michael Sterrett <mr_bones_@gentoo.org>
   -files/mysql-gui-tools-5.0_p12-workbench-lua.patch,
diff --git a/dev-db/mysql-gui-tools/Manifest b/dev-db/mysql-gui-tools/Manifest
index bbfdffa3a6af..6eeaf898b6d7 100644
--- a/dev-db/mysql-gui-tools/Manifest
+++ b/dev-db/mysql-gui-tools/Manifest
@@ -1,9 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX mysql-gui-tools-5.0_p12-deprecated-gtk+-api.patch 4974 RMD160 de60ab5dcc6479b82dc07337d4a67fd2a7b7d10b SHA1 b59073272865b111f30b58fac0b5f0b061d80e86 SHA256 88f61ff309afc0b210cab1f5bdef1d512c4cb6616550a028ae9f1d41f7da961a
 AUX mysql-gui-tools-5.0_p12-gcc-4.3.patch 1189 RMD160 939152bbcbd99372351023fdf61441326235a763 SHA1 21b827334555ffd30f5d1991d9be381fa800b4d8 SHA256 507d029d23c7d180418831e6f61a9ec53b8461891a0493689909c61fc60e6939
 AUX mysql-gui-tools-5.0_p12-libsigc++-2.2.patch 8320 RMD160 b6f1a5f946fa371f9ce484af6ca839dedd46bec7 SHA1 7b2146726ec939ccda449a3ddbc127eab823b5ec SHA256 9844dcb8b7b9c1ea2d092c6afa4cb2a46b994b6ae8c3654932b4e24cf8d24048
 AUX mysql-gui-tools-5.0_p12-query-browser-sps.patch 313 RMD160 c2b2727f8cab0946659b1cc39ae1d2983a50e4f0 SHA1 ce78c02e84e029199b7d8ea73a8b53f67d32b38b SHA256 a68fce4a3d4f51f9ad9d3c743fa9bb7be59356eaf2f21a7cc6f1735fd5528c8b
 AUX mysql-gui-tools-5.0_p8-i18n-fix.patch 354 RMD160 660c2f3715e655c5473738c8c69be69c5e3d2a81 SHA1 eb700f0d691fa7d6a69db3f51059844b9855215f SHA256 9abc2cb8370b4f550718c6500be717951c527e6dca9f9530be534a5f8db09447
 AUX mysql-gui-tools-5.0_p8-lua-modules.patch 672 RMD160 6a5aed0f34bb2d4bada62851dfb18ba329693e47 SHA1 d6b13610e25bbe3e22af040fc3c46d25564f0693 SHA256 2e3e271de504562db3f3d3ef33297ce454a6e1a223f98e4c4480cb2361dcbf28
 DIST mysql-gui-tools-5.0r12.tar.gz 25357550 RMD160 ea94545c0e351e86112b13a43479aba361bc2cef SHA1 3fdd3a80c634f0aa9fa8f3bc505add18f360dc6c SHA256 4ede2e8073ab3ffa9371c3ad258eec433e8bdea876aa3db6b85e26072eb2cf7e
-EBUILD mysql-gui-tools-5.0_p12-r2.ebuild 2725 RMD160 9aed2af081b8b844e3d1bfb757af23ec7dc9980d SHA1 d4143553d4f2145b7966bc0346841c1f3a3cb12a SHA256 75e7a79d4cf58b01d624e12b9211eed8c782f57a645ed0f29ab7dbcd8635db62
-MISC ChangeLog 5122 RMD160 90b309c96c5ee9b0227b63b6478bdc03471cc00d SHA1 1044c6e8bf9b8cdc504036b65c3c798965b5a4b7 SHA256 8976a72a57baaac0e374baf8050e5b63750eb55f47df78837057908505e2fed4
+EBUILD mysql-gui-tools-5.0_p12-r2.ebuild 2773 RMD160 96b832876797015bacc65f4ebd647f4472c2c96c SHA1 e4e906c1affc099f9c810a77303cb118c3bc1170 SHA256 107602c2c5fb6beab14177cb909fcb5c6acc1e0301c404816d101e2fb807855b
+MISC ChangeLog 5335 RMD160 0a89012f7c1e7e9725d71574466b52ccdef19512 SHA1 0bd0a554152d6877a086434aad1571b251e533c0 SHA256 b4ead917b634ed08f4c340874b03d88a7ed8dbd7305967218db07b6fbff4c30d
 MISC metadata.xml 433 RMD160 00b52a4a1d7d67beb63b23e2cf7541b3849594de SHA1 9fe6c230cad179e8e8109719cb332d64a58f50c6 SHA256 29a10e9d7bd0d3dcc7b8ddc354c532efc9158a7e39940f253ba8f7dd0a71c804
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkkEYAoACgkQI1lqEGTUzyTpQwCgjErAiEzU47gw+fovyi7HTG+k
+Gx4An1fExSNITY8PxJkRM9rfOKvNRhB0
+=0fvU
+-----END PGP SIGNATURE-----
diff --git a/dev-db/mysql-gui-tools/files/mysql-gui-tools-5.0_p12-deprecated-gtk+-api.patch b/dev-db/mysql-gui-tools/files/mysql-gui-tools-5.0_p12-deprecated-gtk+-api.patch
new file mode 100644
index 000000000000..a0ec2a135c1e
--- /dev/null
+++ b/dev-db/mysql-gui-tools/files/mysql-gui-tools-5.0_p12-deprecated-gtk+-api.patch
@@ -0,0 +1,59 @@
+Index: mysql-query-browser/source/linux/gtksourceview/gtksourceview/gtksourcelanguage.h
+===================================================================
+--- mysql-query-browser/source/linux/gtksourceview/gtksourceview/gtksourcelanguage.h	(revision 488)
++++ mysql-query-browser/source/linux/gtksourceview/gtksourceview/gtksourcelanguage.h	(working copy)
+@@ -30,10 +30,10 @@
+ G_BEGIN_DECLS

+ 

+ #define GTK_TYPE_SOURCE_LANGUAGE		(gtk_source_language_get_type ())

+-#define GTK_SOURCE_LANGUAGE(obj)		(GTK_CHECK_CAST ((obj), GTK_TYPE_SOURCE_LANGUAGE, GtkSourceLanguage))

+-#define GTK_SOURCE_LANGUAGE_CLASS(klass)	(GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_SOURCE_LANGUAGE, GtkSourceLanguageClass))

+-#define GTK_IS_SOURCE_LANGUAGE(obj)		(GTK_CHECK_TYPE ((obj), GTK_TYPE_SOURCE_LANGUAGE))

+-#define GTK_IS_SOURCE_LANGUAGE_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SOURCE_LANGUAGE))

++#define GTK_SOURCE_LANGUAGE(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SOURCE_LANGUAGE, GtkSourceLanguage))

++#define GTK_SOURCE_LANGUAGE_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SOURCE_LANGUAGE, GtkSourceLanguageClass))

++#define GTK_IS_SOURCE_LANGUAGE(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SOURCE_LANGUAGE))

++#define GTK_IS_SOURCE_LANGUAGE_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SOURCE_LANGUAGE))

+ #define GTK_SOURCE_LANGUAGE_GET_CLASS(obj)      (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_SOURCE_LANGUAGE, GtkSourceLanguageClass))

+ 

+ 

+Index: mysql-query-browser/source/linux/gtksourceview/gtksourceview/gtksourcelanguagesmanager.h
+===================================================================
+--- mysql-query-browser/source/linux/gtksourceview/gtksourceview/gtksourcelanguagesmanager.h	(revision 488)
++++ mysql-query-browser/source/linux/gtksourceview/gtksourceview/gtksourcelanguagesmanager.h	(working copy)
+@@ -27,10 +27,10 @@
+ G_BEGIN_DECLS

+ 

+ #define GTK_TYPE_SOURCE_LANGUAGES_MANAGER		(gtk_source_languages_manager_get_type ())

+-#define GTK_SOURCE_LANGUAGES_MANAGER(obj)		(GTK_CHECK_CAST ((obj), GTK_TYPE_SOURCE_LANGUAGES_MANAGER, GtkSourceLanguagesManager))

+-#define GTK_SOURCE_LANGUAGES_MANAGER_CLASS(klass)	(GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_SOURCE_LANGUAGES_MANAGER, GtkSourceLanguagesManagerClass))

+-#define GTK_IS_SOURCE_LANGUAGES_MANAGER(obj)		(GTK_CHECK_TYPE ((obj), GTK_TYPE_SOURCE_LANGUAGES_MANAGER))

+-#define GTK_IS_SOURCE_LANGUAGES_MANAGER_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SOURCE_LANGUAGES_MANAGER))

++#define GTK_SOURCE_LANGUAGES_MANAGER(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SOURCE_LANGUAGES_MANAGER, GtkSourceLanguagesManager))

++#define GTK_SOURCE_LANGUAGES_MANAGER_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SOURCE_LANGUAGES_MANAGER, GtkSourceLanguagesManagerClass))

++#define GTK_IS_SOURCE_LANGUAGES_MANAGER(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SOURCE_LANGUAGES_MANAGER))

++#define GTK_IS_SOURCE_LANGUAGES_MANAGER_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SOURCE_LANGUAGES_MANAGER))

+ 

+ 

+ typedef struct _GtkSourceLanguagesManager		GtkSourceLanguagesManager;

+Index: mysql-query-browser/source/linux/gtksourceview/gtksourceview/gtksourceundomanager.h
+===================================================================
+--- mysql-query-browser/source/linux/gtksourceview/gtksourceview/gtksourceundomanager.h	(revision 488)
++++ mysql-query-browser/source/linux/gtksourceview/gtksourceview/gtksourceundomanager.h	(working copy)
+@@ -29,11 +29,11 @@
+ #include <gtk/gtktextbuffer.h>

+ 

+ #define GTK_SOURCE_TYPE_UNDO_MANAGER             	(gtk_source_undo_manager_get_type ())

+-#define GTK_SOURCE_UNDO_MANAGER(obj)			(GTK_CHECK_CAST ((obj), GTK_SOURCE_TYPE_UNDO_MANAGER, GtkSourceUndoManager))

+-#define GTK_SOURCE_UNDO_MANAGER_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), GTK_SOURCE_TYPE_UNDO_MANAGER, GtkSourceUndoManagerClass))

+-#define GTK_SOURCE_IS_UNDO_MANAGER(obj)			(GTK_CHECK_TYPE ((obj), GTK_SOURCE_TYPE_UNDO_MANAGER))

+-#define GTK_SOURCE_IS_UNDO_MANAGER_CLASS(klass)  	(GTK_CHECK_CLASS_TYPE ((klass), GTK_SOURCE_TYPE_UNDO_MANAGER))

+-#define GTK_SOURCE_UNDO_MANAGER_GET_CLASS(obj)  	(GTK_CHECK_GET_CLASS ((obj), GTK_SOURCE_TYPE_UNDO_MANAGER, GtkSourceUndoManagerClass))

++#define GTK_SOURCE_UNDO_MANAGER(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_SOURCE_TYPE_UNDO_MANAGER, GtkSourceUndoManager))

++#define GTK_SOURCE_UNDO_MANAGER_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), GTK_SOURCE_TYPE_UNDO_MANAGER, GtkSourceUndoManagerClass))

++#define GTK_SOURCE_IS_UNDO_MANAGER(obj)			(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_SOURCE_TYPE_UNDO_MANAGER))

++#define GTK_SOURCE_IS_UNDO_MANAGER_CLASS(klass)  	(G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_SOURCE_TYPE_UNDO_MANAGER))

++#define GTK_SOURCE_UNDO_MANAGER_GET_CLASS(obj)  	(G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_SOURCE_TYPE_UNDO_MANAGER, GtkSourceUndoManagerClass))

+ 

+ 

+ typedef struct _GtkSourceUndoManager        	GtkSourceUndoManager;

diff --git a/dev-db/mysql-gui-tools/mysql-gui-tools-5.0_p12-r2.ebuild b/dev-db/mysql-gui-tools/mysql-gui-tools-5.0_p12-r2.ebuild
index fb76667ea729..15bc49436efd 100644
--- a/dev-db/mysql-gui-tools/mysql-gui-tools-5.0_p12-r2.ebuild
+++ b/dev-db/mysql-gui-tools/mysql-gui-tools-5.0_p12-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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-r2.ebuild,v 1.5 2008/08/17 04:13:08 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-gui-tools/mysql-gui-tools-5.0_p12-r2.ebuild,v 1.6 2008/10/26 12:18:10 swegener Exp $
 
 GCONF_DEBUG="no"
 
@@ -62,7 +62,8 @@ src_unpack() {
 		"${FILESDIR}"/${PN}-5.0_p8-lua-modules.patch \
 		"${FILESDIR}"/${P}-query-browser-sps.patch \
 		"${FILESDIR}"/${P}-libsigc++-2.2.patch \
-		"${FILESDIR}"/${P}-gcc-4.3.patch
+		"${FILESDIR}"/${P}-gcc-4.3.patch \
+		"${FILESDIR}"/${P}-deprecated-gtk+-api.patch
 
 	sed -i \
 		-e "s/\\(^\\|[[:space:]]\\)-ltermcap\\($\\|[[:space:]]\\)/ /g" \