diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2009-12-10 18:03:55 +0000 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2009-12-10 18:03:55 +0000 |
| commit | 76eea4a23d1d0c99f80edac961ecf1cf0d3b5297 (patch) | |
| tree | 02eee3d32e317e66cd8397f3bda78bc93e7c8121 /dev-scheme/guile-gnome-platform/files | |
| parent | x86 stable, bug 294958 (diff) | |
| download | gentoo-2-76eea4a23d1d0c99f80edac961ecf1cf0d3b5297.tar.gz gentoo-2-76eea4a23d1d0c99f80edac961ecf1cf0d3b5297.tar.bz2 gentoo-2-76eea4a23d1d0c99f80edac961ecf1cf0d3b5297.zip | |
Fix conflicting types issue with GTK+ 2.18, bug 293655.
(Portage version: 2.2_rc58/cvs/Linux i686)
Diffstat (limited to 'dev-scheme/guile-gnome-platform/files')
| -rw-r--r-- | dev-scheme/guile-gnome-platform/files/2.16.1-conflicting-types.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/dev-scheme/guile-gnome-platform/files/2.16.1-conflicting-types.patch b/dev-scheme/guile-gnome-platform/files/2.16.1-conflicting-types.patch new file mode 100644 index 000000000000..e470977acbc8 --- /dev/null +++ b/dev-scheme/guile-gnome-platform/files/2.16.1-conflicting-types.patch @@ -0,0 +1,34 @@ +http://bugs.gentoo.org/293655 + +--- guile-gnome-platform-2.16.1.orig/gtk/gnome/gw/gtk-support.c 2008-07-03 11:52:27.000000000 -0300 ++++ guile-gnome-platform-2.16.1/gtk/gnome/gw/gtk-support.c 2009-11-27 03:09:28.204506213 -0200 +@@ -1012,7 +1012,7 @@ + } + + GdkRectangle* +-gtk_widget_get_allocation (GtkWidget *widget) ++guile_gtk_widget_get_allocation (GtkWidget *widget) + { + GdkRectangle *ret = g_new (GdkRectangle, 1); + *ret = widget->allocation; +--- guile-gnome-platform-2.16.1.orig/gtk/gnome/gw/gtk-support.h 2008-04-09 19:10:40.000000000 -0300 ++++ guile-gnome-platform-2.16.1/gtk/gnome/gw/gtk-support.h 2009-11-27 03:08:29.385756221 -0200 +@@ -117,6 +117,6 @@ + guint _wrap_gtk_ui_manager_add_ui_from_string (GtkUIManager *ui, const gchar *string, GError **error); + + GdkWindow* gtk_widget_get_window (GtkWidget *widget); +-GdkRectangle* gtk_widget_get_allocation (GtkWidget *widget); ++GdkRectangle* guile_gtk_widget_get_allocation (GtkWidget *widget); + void _wrap_gtk_drag_dest_set (GtkWidget *widget, GtkDestDefaults flags, const GList *types, GdkDragAction actions); + GtkStateType gtk_widget_get_state (GtkWidget *widget); +--- guile-gnome-platform-2.16.1.orig/gtk/gnome/overrides/gtk.defs 2008-04-09 19:12:44.000000000 -0300 ++++ guile-gnome-platform-2.16.1/gtk/gnome/overrides/gtk.defs 2009-11-27 03:13:34.667506321 -0200 +@@ -848,7 +848,7 @@ + + (define-method get-allocation + (of-object "GtkWidget") +- (c-name "gtk_widget_get_allocation") ++ (c-name "guile_gtk_widget_get_allocation") + (return-type "GdkRectangle*")) ;; same as GtkAllocation + + (define-method get_state |