Fix conflicting types issue with GTK+ 2.18, bug 293655.

Package-Manager: portage-2.2_rc58/cvs/Linux i686

4 files changed, 62 insertions, 5 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/Manifest b/dev-scheme/guile-gnome-platform/Manifest
index fd5a40172d86..401a66de2de8 100644
--- a/dev-scheme/guile-gnome-platform/Manifest
+++ b/dev-scheme/guile-gnome-platform/Manifest
@@ -1,8 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 2.15.92-add-atk-overrides.patch 437 RMD160 75983d58ee52e301603e7313f6c0d3184f776db0 SHA1 d95ac9bf568f437a423a6e217cdde7daae56c2a7 SHA256 4f4a5b18137f653c124ad77f54684c58ff9f171f56b8e674c0255132e60c1e07
 AUX 2.15.92-add-cairo-fix-from-bzr.patch 3198 RMD160 4991a6e43864dfea8a9189d16a246059f3146119 SHA1 fa5d514c9cfaf45e209eb8d1f71d468ec6dacf57 SHA256 af7624f7a2b0ee679919c1e266201b30a80fd10873aa8d1b459774d39eb10fe1
+AUX 2.16.1-conflicting-types.patch 1584 RMD160 9d21ea18575bb2ff57184c8fc851adaff7a0a1e4 SHA1 102b65b5f945cf016bbe5092409c8e158e6169bb SHA256 8e7738a9f26622f046861b171aef4c01c4670ee89bc7d7aad3128956a7d33d11
 DIST guile-gnome-platform-2.15.92.tar.gz 1170363 RMD160 91e5cba1cdd1ae1f71375eb690cf4c3966d06657 SHA1 123c0706a9ec2aacedf07da2b418cf3b0397abcd SHA256 8c074906ac595ed05ba229aba60d941ea86ffc0ad1738a9ff2ac00bfc2eccc3d
 DIST guile-gnome-platform-2.16.1.tar.gz 3494333 RMD160 4723f091e015c4fca6986c48fa143e7fd3070631 SHA1 3cf7cc8de6f261e6cf48d34e691706fe4b7f1061 SHA256 4c0856d3a8310af5959fb123f3a011fc6bc1ec1cf0f125629f8a4a741871c57b
 EBUILD guile-gnome-platform-2.15.92.ebuild 1404 RMD160 990f4a1e5dd2d2325f142614b0df3b483a08c87b SHA1 5519d3e5bbc2d2767be6e95eef0a535261203ff9 SHA256 ef5a08da6d80bddb857350d0a60229be9c16c81a466a5854a0ba58d0d5f61e15
-EBUILD guile-gnome-platform-2.16.1.ebuild 1296 RMD160 ae4e16aab5a416c4c83879b6b588a61b9c366240 SHA1 7f94e35068d67d458d451406fe942288a009d31b SHA256 b83adbadbba8451209ca3cbd148303e6f462c3278b9eb065743672e4a54b3b2e
-MISC ChangeLog 1475 RMD160 e12ab0d1770fa0e3927bc3c099acc2aa4eaadabd SHA1 e59daf5ea261e144d5dcf7df6f9484e33e82e78a SHA256 66185d33b5688e668ba7ca3dbec38c4cac45422570c183e44a72abf4e36cd418
+EBUILD guile-gnome-platform-2.16.1.ebuild 1395 RMD160 78c59be223c331ad299efdfb794243c949de8f3a SHA1 ca1c78355d8d079b35235fef2cc7a0f74f66f2ff SHA256 5f6c1590e2fd105f6151a50ef36740bcbb78e70b9e135c1a662db0762bc9e96a
+MISC ChangeLog 1761 RMD160 ca50b2beed84fd9b881075d18099442bc9a88d34 SHA1 4023c9ff6a678ec327c4c30046c4b34c678c2252 SHA256 be7f5280da731bd461765527a710f5209d2afb20485c80cd80a8d35407456323
 MISC metadata.xml 223 RMD160 cb556324d8e509a2a56af1958c326b0da711ade8 SHA1 18aa01ac4384520fba95f5eea780172d83cc1bd2 SHA256 45f07161f92a53816a4ce5da22343f2688a2da30afb9dfc4008856295ea79ce9
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.10 (GNU/Linux)
+
+iEYEARECAAYFAkshOKoACgkQOeoy/oIi7uyWagCgrwSHx/Gr97MObPqsW5+hyiXS
+OkUAoKi4O8UxrO1/DrkFth1IsUzzQ+Se
+=dSIN
+-----END PGP SIGNATURE-----
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 \