diff options
| author |   Sven Wegener <swegener@gentoo.org> | 2008-10-26 12:18:10 +0000 |
|---|---|---|
| committer | Sven Wegener <swegener@gentoo.org> | 2008-10-26 12:18:10 +0000 |
| commit | 82ee2ad9731ba02a97d40b8e1d43a4cb3194e89e (patch) | |
| tree | 75ae08ce8c736f0a5214e353efdfdd14ab8c56f4 /dev-db/mysql-gui-tools | |
| parent | Stable on x86 (#244417) (diff) | |
| download | gentoo-2-82ee2ad9731ba02a97d40b8e1d43a4cb3194e89e.tar.gz gentoo-2-82ee2ad9731ba02a97d40b8e1d43a4cb3194e89e.tar.bz2 gentoo-2-82ee2ad9731ba02a97d40b8e1d43a4cb3194e89e.zip | |
Add patch to fix use of deprecated gtk+ API, fixes bug #240548.
(Portage version: 2.2_rc12/cvs/Linux 2.6.27 x86_64)
Diffstat (limited to 'dev-db/mysql-gui-tools')
3 files changed, 68 insertions, 3 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/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" \ |