diff options
| author |   Alfredo Tupone <tupone@gentoo.org> | 2010-10-21 11:43:36 +0000 |
|---|---|---|
| committer | Alfredo Tupone <tupone@gentoo.org> | 2010-10-21 11:43:36 +0000 |
| commit | ea6ed790c13a5f362168fe516a09adf219767ced (patch) | |
| tree | a0273ca8af73d1f6e1d41d662aea7e1e1591b822 /games-kids | |
| parent | Respect CXX,LDFLAGS. Bug #341875. Thanks to Diego E. 'Flameeyes' Pettenò <fl... (diff) | |
| download | gentoo-2-ea6ed790c13a5f362168fe516a09adf219767ced.tar.gz gentoo-2-ea6ed790c13a5f362168fe516a09adf219767ced.tar.bz2 gentoo-2-ea6ed790c13a5f362168fe516a09adf219767ced.zip | |
Remove GTK_DISABLE_DEPRECATED allowing build with x11-libs/gtk+-2.22. Bug #341813
(Portage version: 2.1.9.20/cvs/Linux i686)
Diffstat (limited to 'games-kids')
| -rw-r--r-- | games-kids/gcompris/ChangeLog | 7 | ||||
| -rw-r--r-- | games-kids/gcompris/files/gcompris-9.2.2-gtk2.22.patch | 10 | ||||
| -rw-r--r-- | games-kids/gcompris/gcompris-9.2.2.ebuild | 5 |
3 files changed, 19 insertions, 3 deletions
diff --git a/games-kids/gcompris/ChangeLog b/games-kids/gcompris/ChangeLog index 40e10c10b96d..8853a362633f 100644 --- a/games-kids/gcompris/ChangeLog +++ b/games-kids/gcompris/ChangeLog @@ -1,6 +1,11 @@ # 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.55 2010/08/12 04:00:50 josejx Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-kids/gcompris/ChangeLog,v 1.56 2010/10/21 11:43:36 tupone Exp $ + + 21 Oct 2010; Tupone Alfredo <tupone@gentoo.org> gcompris-9.2.2.ebuild, + +files/gcompris-9.2.2-gtk2.22.patch: + Remove GTK_DISABLE_DEPRECATED allowing build with x11-libs/gtk+-2.22. + Bug #341813 by flameeyes@gentoo.org 12 Aug 2010; Joseph Jezak <josejx@gentoo.org> gcompris-9.2.2.ebuild: Marked ppc stable for bug #318633. diff --git a/games-kids/gcompris/files/gcompris-9.2.2-gtk2.22.patch b/games-kids/gcompris/files/gcompris-9.2.2-gtk2.22.patch new file mode 100644 index 000000000000..662662f9d85b --- /dev/null +++ b/games-kids/gcompris/files/gcompris-9.2.2-gtk2.22.patch @@ -0,0 +1,10 @@ +--- src/goocanvas/src/Makefile.am.old 2010-10-21 12:29:13.000000000 +0200 ++++ src/goocanvas/src/Makefile.am 2010-10-21 12:30:14.000000000 +0200 +@@ -3,7 +3,6 @@ + INCLUDES = \ + -DG_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED \ + -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED \ +- -DGTK_DISABLE_DEPRECATED \ + -DPACKAGE_DATA_DIR=\""$(datadir)"\" \ + -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ + -DG_LOG_DOMAIN=\"GooCanvas\" \ diff --git a/games-kids/gcompris/gcompris-9.2.2.ebuild b/games-kids/gcompris/gcompris-9.2.2.ebuild index aee35b188735..e82a03df6ed7 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.7 2010/08/12 04:00:50 josejx Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-kids/gcompris/gcompris-9.2.2.ebuild,v 1.8 2010/10/21 11:43:36 tupone Exp $ EAPI=2 @@ -55,7 +55,8 @@ pkg_setup() { } src_prepare() { - epatch "${FILESDIR}"/${P}-build.patch + epatch "${FILESDIR}"/${P}-build.patch \ + "${FILESDIR}"/${P}-gtk2.22.patch cp /usr/share/gettext/config.rpath . if has_version '>=x11-libs/gtk+-2.20:2' ; then sed -i \ |