From de00017e1b8833a24aaab2ed5dfa3bb0e6547b71 Mon Sep 17 00:00:00 2001
From: Michael Sterrett <mr_bones_@gentoo.org>
Date: Sun, 11 Jul 2010 01:24:58 +0000
Subject: build against gtk+-2.20 with sed patch from Egor Y. Egorov (bug
 #324221) (Portage version: 2.1.8.3/cvs/Linux i686)

---
 games-kids/gcompris/ChangeLog             |  6 +++++-
 games-kids/gcompris/gcompris-9.2.2.ebuild | 16 +++++++++++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

(limited to 'games-kids')

diff --git a/games-kids/gcompris/ChangeLog b/games-kids/gcompris/ChangeLog
index 0a1e0ef7cbbe..d6af09c3ccc7 100644
--- a/games-kids/gcompris/ChangeLog
+++ b/games-kids/gcompris/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-kids/gcompris
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-kids/gcompris/ChangeLog,v 1.53 2010/06/16 02:10:37 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-kids/gcompris/ChangeLog,v 1.54 2010/07/11 01:24:58 mr_bones_ Exp $
+
+  11 Jul 2010; Michael Sterrett <mr_bones_@gentoo.org>
+  gcompris-9.2.2.ebuild:
+  build against gtk+-2.20 with sed patch from Egor Y. Egorov (bug #324221)
 
   16 Jun 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   gcompris-9.2.2.ebuild:
diff --git a/games-kids/gcompris/gcompris-9.2.2.ebuild b/games-kids/gcompris/gcompris-9.2.2.ebuild
index ad3370c8b4a6..8685af8999d2 100644
--- a/games-kids/gcompris/gcompris-9.2.2.ebuild
+++ b/games-kids/gcompris/gcompris-9.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-kids/gcompris/gcompris-9.2.2.ebuild,v 1.5 2010/06/16 02:10:37 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-kids/gcompris/gcompris-9.2.2.ebuild,v 1.6 2010/07/11 01:24:58 mr_bones_ Exp $
 
 EAPI=2
 
@@ -57,6 +57,20 @@ pkg_setup() {
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-build.patch
 	cp /usr/share/gettext/config.rpath .
+	if has_version '>=x11-libs/gtk+-2.20:2' ; then
+		sed -i \
+			-e 's:GTK_WIDGET_REALIZED:gtk_widget_get_realized:g'    \
+			-e 's:GTK_WIDGET_VISIBLE:gtk_widget_get_visible:g'      \
+			-e 's:GTK_WIDGET_DRAWABLE:gtk_widget_is_drawable:g'     \
+			-e 's:GTK_WIDGET_HAS_FOCUS:gtk_widget_has_focus:g'      \
+			-e 's:GTK_WIDGET_HAS_FOCUS:gtk_widget_has_focus:g'      \
+			-e 's:GTK_WIDGET_MAPPED:gtk_widget_get_mapped:g'        \
+			./src/goocanvas/src/goocanvaswidget.c \
+			./src/goocanvas/src/goocanvas.c \
+			./src/goocanvas/src/goocanvasatk.c \
+			|| die 'sed failed'
+	fi
+
 	eautoreconf
 }
 
-- 
cgit v1.2.3-65-gdbad