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 | |
| 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')
3 files changed, 49 insertions, 3 deletions
diff --git a/dev-scheme/guile-gnome-platform/ChangeLog b/dev-scheme/guile-gnome-platform/ChangeLog index 098b52aeee06..24b31e048920 100644 --- a/dev-scheme/guile-gnome-platform/ChangeLog +++ b/dev-scheme/guile-gnome-platform/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-scheme/guile-gnome-platform # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-scheme/guile-gnome-platform/ChangeLog,v 1.7 2009/07/17 13:15:28 hkbst Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-scheme/guile-gnome-platform/ChangeLog,v 1.8 2009/12/10 18:03:55 ulm Exp $ + + 10 Dec 2009; Ulrich Mueller <ulm@gentoo.org> + +files/2.16.1-conflicting-types.patch, guile-gnome-platform-2.16.1.ebuild: + Fix conflicting types issue with GTK+ 2.18. Patch from Rafael G. Martins + <rafael@rafaelmartins.com> in bug 293655. Proxy commit for + Tomás Touceda (chiiph). 17 Jul 2009; Marijn Schouten <hkBst@gentoo.org> guile-gnome-platform-2.16.1.ebuild: 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 diff --git a/dev-scheme/guile-gnome-platform/guile-gnome-platform-2.16.1.ebuild b/dev-scheme/guile-gnome-platform/guile-gnome-platform-2.16.1.ebuild index 9132a5f82a66..a7bf8da86201 100644 --- a/dev-scheme/guile-gnome-platform/guile-gnome-platform-2.16.1.ebuild +++ b/dev-scheme/guile-gnome-platform/guile-gnome-platform-2.16.1.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-scheme/guile-gnome-platform/guile-gnome-platform-2.16.1.ebuild,v 1.3 2009/07/17 13:15:28 hkbst Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-scheme/guile-gnome-platform/guile-gnome-platform-2.16.1.ebuild,v 1.4 2009/12/10 18:03:55 ulm Exp $ -inherit multilib +inherit eutils multilib DESCRIPTION="Guile Scheme code that wraps the GNOME developer platform" HOMEPAGE="http://www.gnu.org/software/guile-gnome" @@ -34,6 +34,12 @@ DEPEND="${RDEPEND} #needs guile with networking RESTRICT=test +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}/${PV}-conflicting-types.patch" +} + src_compile() { econf --disable-Werror emake guilegnomedir=/usr/share/guile/site \ |