Let it compile against glib-2.32

(Portage version: 2.1.11.9/cvs/Linux x86_64)

4 files changed, 36 insertions, 4 deletions

diff --git a/dev-scheme/guile-gnome-platform/ChangeLog b/dev-scheme/guile-gnome-platform/ChangeLog
index f15726d39371..c282e5eea6e2 100644
--- a/dev-scheme/guile-gnome-platform/ChangeLog
+++ b/dev-scheme/guile-gnome-platform/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-scheme/guile-gnome-platform
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/guile-gnome-platform/ChangeLog,v 1.17 2012/05/03 02:46:49 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/guile-gnome-platform/ChangeLog,v 1.18 2012/07/21 13:33:28 pacho Exp $
+
+  21 Jul 2012; Pacho Ramos <pacho@gentoo.org>
+  +files/2.16.1-glib-single-include.patch,
+  guile-gnome-platform-2.16.1-r1.ebuild, guile-gnome-platform-2.16.1.ebuild:
+  Let it compile against glib-2.32
 
   03 May 2012; Jeff Horelick <jdhore@gentoo.org>
   guile-gnome-platform-2.16.1.ebuild, guile-gnome-platform-2.16.1-r1.ebuild:
@@ -82,4 +87,3 @@
   +guile-gnome-platform-2.15.92.ebuild:
   Add Guile Scheme code that wraps the GNOME developer platform. The cairo fix
   is from upstream bzr, but the atk fix hasn't yet made its way upstream.
-
diff --git a/dev-scheme/guile-gnome-platform/files/2.16.1-glib-single-include.patch b/dev-scheme/guile-gnome-platform/files/2.16.1-glib-single-include.patch
new file mode 100644
index 000000000000..84f8c8761fbc
--- /dev/null
+++ b/dev-scheme/guile-gnome-platform/files/2.16.1-glib-single-include.patch
@@ -0,0 +1,26 @@
+Index: guile-gnome-platform-2.16.1/corba/gnome/corba/guile-gnome-corba-generic.c
+===================================================================
+--- guile-gnome-platform-2.16.1.orig/corba/gnome/corba/guile-gnome-corba-generic.c
++++ guile-gnome-platform-2.16.1/corba/gnome/corba/guile-gnome-corba-generic.c
+@@ -24,7 +24,7 @@
+ 
+ #include <guile-gnome-corba-generic.h>
+ #include <guile-gnome-gobject.h>
+-#include <glib/gstrfuncs.h>
++#include <glib.h>
+ #include <string.h>
+ 
+ static GQuark quark_corba_typecode = 0;
+Index: guile-gnome-platform-2.16.1/glib/gnome/gobject/guile-support.h
+===================================================================
+--- guile-gnome-platform-2.16.1.orig/glib/gnome/gobject/guile-support.h
++++ guile-gnome-platform-2.16.1/glib/gnome/gobject/guile-support.h
+@@ -24,7 +24,7 @@
+ #ifndef __GUILE_SUPPORT_H__
+ #define __GUILE_SUPPORT_H__
+ 
+-#include <glib/gmacros.h>
++#include <glib.h>
+ 
+ #include <libguile.h>
+ 
diff --git a/dev-scheme/guile-gnome-platform/guile-gnome-platform-2.16.1-r1.ebuild b/dev-scheme/guile-gnome-platform/guile-gnome-platform-2.16.1-r1.ebuild
index ecd2f33baa81..2b221d0743b9 100644
--- a/dev-scheme/guile-gnome-platform/guile-gnome-platform-2.16.1-r1.ebuild
+++ b/dev-scheme/guile-gnome-platform/guile-gnome-platform-2.16.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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-r1.ebuild,v 1.2 2012/05/03 02:46:49 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/guile-gnome-platform/guile-gnome-platform-2.16.1-r1.ebuild,v 1.3 2012/07/21 13:33:28 pacho Exp $
 
 EAPI=4
 
@@ -46,6 +46,7 @@ src_prepare() {
 		"${FILESDIR}/${PV}-conflicting-types.patch"
 		"${FILESDIR}/${PV}-gcc45.patch"
 		"${FILESDIR}/${PV}-gdk-color.patch"
+		"${FILESDIR}/${PV}-glib-single-include.patch"
 		)
 	autotools-utils_src_prepare
 }
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 6a97866a9a80..622d43a4a76c 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,6 +1,6 @@
 # Copyright 1999-2012 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.11 2012/05/03 02:46:49 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/guile-gnome-platform/guile-gnome-platform-2.16.1.ebuild,v 1.12 2012/07/21 13:33:28 pacho Exp $
 
 EAPI="3"
 
@@ -39,6 +39,7 @@ RESTRICT=test
 src_prepare() {
 	epatch "${FILESDIR}/${PV}-conflicting-types.patch"
 	epatch "${FILESDIR}/${PV}-gcc45.patch"
+	epatch "${FILESDIR}/${PV}-glib-single-include.patch"
 	eautoreconf
 }